summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2006-07-14 13:05:52 -0700
committerAlan Coopersmith <alanc@alf.(none)>2006-07-14 13:05:52 -0700
commit5283b118b4bfdb1a85356147701f602b884c342b (patch)
tree8751ba258d8a74ee929b87887393be369ba2091f /util.c
parent41211f8c849de67cebeb9d9f7516eb5a4a7eb3cf (diff)
Fix many sparse warnings of: Using plain integer as NULL pointer
Also fixes Login.c:1329:5: warning: mixing declarations and code from extra ;
Diffstat (limited to 'util.c')
-rw-r--r--util.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/util.c b/util.c
index 019ca3b..f11f6ac 100644
--- a/util.c
+++ b/util.c
@@ -72,7 +72,7 @@ makeEnv (char *name, char *value)
result = malloc ((unsigned) (strlen (name) + strlen (value) + 2));
if (!result) {
LogOutOfMem ("makeEnv");
- return 0;
+ return NULL;
}
sprintf (result, "%s=%s", name, value);
return result;
@@ -83,7 +83,7 @@ getEnv (char **e, char *name)
{
int l = strlen (name);
- if (!e) return 0;
+ if (!e) return NULL;
while (*e) {
if ((int)strlen (*e) > l && !strncmp (*e, name, l) &&
@@ -91,7 +91,7 @@ getEnv (char **e, char *name)
return (*e) + l + 1;
++e;
}
- return 0;
+ return NULL;
}
char **
@@ -130,7 +130,7 @@ setEnv (char **e, char *name, char *value)
return e;
}
new[envsize] = newe;
- new[envsize+1] = 0;
+ new[envsize+1] = NULL;
return new;
}
@@ -189,7 +189,7 @@ parseArgs (char **argv, char *string)
argv = (char **) malloc (sizeof (char *));
if (!argv) {
LogOutOfMem ("parseArgs");
- return 0;
+ return NULL;
}
}
word = string;
@@ -204,7 +204,7 @@ parseArgs (char **argv, char *string)
free ((char *) argv);
if (save)
free (save);
- return 0;
+ return NULL;
} else {
argv = newargv;
}
@@ -218,7 +218,7 @@ parseArgs (char **argv, char *string)
}
++string;
}
- argv[i] = 0;
+ argv[i] = NULL;
return argv;
}