From 79f40d6f21deb28fda48549d738283741723d770 Mon Sep 17 00:00:00 2001 From: Karsten Blees Date: Wed, 5 Oct 2011 22:01:46 +0200 Subject: [PATCH] Win32: unify environment function names 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 --- compat/mingw.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index 0c406669df..e5d8c6a438 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -737,14 +737,14 @@ char *mingw_getcwd(char *pointer, int len) return pointer; } -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; return strcasecmp(*ea, *eb); } -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; @@ -759,10 +759,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) { @@ -803,7 +803,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; } @@ -1076,7 +1076,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++) { @@ -1278,7 +1278,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; } -- 2.11.4.GIT