Don't use "NULL" when "0" is really meant.

13 files changed, 24 insertions, 24 deletions

diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index a8f892d..d0cb697 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -571,7 +571,7 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages)
 							 dmat->lowaddr,
 							 PAGE_SIZE,
 							 0);
-		if (bpage->vaddr == NULL) {
+		if (bpage->vaddr == 0) {
 			free(bpage, M_DEVBUF);
 			break;
 		}
diff --git a/sys/amd64/amd64/dump_machdep.c b/sys/amd64/amd64/dump_machdep.c
index c671a5a..69982da 100644
--- a/sys/amd64/amd64/dump_machdep.c
+++ b/sys/amd64/amd64/dump_machdep.c
@@ -77,7 +77,7 @@ dumpsys(struct dumperinfo *di)
 
 	dumplo = di->mediaoffset + di->mediasize - Maxmem * (off_t)PAGE_SIZE;
 	dumplo -= sizeof kdh * 2;
-	i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh);
+	i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh);
 	if (i)
 		printf("\nDump failed writing header (%d)\n", i);
 	dumplo += sizeof kdh;
@@ -100,7 +100,7 @@ dumpsys(struct dumperinfo *di)
 			printf(" %d", count / (1024 * 1024 / PAGE_SIZE));
 			mb = i;
 		}
-		i = di->dumper(di->priv, va, NULL, dumplo, left * PAGE_SIZE);
+		i = di->dumper(di->priv, va, 0, dumplo, left * PAGE_SIZE);
 		if (i)
 			break;
 		count += left;
@@ -114,10 +114,10 @@ dumpsys(struct dumperinfo *di)
 	}
 	if (i) 
 		printf("\nDump failed writing data (%d)\n", i);
-	i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh);
+	i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh);
 	if (i)
 		printf("\nDump failed writing trailer (%d)\n", i);
-	di->dumper(di->priv, NULL, NULL, 0, 0);  /* tell them we are done */
+	di->dumper(di->priv, NULL, 0, 0, 0);  /* tell them we are done */
 	printf("\nDump complete\n");
 	return;
 }
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index a84713f..274678e 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -2508,7 +2508,7 @@ pmap_prefault(pmap, addra, entry)
 		if (addr < starta || addr >= entry->end)
 			continue;
 
-		if ((*pmap_pde(pmap, addr)) == NULL) 
+		if ((*pmap_pde(pmap, addr)) == 0) 
 			continue;
 
 		pte = vtopte(addr);
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index cbfde4c..6712e9b 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -51,7 +51,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 	vtb->vtb_cols = cols;
 	vtb->vtb_rows = rows;
 	vtb->vtb_size = cols*rows;
-	vtb->vtb_buffer = NULL;
+	vtb->vtb_buffer = 0;
 	vtb->vtb_tail = 0;
 
 	switch (type) {
@@ -62,7 +62,7 @@ sc_vtb_init(sc_vtb_t *vtb, int type, int cols, int rows, void *buf, int wait)
 				(vm_offset_t)malloc(cols*rows*sizeof(u_int16_t),
 						    M_DEVBUF, 
 						    (wait) ? M_WAITOK : M_NOWAIT);
-			if (vtb->vtb_buffer != NULL) {
+			if (vtb->vtb_buffer != 0) {
 				bzero((void *)sc_vtb_pointer(vtb, 0),
 				      cols*rows*sizeof(u_int16_t));
 				vtb->vtb_flags |= VTB_ALLOCED;
@@ -92,11 +92,11 @@ sc_vtb_destroy(sc_vtb_t *vtb)
 	vtb->vtb_tail = 0;
 
 	p = vtb->vtb_buffer;
-	vtb->vtb_buffer = NULL;
+	vtb->vtb_buffer = 0;
 	switch (vtb->vtb_type) {
 	case VTB_MEMORY:
 	case VTB_RINGBUFFER:
-		if ((vtb->vtb_flags & VTB_ALLOCED) && (p != NULL))
+		if ((vtb->vtb_flags & VTB_ALLOCED) && (p != 0))
 			free((void *)p, M_DEVBUF);
 		break;
 	default:
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index d33f02b..4673c34 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -867,7 +867,7 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	    hstp = scp->history->vtb_buffer + sc_vtb_tail(scp->history) *
 		sizeof(u_int16_t) + ptr->x * sizeof(u_int16_t);
 	else
-	    hstp = NULL;
+	    hstp = 0;
 
 	retval = 0;
 	for (lnum = 0; lnum < (ptr->y + ptr->ysize); lnum++) {
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 570495b..16edfdd 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -263,7 +263,7 @@ vinum_finddaemon()
     int result;
 
     if (daemonpid != 0) {				    /* we think we have a daemon, */
-	queue_daemon_request(daemonrq_ping, (union daemoninfo) NULL); /* queue a ping */
+	queue_daemon_request(daemonrq_ping, (union daemoninfo) 0); /* queue a ping */
 	result = tsleep(&vinum_finddaemon, PUSER, "reap", 2 * hz);
 	if (result == 0)				    /* yup, the daemon's up and running */
 	    return 0;
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 0800b6d..d7e5c95 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -611,7 +611,7 @@ format_config(char *config, int len)
 void
 save_config(void)
 {
-    queue_daemon_request(daemonrq_saveconfig, (union daemoninfo) NULL);
+    queue_daemon_request(daemonrq_saveconfig, (union daemoninfo) 0);
 }
 
 /*
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index a8f892d..d0cb697 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -571,7 +571,7 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages)
 							 dmat->lowaddr,
 							 PAGE_SIZE,
 							 0);
-		if (bpage->vaddr == NULL) {
+		if (bpage->vaddr == 0) {
 			free(bpage, M_DEVBUF);
 			break;
 		}
diff --git a/sys/i386/i386/dump_machdep.c b/sys/i386/i386/dump_machdep.c
index c671a5a..69982da 100644
--- a/sys/i386/i386/dump_machdep.c
+++ b/sys/i386/i386/dump_machdep.c
@@ -77,7 +77,7 @@ dumpsys(struct dumperinfo *di)
 
 	dumplo = di->mediaoffset + di->mediasize - Maxmem * (off_t)PAGE_SIZE;
 	dumplo -= sizeof kdh * 2;
-	i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh);
+	i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh);
 	if (i)
 		printf("\nDump failed writing header (%d)\n", i);
 	dumplo += sizeof kdh;
@@ -100,7 +100,7 @@ dumpsys(struct dumperinfo *di)
 			printf(" %d", count / (1024 * 1024 / PAGE_SIZE));
 			mb = i;
 		}
-		i = di->dumper(di->priv, va, NULL, dumplo, left * PAGE_SIZE);
+		i = di->dumper(di->priv, va, 0, dumplo, left * PAGE_SIZE);
 		if (i)
 			break;
 		count += left;
@@ -114,10 +114,10 @@ dumpsys(struct dumperinfo *di)
 	}
 	if (i) 
 		printf("\nDump failed writing data (%d)\n", i);
-	i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh);
+	i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh);
 	if (i)
 		printf("\nDump failed writing trailer (%d)\n", i);
-	di->dumper(di->priv, NULL, NULL, 0, 0);  /* tell them we are done */
+	di->dumper(di->priv, NULL, 0, 0, 0);  /* tell them we are done */
 	printf("\nDump complete\n");
 	return;
 }
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index a84713f..274678e 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -2508,7 +2508,7 @@ pmap_prefault(pmap, addra, entry)
 		if (addr < starta || addr >= entry->end)
 			continue;
 
-		if ((*pmap_pde(pmap, addr)) == NULL) 
+		if ((*pmap_pde(pmap, addr)) == 0) 
 			continue;
 
 		pte = vtopte(addr);
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 1982e7f..8134d8c 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -271,7 +271,7 @@ sysctl_disks(SYSCTL_HANDLER_ARGS)
 	return error;
 }
  
-SYSCTL_PROC(_kern, OID_AUTO, disks, CTLTYPE_STRING | CTLFLAG_RD, 0, NULL, 
+SYSCTL_PROC(_kern, OID_AUTO, disks, CTLTYPE_STRING | CTLFLAG_RD, 0, 0, 
     sysctl_disks, "A", "names of available disks");
 
 /*
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 489aeaf..17e3bc3 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -360,7 +360,7 @@ pipe_create(cpipep)
 	/* so pipespace()->pipe_free_kmem() doesn't follow junk pointer */
 	cpipe->pipe_buffer.object = NULL;
 #ifndef PIPE_NODIRECT
-	cpipe->pipe_map.kva = NULL;
+	cpipe->pipe_map.kva = 0;
 #endif
 	/*
 	 * protect so pipeclose() doesn't follow a junk pointer
@@ -1344,7 +1344,7 @@ pipe_free_kmem(cpipe)
 		cpipe->pipe_buffer.buffer = NULL;
 	}
 #ifndef PIPE_NODIRECT
-	if (cpipe->pipe_map.kva != NULL) {
+	if (cpipe->pipe_map.kva != 0) {
 		amountpipekva -= cpipe->pipe_buffer.size + PAGE_SIZE;
 		kmem_free(kernel_map,
 			cpipe->pipe_map.kva,
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 1af1122..14e1362 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -835,7 +835,7 @@ obj_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
 	vm_page_t p;
 	int pages;
 
-	retkva = NULL;
+	retkva = 0;
 	pages = zone->uz_pages;
 
 	/* 
@@ -848,7 +848,7 @@ obj_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
 			return (NULL);
 
 		zkva = zone->uz_kva + pages * PAGE_SIZE;
-		if (retkva == NULL)
+		if (retkva == 0)
 			retkva = zkva;
 		pmap_qenter(zkva, &p, 1);
 		bytes -= PAGE_SIZE;