Catch a few places where NULL (pointer) was used where 0 (integer) was

expected.

3 files changed, 8 insertions, 8 deletions

diff --git a/sys/alpha/alpha/db_trace.c b/sys/alpha/alpha/db_trace.c
index c203168..b269dc0 100644
--- a/sys/alpha/alpha/db_trace.c
+++ b/sys/alpha/alpha/db_trace.c
@@ -99,7 +99,7 @@ static struct special_symbol {
 	{ (uintptr_t)&XentSys,		"syscall" },
 	{ (uintptr_t)&XentUna,		"unaligned access fault" },
 	{ (uintptr_t)&XentRestart,	"console restart" },
-	{ NULL }
+	{ 0, NULL }
 };
 
 
@@ -180,7 +180,7 @@ sym_is_trapsymbol(uintptr_t v)
 {
 	int i;
 
-	for (i = 0; special_symbols[i].ss_val != NULL; ++i)
+	for (i = 0; special_symbols[i].ss_val != 0; ++i)
 		if (v == special_symbols[i].ss_val)
 			return 1;
 	return 0;
@@ -339,7 +339,7 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *m
 		if (sym_is_trapsymbol(symval)) {
 			tf = (struct trapframe *)frame;
 
-			for (i = 0; special_symbols[i].ss_val != NULL; ++i)
+			for (i = 0; special_symbols[i].ss_val != 0; ++i)
 				if (symval == special_symbols[i].ss_val)
 					db_printf("--- %s",
 					    special_symbols[i].ss_note);
diff --git a/sys/alpha/alpha/dump_machdep.c b/sys/alpha/alpha/dump_machdep.c
index 0b5a883..42523d7 100644
--- a/sys/alpha/alpha/dump_machdep.c
+++ b/sys/alpha/alpha/dump_machdep.c
@@ -88,7 +88,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;
@@ -111,7 +111,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;
@@ -120,10 +120,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/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index cd9da04..a7cce49 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -292,7 +292,7 @@ apecs_attach(device_t dev)
 	sc->smem_base = APECS_PCI_SPARSE;
 	sc->io_base = APECS_PCI_SIO;
 	sc->cfg0_base = KV(APECS_PCI_CONF);
-	sc->cfg1_base = NULL;
+	sc->cfg1_base = 0;
 
 	set_iointr(alpha_dispatch_intr);