From 201b3f374ded81de7c2011fa9f40ee648c4610a6 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 6 Jun 2008 13:19:25 +0000 Subject: [PATCH] Don't use NULL where 0 is meant. --- sys/platform/vkernel/i386/cpu_regs.c | 4 ++-- sys/platform/vkernel/platform/busdma_machdep.c | 4 ++-- sys/platform/vkernel/platform/pmap.c | 4 ++-- sys/platform/vkernel/platform/systimer.c | 6 +++--- usr.sbin/vnconfig/vnconfig.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/platform/vkernel/i386/cpu_regs.c b/sys/platform/vkernel/i386/cpu_regs.c index 44501ae205..e6958c0624 100644 --- a/sys/platform/vkernel/i386/cpu_regs.c +++ b/sys/platform/vkernel/i386/cpu_regs.c @@ -37,7 +37,7 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $ - * $DragonFly: src/sys/platform/vkernel/i386/cpu_regs.c,v 1.28 2008/05/19 10:29:58 corecode Exp $ + * $DragonFly: src/sys/platform/vkernel/i386/cpu_regs.c,v 1.29 2008/06/06 13:19:25 swildner Exp $ */ #include "use_ether.h" @@ -154,7 +154,7 @@ sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "IU", ""); -SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &Maxmem, NULL, ""); +SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &Maxmem, 0, ""); #if 0 diff --git a/sys/platform/vkernel/platform/busdma_machdep.c b/sys/platform/vkernel/platform/busdma_machdep.c index d32e867e19..3cdf4f9b33 100644 --- a/sys/platform/vkernel/platform/busdma_machdep.c +++ b/sys/platform/vkernel/platform/busdma_machdep.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.16.2.2 2003/01/23 00:55:27 scottl Exp $ - * $DragonFly: src/sys/platform/vkernel/platform/busdma_machdep.c,v 1.2 2008/01/05 14:02:41 swildner Exp $ + * $DragonFly: src/sys/platform/vkernel/platform/busdma_machdep.c,v 1.3 2008/06/06 13:19:25 swildner Exp $ */ #include @@ -787,7 +787,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) { kfree(bpage, M_DEVBUF); break; } diff --git a/sys/platform/vkernel/platform/pmap.c b/sys/platform/vkernel/platform/pmap.c index 80dd9d593d..bb44b213f2 100644 --- a/sys/platform/vkernel/platform/pmap.c +++ b/sys/platform/vkernel/platform/pmap.c @@ -38,7 +38,7 @@ * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.250.2.18 2002/03/06 22:48:53 silby Exp $ - * $DragonFly: src/sys/platform/vkernel/platform/pmap.c,v 1.29 2008/05/09 07:24:47 dillon Exp $ + * $DragonFly: src/sys/platform/vkernel/platform/pmap.c,v 1.30 2008/06/06 13:19:25 swildner Exp $ */ /* * NOTE: PMAP_INVAL_ADD: In pc32 this function is called prior to adjusting @@ -2154,7 +2154,7 @@ pmap_prefault(pmap_t pmap, vm_offset_t addra, vm_map_entry_t entry) /* * Make sure the page table page already exists */ - if ((*pmap_pde(pmap, addr)) == NULL) + if ((*pmap_pde(pmap, addr)) == 0) continue; /* diff --git a/sys/platform/vkernel/platform/systimer.c b/sys/platform/vkernel/platform/systimer.c index 8e30e0743b..6d282c5f7e 100644 --- a/sys/platform/vkernel/platform/systimer.c +++ b/sys/platform/vkernel/platform/systimer.c @@ -31,7 +31,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/platform/vkernel/platform/systimer.c,v 1.16 2008/05/10 17:24:12 dillon Exp $ + * $DragonFly: src/sys/platform/vkernel/platform/systimer.c,v 1.17 2008/06/06 13:19:25 swildner Exp $ */ #include @@ -101,7 +101,7 @@ cpu_initclocks(void *arg __unused) kprintf("initclocks\n"); len = sizeof(vkernel_cputimer.freq); if (sysctlbyname("kern.cputimer.freq", &vkernel_cputimer.freq, &len, - NULL, NULL) < 0) { + NULL, 0) < 0) { panic("cpu_initclocks: can't get kern.cputimer.freq!"); } len = sizeof(cputimer_mib)/sizeof(cputimer_mib[0]); @@ -136,7 +136,7 @@ vkernel_timer_get_timecount(void) len = sizeof(counter); if (sysctl(cputimer_mib, cputimer_miblen, &counter, &len, - NULL, NULL) < 0) { + NULL, 0) < 0) { panic("vkernel_timer_get_timecount: sysctl failed!"); } return(counter); diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c index 17af007ecc..00b052b1bd 100644 --- a/usr.sbin/vnconfig/vnconfig.c +++ b/usr.sbin/vnconfig/vnconfig.c @@ -39,7 +39,7 @@ * * @(#)vnconfig.c 8.1 (Berkeley) 12/15/93 * $FreeBSD: src/usr.sbin/vnconfig/vnconfig.c,v 1.13.2.7 2003/06/02 09:10:27 maxim Exp $ - * $DragonFly: src/usr.sbin/vnconfig/vnconfig.c,v 1.13 2008/01/30 11:46:33 cat Exp $ + * $DragonFly: src/usr.sbin/vnconfig/vnconfig.c,v 1.14 2008/06/06 13:19:25 swildner Exp $ */ #include @@ -282,7 +282,7 @@ getinfo( const char *vname ) } else { tmp = (char *) vname; - while (*tmp != NULL) { + while (*tmp != 0) { if(isdigit(*tmp)){ i = atoi(tmp); printlim = i + 1; -- 2.41.0