Commit 80b6d6b9 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Error.c: simplify some NULL pointer checks

parent 1d50b2ab
...@@ -334,7 +334,7 @@ char *nxagentGetHomePath(void) ...@@ -334,7 +334,7 @@ char *nxagentGetHomePath(void)
char *homeEnv = getenv("NX_HOME"); char *homeEnv = getenv("NX_HOME");
if (homeEnv == NULL || *homeEnv == '\0') if (!homeEnv || *homeEnv == '\0')
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "%s: No environment for NX_HOME.\n", __func__); fprintf(stderr, "%s: No environment for NX_HOME.\n", __func__);
...@@ -342,7 +342,7 @@ char *nxagentGetHomePath(void) ...@@ -342,7 +342,7 @@ char *nxagentGetHomePath(void)
homeEnv = getenv("HOME"); homeEnv = getenv("HOME");
if (homeEnv == NULL || *homeEnv == '\0') if (!homeEnv || *homeEnv == '\0')
{ {
#ifdef PANIC #ifdef PANIC
fprintf(stderr, "%s: PANIC! No environment for HOME.\n", __func__); fprintf(stderr, "%s: PANIC! No environment for HOME.\n", __func__);
...@@ -386,7 +386,7 @@ char *nxagentGetRootPath(void) ...@@ -386,7 +386,7 @@ char *nxagentGetRootPath(void)
char *rootEnv = getenv("NX_ROOT"); char *rootEnv = getenv("NX_ROOT");
if (rootEnv == NULL || *rootEnv == '\0') if (!rootEnv || *rootEnv == '\0')
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "%s: WARNING! No environment for NX_ROOT.\n", __func__); fprintf(stderr, "%s: WARNING! No environment for NX_ROOT.\n", __func__);
...@@ -399,7 +399,7 @@ char *nxagentGetRootPath(void) ...@@ -399,7 +399,7 @@ char *nxagentGetRootPath(void)
char *homeEnv = nxagentGetHomePath(); char *homeEnv = nxagentGetHomePath();
if (homeEnv == NULL) if (!homeEnv)
{ {
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment