diff options
| author | markm <markm@FreeBSD.org> | 2004-03-05 08:10:19 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2004-03-05 08:10:19 +0000 |
| commit | 0b0ae8e16e50fd60ad86f4f14ec05cfc50e7eae5 (patch) | |
| tree | 524ae0ef30bcdfacb05b3c2b01e1c48e80d93e3b /sbin/raidctl | |
| parent | f5816d0166177c6f98d32562b93f6cf287f9b4f5 (diff) | |
| download | FreeBSD-src-0b0ae8e16e50fd60ad86f4f14ec05cfc50e7eae5.zip FreeBSD-src-0b0ae8e16e50fd60ad86f4f14ec05cfc50e7eae5.tar.gz | |
Make NULL a (void*)0 whereever possible, and fix the warnings(-Werror)
that this provokes. "Wherever possible" means "In the kernel OR NOT
C++" (implying C).
There are places where (void *) pointers are not valid, such as for
function pointers, but in the special case of (void *)0, agreement
settles on it being OK.
Most of the fixes were NULL where an integer zero was needed; many
of the fixes were NULL where ascii <nul> ('\0') was needed, and a
few were just "other".
Tested on: i386 sparc64
Diffstat (limited to 'sbin/raidctl')
| -rw-r--r-- | sbin/raidctl/raidctl.c | 2 | ||||
| -rw-r--r-- | sbin/raidctl/rf_configure.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sbin/raidctl/raidctl.c b/sbin/raidctl/raidctl.c index 4b7d27d..117e651 100644 --- a/sbin/raidctl/raidctl.c +++ b/sbin/raidctl/raidctl.c @@ -272,7 +272,7 @@ main(argc,argv) argc -= optind; argv += optind; - if ((num_options > 1) || (argc == NULL)) + if ((num_options > 1) || (argc == 0)) usage(); strncpy(name,argv[0],PATH_MAX); diff --git a/sbin/raidctl/rf_configure.c b/sbin/raidctl/rf_configure.c index 8df7889..2970467 100644 --- a/sbin/raidctl/rf_configure.c +++ b/sbin/raidctl/rf_configure.c @@ -249,7 +249,7 @@ rf_MakeConfig(configname, cfgPtr) } /* Get rid of the newline at the end of the string */ if ((bfr1 = strchr(&bfr[0], '\n')) != NULL) - *bfr1 = NULL; + *bfr1 = '\0'; /* Make sure the device exists */ if ((devfd = open(&bfr[0], O_RDWR)) < 0) { RF_ERRORMSG2( |
