Win32: unify environment function names

kblees · gitster · commit 26c7b21ab107 · 2014-07-21T09:32:49.000-07:00
Environment helper functions use random naming ('env' prefix or suffix or
both, with or without '_'). Change to POSIX naming scheme ('env' suffix,
no '_').

Env_setenv has more in common with putenv than setenv. Change to do_putenv.

Signed-off-by: Karsten Blees &lt;blees@dcon.de&gt;
Signed-off-by: Stepan Kasal &lt;kasal@ucw.cz&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -899,7 +899,7 @@ static char *path_lookup(const char *cmd, char **path, int exe_only)
 	return prog;
 }
 
-static int env_compare(const void *a, const void *b)
+static int compareenv(const void *a, const void *b)
 {
 	char *const *ea = a;
 	char *const *eb = b;
@@ -993,7 +993,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env,
 		/* environment must be sorted */
 		sorted_env = xmalloc(sizeof(*sorted_env) * (count + 1));
 		memcpy(sorted_env, env, sizeof(*sorted_env) * (count + 1));
-		qsort(sorted_env, count, sizeof(*sorted_env), env_compare);
+		qsort(sorted_env, count, sizeof(*sorted_env), compareenv);
 
 		/* create environment block from temporary environment */
 		for (e = sorted_env; *e; e++) {
@@ -1194,7 +1194,7 @@ void free_environ(char **env)
 	free(env);
 }
 
-static int lookup_env(char **env, const char *name, size_t nmln)
+static int lookupenv(char **env, const char *name, size_t nmln)
 {
 	int i;
 
@@ -1209,10 +1209,10 @@ static int lookup_env(char **env, const char *name, size_t nmln)
 /*
  * If name contains '=', then sets the variable, otherwise it unsets it
  */
-static char **env_setenv(char **env, const char *name)
+static char **do_putenv(char **env, const char *name)
 {
 	char *eq = strchrnul(name, '=');
-	int i = lookup_env(env, name, eq-name);
+	int i = lookupenv(env, name, eq-name);
 
 	if (i < 0) {
 		if (*eq) {
@@ -1243,7 +1243,7 @@ char **make_augmented_environ(const char *const *vars)
 
 	while (*vars) {
 		const char *v = *vars++;
-		env = env_setenv(env, strchr(v, '=') ? xstrdup(v) : v);
+		env = do_putenv(env, strchr(v, '=') ? xstrdup(v) : v);
 	}
 	return env;
 }
@@ -1263,7 +1263,7 @@ char *mingw_getenv(const char *name)
 
 int mingw_putenv(const char *namevalue)
 {
-	environ = env_setenv(environ, namevalue);
+	environ = do_putenv(environ, namevalue);
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -899,7 +899,7 @@ static char path_lookup(const char cmd, char **path, int exe_only)`
`899`	`899`	`return prog;`
`900`	`900`	`}`
`901`	`901`
`902`		`-static int env_compare(const void a, const void b)`
	`902`	`+static int compareenv(const void a, const void b)`
`903`	`903`	`{`
`904`	`904`	`char const ea = a;`
`905`	`905`	`char const eb = b;`
`@@ -993,7 +993,7 @@ static pid_t mingw_spawnve_fd(const char cmd, const char argv, char *env,`
`993`	`993`	`/* environment must be sorted */`
`994`	`994`	`sorted_env = xmalloc(sizeof(sorted_env) (count + 1));`
`995`	`995`	`memcpy(sorted_env, env, sizeof(sorted_env) (count + 1));`
`996`		`- qsort(sorted_env, count, sizeof(*sorted_env), env_compare);`
	`996`	`+ qsort(sorted_env, count, sizeof(*sorted_env), compareenv);`
`997`	`997`
`998`	`998`	`/* create environment block from temporary environment */`
`999`	`999`	`for (e = sorted_env; *e; e++) {`
`@@ -1194,7 +1194,7 @@ void free_environ(char **env)`
`1194`	`1194`	`free(env);`
`1195`	`1195`	`}`
`1196`	`1196`
`1197`		`-static int lookup_env(char *env, const char name, size_t nmln)`
	`1197`	`+static int lookupenv(char *env, const char name, size_t nmln)`
`1198`	`1198`	`{`
`1199`	`1199`	`int i;`
`1200`	`1200`
`@@ -1209,10 +1209,10 @@ static int lookup_env(char *env, const char name, size_t nmln)`
`1209`	`1209`	`/*`
`1210`	`1210`	`* If name contains '=', then sets the variable, otherwise it unsets it`
`1211`	`1211`	`*/`
`1212`		`-static char env_setenv(char env, const char *name)`
	`1212`	`+static char do_putenv(char env, const char *name)`
`1213`	`1213`	`{`
`1214`	`1214`	`char *eq = strchrnul(name, '=');`
`1215`		`- int i = lookup_env(env, name, eq-name);`
	`1215`	`+ int i = lookupenv(env, name, eq-name);`
`1216`	`1216`
`1217`	`1217`	`if (i < 0) {`
`1218`	`1218`	`if (*eq) {`
`@@ -1243,7 +1243,7 @@ char *make_augmented_environ(const char const *vars)`
`1243`	`1243`
`1244`	`1244`	`while (*vars) {`
`1245`	`1245`	`const char v = vars++;`
`1246`		`- env = env_setenv(env, strchr(v, '=') ? xstrdup(v) : v);`
	`1246`	`+ env = do_putenv(env, strchr(v, '=') ? xstrdup(v) : v);`
`1247`	`1247`	`}`
`1248`	`1248`	`return env;`
`1249`	`1249`	`}`
`@@ -1263,7 +1263,7 @@ char mingw_getenv(const char name)`
`1263`	`1263`
`1264`	`1264`	`int mingw_putenv(const char *namevalue)`
`1265`	`1265`	`{`
`1266`		`- environ = env_setenv(environ, namevalue);`
	`1266`	`+ environ = do_putenv(environ, namevalue);`
`1267`	`1267`	`return 0;`
`1268`	`1268`	`}`
`1269`	`1269`