rename variables

Author: peterguy

cmd/src/main.go

@@ -163,14 +163,14 @@ func (c *config) apiClient(flags *api.Flags, out io.Writer) api.Client {
 
 // readConfig reads the config file from the given path.
 func readConfig() (*config, error) {
-	cfgFilePath := *configPath
+	cfgFile := *configPath
 	userSpecified := *configPath != ""
 
 	if !userSpecified {
-		cfgFilePath = "~/src-config.json"
+		cfgFile = "~/src-config.json"
 	}
 
-	cfgPath, err := expandHomeDir(cfgFilePath)
+	cfgPath, err := expandHomeDir(cfgFile)
 	if err != nil {
 		return nil, err
 	}
@@ -179,7 +179,7 @@ func readConfig() (*config, error) {
 	if err != nil && (!os.IsNotExist(err) || userSpecified) {
 		return nil, err
 	}
-	var cfgFile struct {
+	var configFromFile struct {
 		Endpoint          string            `json:"endpoint"`
 		AccessToken       string            `json:"accessToken"`
 		AdditionalHeaders map[string]string `json:"additionalHeaders"`
@@ -190,13 +190,13 @@ func readConfig() (*config, error) {
 	var proxyStr string
 	if err == nil {
 		cfg.configFilePath = cfgPath
-		if err := json.Unmarshal(data, &cfgFile); err != nil {
+		if err := json.Unmarshal(data, &configFromFile); err != nil {
 			return nil, err
 		}
-		endpointStr = cfgFile.Endpoint
-		cfg.accessToken = cfgFile.AccessToken
-		cfg.additionalHeaders = cfgFile.AdditionalHeaders
-		proxyStr = cfgFile.Proxy
+		endpointStr = configFromFile.Endpoint
+		cfg.accessToken = configFromFile.AccessToken
+		cfg.additionalHeaders = configFromFile.AdditionalHeaders
+		proxyStr = configFromFile.Proxy
 	}
 
 	envToken := os.Getenv("SRC_ACCESS_TOKEN")