From: Karsten Blees <blees@xxxxxxx>
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 <blees@xxxxxxx>
Signed-off-by: Stepan Kasal <kasal@xxxxxx>
---
compat/mingw.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index fe869ed..89fe62b 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -898,7 +898,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;
@@ -992,7 +992,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++) {
@@ -1193,7 +1193,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;
@@ -1208,10 +1208,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) {
@@ -1242,7 +1242,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;
}
@@ -1262,7 +1262,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;
}
--
2.0.0.9635.g0be03cb
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html