global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 14:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32: unify environment function names

Browse Source 
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@dcon.de>
This commit is contained in:
Karsten Blees
2011-10-05 22:01:46 +02:00
committed by Johannes Schindelin
parent 17bc7bc5f6
commit 3f5e24c74b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compat/mingw.c
View File

@@ -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;
}