d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style(9): use NULL when assigning/comparing a char *,

Browse Source 
consitently compare fileid with 0 using == and !=.

Reviewed by:	silence on @audit
This commit is contained in:
Johan Karlsson 2003-04-23 20:33:57 +00:00
parent 7d2101965f
commit 7f10745771
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=113936
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/kldconfig/kldconfig.c
View File

@ -142,7 +142,7 @@ setpath(struct pathhead *pathq)
if (sysctl(mib, miblen, NULL, NULL, newpath, strlen(newpath)+1) == -1) if (sysctl(mib, miblen, NULL, NULL, newpath, strlen(newpath)+1) == -1)
err(1, "setting path: sysctl(%s)", pathctl); err(1, "setting path: sysctl(%s)", pathctl);
if (modpath) if (modpath != NULL)
free(modpath); free(modpath);
modpath = newpath; modpath = newpath;
} }

6
sbin/kldstat/kldstat.c
View File

@ -92,7 +92,7 @@ main(int argc, char** argv)
int c; int c;
int verbose = 0; int verbose = 0;
int fileid = 0; int fileid = 0;
char* filename = 0; char* filename = NULL;
while ((c = getopt(argc, argv, "i:n:v")) != -1) while ((c = getopt(argc, argv, "i:n:v")) != -1)
switch (c) { switch (c) {
@ -114,13 +114,13 @@ main(int argc, char** argv)
if (argc != 0) if (argc != 0)
usage(); usage();
if (filename) { if (filename != NULL) {
if ((fileid = kldfind(filename)) < 0) if ((fileid = kldfind(filename)) < 0)
err(1, "can't find file %s", filename); err(1, "can't find file %s", filename);
} }
printf("Id Refs Address%*c Size Name\n", POINTER_WIDTH - 7, ' '); printf("Id Refs Address%*c Size Name\n", POINTER_WIDTH - 7, ' ');
if (fileid) if (fileid != 0)
printfile(fileid, verbose); printfile(fileid, verbose);
else else
for (fileid = kldnext(0); fileid > 0; fileid = kldnext(fileid)) for (fileid = kldnext(0); fileid > 0; fileid = kldnext(fileid))

10
sbin/kldunload/kldunload.c
View File

@ -50,7 +50,7 @@ main(int argc, char** argv)
int c; int c;
int verbose = 0; int verbose = 0;
int fileid = 0; int fileid = 0;
char* filename = 0; char* filename = NULL;
while ((c = getopt(argc, argv, "i:n:v")) != -1) while ((c = getopt(argc, argv, "i:n:v")) != -1)
switch (c) { switch (c) {
@ -71,18 +71,18 @@ main(int argc, char** argv)
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (!fileid && !filename && (argc == 1)) { if (fileid == 0 && filename == NULL && (argc == 1)) {
filename = *argv; filename = *argv;
argc--; argc--;
} }
if (argc != 0 || (fileid && filename)) if (argc != 0 || (fileid != 0 && filename != NULL))
usage(); usage();
if (fileid == 0 && filename == 0) if (fileid == 0 && filename == NULL)
usage(); usage();
if (filename) { if (filename != NULL) {
if ((fileid = kldfind(filename)) < 0) if ((fileid = kldfind(filename)) < 0)
err(1, "can't find file %s", filename); err(1, "can't find file %s", filename);
} }