style:optimization

aliyun · Sep 18, 2022 · b91e1cf · b91e1cf
1 parent 9f2d040
commit b91e1cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/oss/conn.go b/oss/conn.go
@@ -794,12 +794,12 @@ func (um *urlMaker) Init(endpoint string, isCname bool, isProxy bool) error {
 
 	//use url.Parse() to get real host
 	strUrl := um.Scheme + "://" + um.NetLoc
-	url, err := url.Parse(strUrl)
+	parseUrl, err := url.Parse(strUrl)
 	if err != nil {
 		return err
 	}
 
-	um.NetLoc = url.Host
+	um.NetLoc = parseUrl.Host
 	host, _, err := net.SplitHostPort(um.NetLoc)
 	if err != nil {
 		host = um.NetLoc
@@ -808,8 +808,7 @@ func (um *urlMaker) Init(endpoint string, isCname bool, isProxy bool) error {
 		}
 	}
 
-	ip := net.ParseIP(host)
-	if ip != nil {
+	if ip := net.ParseIP(host); ip != nil {
 		um.Type = urlTypeIP
 	} else if isCname {
 		um.Type = urlTypeCname
@@ -824,10 +823,8 @@ func (um *urlMaker) Init(endpoint string, isCname bool, isProxy bool) error {
 // getURL gets URL
 func (um urlMaker) getURL(bucket, object, params string) *url.URL {
 	host, path := um.buildURL(bucket, object)
-	addr := ""
-	if params == "" {
-		addr = fmt.Sprintf("%s://%s%s", um.Scheme, host, path)
-	} else {
+	addr := fmt.Sprintf("%s://%s%s", um.Scheme, host, path)
+	if params != "" {
 		addr = fmt.Sprintf("%s://%s%s?%s", um.Scheme, host, path, params)
 	}
 	uri, _ := url.ParseRequestURI(addr)

diff --git a/oss/option.go b/oss/option.go
@@ -566,7 +566,7 @@ func addArg(key string, value interface{}) Option {
 }
 
 func handleOptions(headers map[string]string, options []Option) error {
-	params := map[string]optionValue{}
+	params := make(map[string]optionValue, len(options))
 	for _, option := range options {
 		if option != nil {
 			if err := option(params); err != nil {
@@ -585,7 +585,7 @@ func handleOptions(headers map[string]string, options []Option) error {
 
 func GetRawParams(options []Option) (map[string]interface{}, error) {
 	// Option
-	params := map[string]optionValue{}
+	params := make(map[string]optionValue, len(options))
 	for _, option := range options {
 		if option != nil {
 			if err := option(params); err != nil {
@@ -607,7 +607,7 @@ func GetRawParams(options []Option) (map[string]interface{}, error) {
 }
 
 func FindOption(options []Option, param string, defaultVal interface{}) (interface{}, error) {
-	params := map[string]optionValue{}
+	params := make(map[string]optionValue, len(options))
 	for _, option := range options {
 		if option != nil {
 			if err := option(params); err != nil {
@@ -623,7 +623,7 @@ func FindOption(options []Option, param string, defaultVal interface{}) (interfa
 }
 
 func IsOptionSet(options []Option, option string) (bool, interface{}, error) {
-	params := map[string]optionValue{}
+	params := make(map[string]optionValue, len(options))
 	for _, option := range options {
 		if option != nil {
 			if err := option(params); err != nil {