Fix compiler warning: the address of 'env' will always evaluate as 'true'

This commit is contained in:
Yang Tse 2007-09-27 00:58:41 +00:00
parent 9b55056423
commit 9c5cd6c413
1 changed files with 6 additions and 9 deletions

View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@ -48,18 +48,15 @@ char *GetEnv(const char *variable)
env[0] = '\0';
if (temp != NULL)
ExpandEnvironmentStrings(temp, env, sizeof(env));
return (env[0] != '\0')?strdup(env):NULL;
#else
#ifdef VMS
char *env = getenv(variable);
if (env && strcmp("HOME",variable) == 0) {
env = decc$translate_vms(env);
}
#else
/* no length control */
char *env = getenv(variable);
#ifdef VMS
if (env && strcmp("HOME",variable) == 0)
env = decc$translate_vms(env);
#endif
return env?strdup(env):NULL;
#endif
return (env && env[0])?strdup(env):NULL;
#endif
}