Change a bunch of (<blah> *)0 to NULL.

ok beck@ deraadt@

37 files changed, 119 insertions, 119 deletions

diff --git a/sys/arch/amd64/amd64/db_interface.c b/sys/arch/amd64/amd64/db_interface.c
index 873b89eaf19..70714551204 100644
--- a/sys/arch/amd64/amd64/db_interface.c
+++ b/sys/arch/amd64/amd64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.24 2016/02/27 13:08:06 mpi Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.25 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.1 2003/04/26 18:39:27 fvdl Exp $	*/
 
 /*
@@ -374,7 +374,7 @@ struct db_command db_machine_command_table[] = {
 #if NACPI > 0
 	{ "acpi",	NULL,			0,	db_acpi_cmds },
 #endif /* NACPI > 0 */
-	{ (char *)0, },
+	{ NULL, },
 };
 
 void
diff --git a/sys/arch/amd64/stand/pxeboot/open.c b/sys/arch/amd64/stand/pxeboot/open.c
index 02c7f2dd8a6..c7f90f38bb1 100644
--- a/sys/arch/amd64/stand/pxeboot/open.c
+++ b/sys/arch/amd64/stand/pxeboot/open.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: open.c,v 1.1 2004/03/21 21:37:41 tom Exp $	*/
+/*	$OpenBSD: open.c,v 1.2 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: open.c,v 1.12 1996/09/30 16:01:21 ws Exp $	*/
 
 /*-
@@ -92,16 +92,16 @@ fnd:
 	 * Convert open mode (0,1,2) to F_READ, F_WRITE.
 	 */
 	f->f_flags = mode + 1;
-	f->f_dev = (struct devsw *)0;
-	f->f_ops = (struct fs_ops *)0;
-	file = (char *)0;
+	f->f_dev = NULL;
+	f->f_ops = NULL;
+	file = NULL;
 	error = devopen(f, fname, &file);
 	if (error ||
-	    (((f->f_flags & F_NODEV) == 0) && f->f_dev == (struct devsw *)0))
+	    (((f->f_flags & F_NODEV) == 0) && f->f_dev == NULL))
 		goto err;
 
 	/* see if we opened a raw device; otherwise, 'file' is the file name. */
-	if (file == (char *)0 || *file == '\0') {
+	if (file == NULL || *file == '\0') {
 		f->f_flags |= F_RAW;
 		return fd;
 	}
diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c
index 19694f7af76..16b3d258772 100644
--- a/sys/arch/i386/i386/db_interface.c
+++ b/sys/arch/i386/i386/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.32 2016/02/27 13:08:07 mpi Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.33 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $	*/
 
 /*
@@ -334,7 +334,7 @@ struct db_command db_machine_command_table[] = {
 #if NACPI > 0
 	{ "acpi",	NULL,			0,	db_acpi_cmds },
 #endif /* NACPI > 0 */
-	{ (char *)0, }
+	{ NULL, }
 };
 
 void
diff --git a/sys/arch/i386/stand/pxeboot/open.c b/sys/arch/i386/stand/pxeboot/open.c
index 3c91f3ab379..c7f90f38bb1 100644
--- a/sys/arch/i386/stand/pxeboot/open.c
+++ b/sys/arch/i386/stand/pxeboot/open.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: open.c,v 1.1 2004/03/19 13:48:19 tom Exp $	*/
+/*	$OpenBSD: open.c,v 1.2 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: open.c,v 1.12 1996/09/30 16:01:21 ws Exp $	*/
 
 /*-
@@ -92,16 +92,16 @@ fnd:
 	 * Convert open mode (0,1,2) to F_READ, F_WRITE.
 	 */
 	f->f_flags = mode + 1;
-	f->f_dev = (struct devsw *)0;
-	f->f_ops = (struct fs_ops *)0;
-	file = (char *)0;
+	f->f_dev = NULL;
+	f->f_ops = NULL;
+	file = NULL;
 	error = devopen(f, fname, &file);
 	if (error ||
-	    (((f->f_flags & F_NODEV) == 0) && f->f_dev == (struct devsw *)0))
+	    (((f->f_flags & F_NODEV) == 0) && f->f_dev == NULL))
 		goto err;
 
 	/* see if we opened a raw device; otherwise, 'file' is the file name. */
-	if (file == (char *)0 || *file == '\0') {
+	if (file == NULL || *file == '\0') {
 		f->f_flags |= F_RAW;
 		return fd;
 	}
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index 56fd80e36b2..6b094bbd431 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb.c,v 1.40 2015/06/24 11:58:06 mpi Exp $	*/
+/*	$OpenBSD: adb.c,v 1.41 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $	*/
 /*	$NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $	*/
 
@@ -865,7 +865,7 @@ adb_op(Ptr buffer, Ptr compRout, Ptr data, short command)
 		break;
 
 	case ADB_HW_CUDA:
-		result = send_adb_cuda((u_char *)0, (u_char *)buffer,
+		result = send_adb_cuda(NULL, (u_char *)buffer,
 		    (void *)compRout, (void *)data, (int)command);
 		if (result == 0)
 			return 0;
@@ -1419,7 +1419,7 @@ adb_set_date_time(time_t time)
 		output[4] = (u_char)(t >> 16);
 		output[5] = (u_char)(t >> 8);
 		output[6] = (u_char)(t);
-		result = send_adb_cuda((u_char *)output, (u_char *)0,
+		result = send_adb_cuda((u_char *)output, NULL,
 		    (void *)adb_op_comprout, (void *)&flag, (int)0);
 		if (result != 0)	/* exit if not sent */
 			return -1;
@@ -1461,8 +1461,8 @@ adb_poweroff(void)
 		output[0] = 0x02;	/* 2 byte message */
 		output[1] = 0x01;	/* to pram/rtc/soft-power device */
 		output[2] = 0x0a;	/* set poweroff */
-		result = send_adb_cuda((u_char *)output, (u_char *)0,
-		    (void *)0, (void *)0, (int)0);
+		result = send_adb_cuda((u_char *)output, NULL,
+		    NULL, NULL, (int)0);
 		if (result != 0)	/* exit if not sent */
 			return -1;
 
@@ -1535,8 +1535,8 @@ adb_restart()
 		output[0] = 0x02;	/* 2 byte message */
 		output[1] = 0x01;	/* to pram/rtc/soft-power device */
 		output[2] = 0x11;	/* restart */
-		result = send_adb_cuda((u_char *)output, (u_char *)0,
-				       (void *)0, (void *)0, (int)0);
+		result = send_adb_cuda((u_char *)output, NULL,
+				       NULL, NULL, (int)0);
 		if (result != 0)	/* exit if not sent */
 			return;
 		while (1);		/* not return */
diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c
index 3861c443090..3b7386adf3a 100644
--- a/sys/arch/macppc/dev/pm_direct.c
+++ b/sys/arch/macppc/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pm_direct.c,v 1.25 2013/04/23 07:38:05 mpi Exp $	*/
+/*	$OpenBSD: pm_direct.c,v 1.26 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $	*/
 
 /*
@@ -511,7 +511,7 @@ pm_adb_op(u_char *buffer, void *compRout, void *data, int command)
 	 * add number of ADB data to number of PM data
 	 */
 	if ((command & 0xc) == 0x8) {
-		if (buffer != (u_char *)0)
+		if (buffer != NULL)
 			pmdata.num_data = buffer[0] + 3;
 	} else
 		pmdata.num_data = 3;
@@ -537,7 +537,7 @@ pm_adb_op(u_char *buffer, void *compRout, void *data, int command)
 	pmdata.data[1] = 0;
 	/* if the command is LISTEN, copy ADB data to PM buffer */
 	if ((command & 0xc) == 0x8) {
-		if ((buffer != (u_char *)0) && (buffer[0] <= 24)) {
+		if ((buffer != NULL && (buffer[0] <= 24)) {
 			pmdata.data[2] = buffer[0];	/* number of data */
 			for (i = 0; i < buffer[0]; i++)
 				pmdata.data[3 + i] = buffer[1 + i];
diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c
index 09918214b5e..cd431bce357 100644
--- a/sys/arch/macppc/dev/zs.c
+++ b/sys/arch/macppc/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.25 2015/11/23 10:30:02 mpi Exp $	*/
+/*	$OpenBSD: zs.c,v 1.26 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: zs.c,v 1.17 2001/06/19 13:42:15 wiz Exp $	*/
 
 /*
@@ -346,7 +346,7 @@ zs_attach(struct device *parent, struct device *self, void *aux)
 	    zshard, NULL, "zs1");
 #ifdef ZS_TXDMA
 	mac_intr_establish(parent, intr[0][1], IST_LEVEL, IPL_TTY,
-	    zs_txdma_int, (void *)0, "zsdma0");
+	    zs_txdma_int, NULL, "zsdma0");
 	mac_intr_establish(parent, intr[1][1], IST_LEVEL, IPL_TTY,
 	    zs_txdma_int, (void *)1, "zsdma1");
 #endif
diff --git a/sys/arch/macppc/stand/alloc.c b/sys/arch/macppc/stand/alloc.c
index 6d6f9595d25..f8d883a75d5 100644
--- a/sys/arch/macppc/stand/alloc.c
+++ b/sys/arch/macppc/stand/alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alloc.c,v 1.9 2015/09/14 17:34:03 semarie Exp $	*/
+/*	$OpenBSD: alloc.c,v 1.10 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: alloc.c,v 1.1 1997/04/16 20:29:16 thorpej Exp $	*/
 
 /*
@@ -115,7 +115,7 @@ alloc(unsigned size)
 		if (f->size >= size)
 			break;
 	bestf = f;
-	failed = (bestf == (struct fl *)0);
+	failed = (bestf == NULL);
 #else
 	/* scan freelist */
 	LIST_FOREACH(f, &freelist, list) {
diff --git a/sys/arch/sgi/localbus/int.c b/sys/arch/sgi/localbus/int.c
index bad3c1291c4..1c970cec829 100644
--- a/sys/arch/sgi/localbus/int.c
+++ b/sys/arch/sgi/localbus/int.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: int.c,v 1.12 2016/03/06 19:42:27 mpi Exp $	*/
+/*	$OpenBSD: int.c,v 1.13 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: int.c,v 1.24 2011/07/01 18:53:46 dyoung Exp $	*/
 
 /*
@@ -363,7 +363,7 @@ int2_attach(struct device *parent, struct device *self, void *aux)
 	if (sys_config.system_type != SGI_IP20) {
 		/* Wire mappable interrupt handlers */
 		int2_intr_establish(INT2_L0_INTR(INT2_L0_IP22_MAP0), IPL_TTY,
-		    int2_mappable_intr, (void *)0, NULL);
+		    int2_mappable_intr, NULL, NULL);
 		int2_intr_establish(INT2_L1_INTR(INT2_L1_IP22_MAP1), IPL_TTY,
 		    int2_mappable_intr, (void *)1, NULL);
 	}
diff --git a/sys/arch/sgi/stand/boot/netfs.c b/sys/arch/sgi/stand/boot/netfs.c
index 07d61b352d8..f27a4ff87c8 100644
--- a/sys/arch/sgi/stand/boot/netfs.c
+++ b/sys/arch/sgi/stand/boot/netfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netfs.c,v 1.1 2012/03/19 17:38:31 miod Exp $	*/
+/*	$OpenBSD: netfs.c,v 1.2 2016/03/14 23:08:05 krw Exp $	*/
 
 /*-
  * Copyright (c) 2001 Steve Murphree, Jr.
@@ -187,8 +187,8 @@ netfs_close(f)
 {
 	struct tftp_file *fp = (struct tftp_file *)f->f_fsdata;
 
-	fp->f_buf = (void *)0;
-	f->f_fsdata = (void *)0;
+	fp->f_buf = NULL;
+	f->f_fsdata = NULL;
         (f->f_dev->dv_close)(f);
 	return (0);
 }
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index e363547d519..73fdeee3dbc 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.41 2016/03/07 13:21:51 naddy Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.42 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
 
 /*
@@ -1295,7 +1295,7 @@ struct db_command db_machine_command_table[] = {
 	{ "stopcpu",	db_stopproc_cmd,	0,	0 },
 	{ "ddbcpu",	db_ddbproc_cmd,		0,	0 },
 #endif
-	{ (char *)0, }
+	{ NULL, }
 };
 
 /*
diff --git a/sys/arch/sparc64/stand/ofwboot/alloc.c b/sys/arch/sparc64/stand/ofwboot/alloc.c
index 577406544e7..7c999b9711d 100644
--- a/sys/arch/sparc64/stand/ofwboot/alloc.c
+++ b/sys/arch/sparc64/stand/ofwboot/alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alloc.c,v 1.8 2015/09/14 17:34:03 semarie Exp $	*/
+/*	$OpenBSD: alloc.c,v 1.9 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: alloc.c,v 1.1 2000/08/20 14:58:37 mrg Exp $	*/
 
 /*
@@ -115,7 +115,7 @@ alloc(unsigned size)
 		if (f->size >= size)
 			break;
 	bestf = f;
-	failed = (bestf == (struct fl *)0);
+	failed = (bestf == NULL);
 #else
 	/* scan freelist */
 	LIST_FOREACH(f, &freelist, list) {
diff --git a/sys/arch/zaurus/stand/zboot/alloc.c b/sys/arch/zaurus/stand/zboot/alloc.c
index aa09eb2fa23..d6f34e0dff5 100644
--- a/sys/arch/zaurus/stand/zboot/alloc.c
+++ b/sys/arch/zaurus/stand/zboot/alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alloc.c,v 1.2 2015/09/14 17:34:04 semarie Exp $	*/
+/*	$OpenBSD: alloc.c,v 1.3 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: alloc.c,v 1.6 1997/02/04 18:36:33 thorpej Exp $	*/
 
 /*
@@ -109,7 +109,7 @@
 struct fl {
 	unsigned	size;
 	struct fl	*next;
-} *freelist = (struct fl *)0;
+} *freelist = NULL;
 
 static char heap[4 * 1024 * 1024];
 #define HEAP_START (heap)
@@ -137,10 +137,10 @@ alloc(unsigned int size)
 #endif
 
 #ifdef ALLOC_FIRST_FIT
-	while (*f != (struct fl *)0 && (*f)->size < size)
+	while (*f != NULL && (*f)->size < size)
 		f = &((*f)->next);
 	bestf = f;
-	failed = (*bestf == (struct fl *)0);
+	failed = (*bestf == NULL);
 #else
 	/* scan freelist */
 	while (*f) {
diff --git a/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c b/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c
index 5db2a464cdf..0cc12e4d533 100644
--- a/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c
+++ b/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zbsdmod.c,v 1.11 2015/01/18 14:55:02 jsg Exp $	*/
+/*	$OpenBSD: zbsdmod.c,v 1.12 2016/03/14 23:08:05 krw Exp $	*/
 
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de>
@@ -272,7 +272,7 @@ init_module()
 
 	entry = proc_mknod(ZBOOTDEV_NAME, ZBOOTDEV_MODE | S_IFCHR,
 	    &proc_root, MKDEV(ZBOOTDEV_MAJOR, 0));
-	if (entry == (struct proc_dir_entry *)0) {
+	if (entry == NULL) {
 		(void)unregister_chrdev(ZBOOTDEV_MAJOR, ZBOOTDEV_NAME);
 		return 1;
 	}
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index f0ac3d58fca..a1083b11956 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bha.c,v 1.30 2014/09/14 14:17:24 jsg Exp $	*/
+/*	$OpenBSD: bha.c,v 1.31 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $	*/
 
 #undef BHADEBUG
@@ -438,7 +438,7 @@ bha_intr(arg)
 		toggle.cmd.enable = 0;
 		bha_cmd(iot, ioh, sc,
 		    sizeof(toggle.cmd), (u_char *)&toggle.cmd,
-		    0, (u_char *)0);
+		    0, NULL);
 		bha_start_ccbs(sc);
 	}
 
@@ -648,7 +648,7 @@ bha_start_ccbs(sc)
 				toggle.cmd.enable = 1;
 				bha_cmd(iot, ioh, sc,
 				    sizeof(toggle.cmd), (u_char *)&toggle.cmd,
-				    0, (u_char *)0);
+				    0, NULL);
 				break;
 			}
 		}
@@ -952,7 +952,7 @@ bha_disable_isacompat(sc)
 	isa_disable.cmd.modifier = BHA_IOMODIFY_DISABLE1;
 	bha_cmd(sc->sc_iot, sc->sc_ioh, sc,
 	    sizeof(isa_disable.cmd), (u_char *)&isa_disable.cmd,
-	    0, (u_char *)0);
+	    0, NULL);
 	return (0);
 }
 
@@ -981,7 +981,7 @@ bha_init(sc)
 		toggle.cmd.enable = 1;
 		bha_cmd(iot, ioh, sc,
 		    sizeof(toggle.cmd), (u_char *)&toggle.cmd,
-		    0, (u_char *)0);
+		    0, NULL);
 	}
 
 	/*
@@ -1154,7 +1154,7 @@ bha_init(sc)
 	    offsetof(struct bha_control, bc_mbx), mailbox.cmd.addr);
 	bha_cmd(iot, ioh, sc,
 	    sizeof(mailbox.cmd), (u_char *)&mailbox.cmd,
-	    0, (u_char *)0);
+	    0, NULL);
 	return (0);
 }
 
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index f5b19aa407e..d97deeab057 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82596.c,v 1.50 2015/12/08 13:34:22 tedu Exp $	*/
+/*	$OpenBSD: i82596.c,v 1.51 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $	*/
 
 /*-
@@ -1924,7 +1924,7 @@ ie_mc_reset(sc)
 
 	if (ac->ac_multicnt >= IE_MAXMCAST || ac->ac_multirangecnt > 0) {
 		ac->ac_if.if_flags |= IFF_ALLMULTI;
-		i82596_ioctl(&ac->ac_if, SIOCSIFFLAGS, (void *)0);
+		i82596_ioctl(&ac->ac_if, SIOCSIFFLAGS, NULL);
 		return;
 	}
 
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 7e09e4330f6..7546f98b525 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha.c,v 1.80 2014/12/17 06:58:10 guenther Exp $	*/
+/*	$OpenBSD: aha.c,v 1.81 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $	*/
 
 #undef AHADIAG
@@ -536,7 +536,7 @@ ahaintr(arg)
 		toggle.cmd.opcode = AHA_MBO_INTR_EN;
 		toggle.cmd.enable = 0;
 		aha_cmd(iobase, sc, sizeof(toggle.cmd), (u_char *)&toggle.cmd,
-		    0, (u_char *)0);
+		    0, NULL);
 		aha_start_ccbs(sc);
 	}
 
@@ -756,7 +756,7 @@ aha_start_ccbs(sc)
 				toggle.cmd.opcode = AHA_MBO_INTR_EN;
 				toggle.cmd.enable = 1;
 				aha_cmd(iobase, sc, sizeof(toggle.cmd),
-				    (u_char *)&toggle.cmd, 0, (u_char *)0);
+				    (u_char *)&toggle.cmd, 0, NULL);
 				break;
 			}
 		}
@@ -1031,7 +1031,7 @@ aha_init(sc)
 		unlock.cmd.junk = 0;
 		unlock.cmd.magic = extbios.reply.mailboxlock;
 		aha_cmd(iobase, sc, sizeof(unlock.cmd), (u_char *)&unlock.cmd,
-		    0, (u_char *)0);
+		    0, NULL);
 	}
 
 #if 0
@@ -1108,7 +1108,7 @@ aha_init(sc)
 	mailbox.cmd.nmbx = AHA_MBX_SIZE;
 	ltophys(vtophys((vaddr_t)wmbx), mailbox.cmd.addr);
 	aha_cmd(iobase, sc, sizeof(mailbox.cmd), (u_char *)&mailbox.cmd,
-	    0, (u_char *)0);
+	    0, NULL);
 }
 
 void
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 79a0e731040..649ced9d63b 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.49 2015/12/08 13:34:22 tedu Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.50 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -2082,7 +2082,7 @@ mc_reset(sc)
 
 	if (ac->ac_multirangecnt > 0) {
 		ac->ac_if.if_flags |= IFF_ALLMULTI;
-		ieioctl(&ac->ac_if, SIOCSIFFLAGS, (void *)0);
+		ieioctl(&ac->ac_if, SIOCSIFFLAGS, NULL);
 		goto setflag;
 	}
 	/*
@@ -2093,7 +2093,7 @@ mc_reset(sc)
 	while (enm) {
 		if (sc->mcast_count >= MAXMCAST) {
 			ac->ac_if.if_flags |= IFF_ALLMULTI;
-			ieioctl(&ac->ac_if, SIOCSIFFLAGS, (void *)0);
+			ieioctl(&ac->ac_if, SIOCSIFFLAGS, NULL);
 			goto setflag;
 		}
 
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index 05d7d9f1700..40f3359e336 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_core.c,v 1.37 2016/02/15 19:21:46 stefan Exp $	*/
+/*	$OpenBSD: bktr_core.c,v 1.38 2016/03/14 23:08:06 krw Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */
 
 /*
@@ -880,7 +880,7 @@ video_open( bktr_ptr_t bktr )
 	bktr->frames_captured = 0;
 	bktr->even_fields_captured = 0;
 	bktr->odd_fields_captured = 0;
-	bktr->proc = (struct proc *)0;
+	bktr->proc = NULL;
 	set_fps(bktr, frame_rate);
 	bktr->video.addr = 0;
 	bktr->video.width = 0;
diff --git a/sys/dev/pcmcia/gpr.c b/sys/dev/pcmcia/gpr.c
index b35ec42a5a8..46902793854 100644
--- a/sys/dev/pcmcia/gpr.c
+++ b/sys/dev/pcmcia/gpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpr.c,v 1.16 2011/07/03 15:47:17 matthew Exp $	*/
+/*	$OpenBSD: gpr.c,v 1.17 2016/03/14 23:08:06 krw Exp $	*/
 
 /*
  * Copyright (c) 2002, Federico G. Schwindt
@@ -275,7 +275,7 @@ gprclose(dev_t dev, int flags, int mode, struct proc *p)
 
 	DPRINTF(("%s: flags %d, mode %d\n", __func__, flags, mode));
 
-	(void)tlvput(sc, GPR400_CLOSE, (u_int8_t *)0, 0);
+	(void)tlvput(sc, GPR400_CLOSE, NULL, 0);
 
 	return (0);
 }
@@ -331,7 +331,7 @@ gprioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		break;
 
 	case GPR_CLOSE:
-		error = tlvput(sc, GPR400_CLOSE, (u_int8_t *)0, 0);
+		error = tlvput(sc, GPR400_CLOSE, NULL, 0);
 		break;
 
 	case GPR_RAM:
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index c5c3172ba0b..dca05589a9b 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vfsops.c,v 1.73 2016/03/07 18:43:59 naddy Exp $	*/
+/*	$OpenBSD: cd9660_vfsops.c,v 1.74 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $	*/
 
 /*-
@@ -229,7 +229,7 @@ iso_mountfs(devvp, mp, p, argp)
 	struct proc *p;
 	struct iso_args *argp;
 {
-	register struct iso_mnt *isomp = (struct iso_mnt *)0;
+	register struct iso_mnt *isomp = NULL;
 	struct buf *bp = NULL;
 	struct buf *pribp = NULL, *supbp = NULL;
 	dev_t dev = devvp->v_rdev;
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index a642ca1cf2f..d0af479b3e9 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_acct.c,v 1.30 2015/12/05 10:11:53 tedu Exp $	*/
+/*	$OpenBSD: kern_acct.c,v 1.31 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: kern_acct.c,v 1.42 1996/02/04 02:15:12 christos Exp $	*/
 
 /*-
@@ -292,7 +292,7 @@ acct_thread(void *arg)
 				savacctp = NULL;
 				break;
 			}
-			(void)VFS_STATFS(savacctp->v_mount, &sb, (struct proc *)0);
+			(void)VFS_STATFS(savacctp->v_mount, &sb, NULL);
 			if (sb.f_bavail > acctresume * sb.f_blocks / 100) {
 				acctp = savacctp;
 				savacctp = NULL;
@@ -304,7 +304,7 @@ acct_thread(void *arg)
 				acctp = NULL;
 				break;
 			}
-			(void)VFS_STATFS(acctp->v_mount, &sb, (struct proc *)0);
+			(void)VFS_STATFS(acctp->v_mount, &sb, NULL);
 			if (sb.f_bavail <= acctsuspend * sb.f_blocks / 100) {
 				savacctp = acctp;
 				acctp = NULL;
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 2a5bcdedca0..3fff153e8ad 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_autoconf.c,v 1.91 2015/12/20 10:03:23 mpi Exp $	*/
+/*	$OpenBSD: subr_autoconf.c,v 1.92 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $	*/
 
 /*
@@ -380,7 +380,7 @@ config_attach(struct device *parent, void *match, void *aux, cfprint_t print)
 	else {
 		printf("%s at %s", dev->dv_xname, parent->dv_xname);
 		if (print)
-			(void) (*print)(aux, (char *)0);
+			(void) (*print)(aux, NULL);
 	}
 
 	/*
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 4f41dbc4abb..0f81ab61d72 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty_subr.c,v 1.32 2015/03/14 03:38:51 jsg Exp $	*/
+/*	$OpenBSD: tty_subr.c,v 1.33 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: tty_subr.c,v 1.13 1996/02/09 19:00:43 christos Exp $	*/
 
 /*
@@ -105,7 +105,7 @@ getc(struct clist *clp)
 	if (++clp->c_cf == clp->c_ce)
 		clp->c_cf = clp->c_cs;
 	if (--clp->c_cc == 0)
-		clp->c_cf = clp->c_cl = (u_char *)0;
+		clp->c_cf = clp->c_cl = NULL;
 out:
 	splx(s);
 	return c;
@@ -142,7 +142,7 @@ q_to_b(struct clist *clp, u_char *cp, int count)
 			clp->c_cf = clp->c_cs;
 	}
 	if (clp->c_cc == 0)
-		clp->c_cf = clp->c_cl = (u_char *)0;
+		clp->c_cf = clp->c_cl = NULL;
 	splx(s);
 	return p - cp;
 }
@@ -202,7 +202,7 @@ ndflush(struct clist *clp, int count)
 	s = spltty();
 	if (count == clp->c_cc) {
 		clp->c_cc = 0;
-		clp->c_cf = clp->c_cl = (u_char *)0;
+		clp->c_cf = clp->c_cl = NULL;
 		goto out;
 	}
 	/* optimize this while loop */
@@ -219,7 +219,7 @@ ndflush(struct clist *clp, int count)
 			clp->c_cf = clp->c_cs;
 	}
 	if (clp->c_cc == 0)
-		clp->c_cf = clp->c_cl = (u_char *)0;
+		clp->c_cf = clp->c_cl = NULL;
 out:
 	splx(s);
 }
@@ -442,7 +442,7 @@ unputc(struct clist *clp)
 		clrbit(clp->c_cq, clp->c_cl - clp->c_cs);
 	}
 	if (clp->c_cc == 0)
-		clp->c_cf = clp->c_cl = (u_char *)0;
+		clp->c_cf = clp->c_cl = NULL;
 out:
 	splx(s);
 	return c;
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 1bed64007f3..f563ba9dcd3 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket.c,v 1.149 2016/01/15 11:58:34 bluhm Exp $	*/
+/*	$OpenBSD: uipc_socket.c,v 1.150 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $	*/
 
 /*
@@ -1253,7 +1253,7 @@ somove(struct socket *so, int wait)
 		sbdroprecord(&so->so_rcv);
 		if (so->so_proto->pr_flags & PR_WANTRCVD && so->so_pcb)
 			(so->so_proto->pr_usrreq)(so, PRU_RCVD, NULL,
-			    (struct mbuf *)0L, NULL, NULL);
+			    NULL, NULL, NULL);
 		goto nextpkt;
 	}
 
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 321c0781b08..56f037c98d0 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.238 2015/12/05 10:11:53 tedu Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.239 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -890,7 +890,7 @@ vflush_vnode(struct vnode *vp, void *arg) {
 		} else {
 			vclean(vp, 0, p);
 			vp->v_op = &spec_vops;
-			insmntque(vp, (struct mount *)0);
+			insmntque(vp, NULL);
 		}
 		return (0);
 	}
@@ -1059,7 +1059,7 @@ vgonel(struct vnode *vp, struct proc *p)
 	 * Delete from old mount point vnode list, if on one.
 	 */
 	if (vp->v_mount != NULL)
-		insmntque(vp, (struct mount *)0);
+		insmntque(vp, NULL);
 	/*
 	 * If special device, remove it from special device alias list
 	 * if it is on one.
@@ -1250,7 +1250,7 @@ printlockedvnodes(void)
 			continue;
 		LIST_FOREACH(vp, &mp->mnt_vnodelist, v_mntvnodes) {
 			if (VOP_ISLOCKED(vp))
-				vprint((char *)0, vp);
+				vprint(NULL, vp);
 		}
 		vfs_unbusy(mp);
  	}
@@ -1599,7 +1599,7 @@ vfs_shutdown(void)
 
 	if (panicstr == 0) {
 		/* Sync before unmount, in case we hang on something. */
-		sys_sync(&proc0, (void *)0, (register_t *)0);
+		sys_sync(&proc0, NULL, NULL);
 
 		/* Unmount file systems. */
 		vfs_unmountall();
@@ -1631,7 +1631,7 @@ vfs_syncwait(int verbose)
 #endif
 
 	p = curproc? curproc : &proc0;
-	sys_sync(p, (void *)0, (register_t *)0);
+	sys_sync(p, NULL, NULL);
 
 	/* Wait for sync to finish. */
 	dcount = 10000;
diff --git a/sys/lib/libsa/alloc.c b/sys/lib/libsa/alloc.c
index 1714ec06600..5b51787733e 100644
--- a/sys/lib/libsa/alloc.c
+++ b/sys/lib/libsa/alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alloc.c,v 1.11 2015/09/14 17:34:04 semarie Exp $	*/
+/*	$OpenBSD: alloc.c,v 1.12 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: alloc.c,v 1.6 1997/02/04 18:36:33 thorpej Exp $	*/
 
 /*
@@ -115,7 +115,7 @@
 struct fl {
 	unsigned	size;
 	struct fl	*next;
-} *freelist = (struct fl *)0;
+} *freelist = NULL;
 
 #ifdef NEEDS_HEAP_H
 #include "heap.h"
@@ -148,10 +148,10 @@ alloc(unsigned int size)
 #endif
 
 #ifdef ALLOC_FIRST_FIT
-	while (*f != (struct fl *)0 && (*f)->size < size)
+	while (*f != NULL && (*f)->size < size)
 		f = &((*f)->next);
 	bestf = f;
-	failed = (*bestf == (struct fl *)0);
+	failed = (*bestf == NULL);
 #else
 	/* scan freelist */
 	while (*f) {
diff --git a/sys/lib/libsa/netif.c b/sys/lib/libsa/netif.c
index 083d962224b..afa18cebbd7 100644
--- a/sys/lib/libsa/netif.c
+++ b/sys/lib/libsa/netif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netif.c,v 1.10 2014/07/13 15:31:20 mpi Exp $	*/
+/*	$OpenBSD: netif.c,v 1.11 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: netif.c,v 1.7 1996/10/13 02:29:03 christos Exp $	*/
 
 /*
@@ -281,7 +281,7 @@ netif_open(void *machdep_hint)
 
 	/* find a free socket */
 	for (fd = 0, s = sockets; fd < SOPEN_MAX; fd++, s++)
-		if (s->io_netif == (struct netif *)0)
+		if (s->io_netif == NULL)
 			goto fnd;
 	errno = EMFILE;
 	return (-1);
@@ -311,7 +311,7 @@ netif_close(int sock)
 		return(-1);
 	}
 	netif_detach(sockets[sock].io_netif);
-	sockets[sock].io_netif = (struct netif *)0;
+	sockets[sock].io_netif = NULL;
 
 	return(0);
 }
diff --git a/sys/lib/libsa/nfs.c b/sys/lib/libsa/nfs.c
index 2b85570a652..e621f09adec 100644
--- a/sys/lib/libsa/nfs.c
+++ b/sys/lib/libsa/nfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs.c,v 1.13 2015/08/15 19:40:59 miod Exp $	*/
+/*	$OpenBSD: nfs.c,v 1.14 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: nfs.c,v 1.19 1996/10/13 02:29:04 christos Exp $	*/
 
 /*-
@@ -504,7 +504,7 @@ nfs_close(struct open_file *f)
 
 	if (fp)
 		free(fp, sizeof(struct nfs_iodesc));
-	f->f_fsdata = (void *)0;
+	f->f_fsdata = NULL;
 
 	return (0);
 }
diff --git a/sys/lib/libsa/open.c b/sys/lib/libsa/open.c
index 46bba1a42be..d70f2751e71 100644
--- a/sys/lib/libsa/open.c
+++ b/sys/lib/libsa/open.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: open.c,v 1.10 2003/08/11 06:23:09 deraadt Exp $	*/
+/*	$OpenBSD: open.c,v 1.11 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: open.c,v 1.12 1996/09/30 16:01:21 ws Exp $	*/
 
 /*-
@@ -92,16 +92,16 @@ fnd:
 	 * Convert open mode (0,1,2) to F_READ, F_WRITE.
 	 */
 	f->f_flags = mode + 1;
-	f->f_dev = (struct devsw *)0;
-	f->f_ops = (struct fs_ops *)0;
-	file = (char *)0;
+	f->f_dev = NULL;
+	f->f_ops = NULL;
+	file = NULL;
 	error = devopen(f, fname, &file);
 	if (error ||
-	    (((f->f_flags & F_NODEV) == 0) && f->f_dev == (struct devsw *)0))
+	    (((f->f_flags & F_NODEV) == 0) && f->f_dev == NULL))
 		goto err;
 
 	/* see if we opened a raw device; otherwise, 'file' is the file name. */
-	if (file == (char *)0 || *file == '\0') {
+	if (file == NULL || *file == '\0') {
 		f->f_flags |= F_RAW;
 		return (fd);
 	}
diff --git a/sys/lib/libz/deflate.c b/sys/lib/libz/deflate.c
index 299daf4d63d..2178f312452 100644
--- a/sys/lib/libz/deflate.c
+++ b/sys/lib/libz/deflate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: deflate.c,v 1.2 2011/07/16 07:25:29 jsing Exp $	*/
+/*	$OpenBSD: deflate.c,v 1.3 2016/03/14 23:08:06 krw Exp $	*/
 /* deflate.c -- compress data using the deflation algorithm
  * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -807,7 +807,7 @@ int ZEXPORT deflate (strm, flush)
             if (flush == Z_PARTIAL_FLUSH) {
                 _tr_align(s);
             } else { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
+                _tr_stored_block(s, NULL, 0L, 0);
                 /* For a full flush, this empty block will be recognized
                  * as a special marker by inflate_sync().
                  */
diff --git a/sys/lib/libz/trees.c b/sys/lib/libz/trees.c
index 9ca7baf2750..ac1c93718c9 100644
--- a/sys/lib/libz/trees.c
+++ b/sys/lib/libz/trees.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trees.c,v 1.2 2011/07/16 07:25:29 jsing Exp $	*/
+/*	$OpenBSD: trees.c,v 1.3 2016/03/14 23:08:06 krw Exp $	*/
 /* trees.c -- output deflated data using Huffman coding
  * Copyright (C) 1995-2005 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -962,14 +962,14 @@ void _tr_flush_block(s, buf, stored_len, eof)
         if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
 
     } else {
-        Assert(buf != (char*)0, "lost buf");
+        Assert(buf != NULL, "lost buf");
         opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
     }
 
 #ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
+    if (buf != NULL) { /* force stored block */
 #else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+    if (stored_len+4 <= opt_lenb && buf != NULL) {
                        /* 4: two words for the lengths */
 #endif
         /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index b3c9db1de6d..35115b6876d 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.107 2016/02/05 19:27:02 stefan Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.108 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $	*/
 
 /*-
@@ -1153,7 +1153,7 @@ abortit:
 		bcopy(toname, ip->de_Name, 11);	/* update denode */
 		dp->de_fndoffset = to_diroffset;
 		dp->de_fndcnt = to_count;
-		error = createde(ip, dp, (struct denode **)0, tcnp);
+		error = createde(ip, dp, NULL, tcnp);
 		if (error) {
 			bcopy(oldname, ip->de_Name, 11);
 			if (newparent)
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index b9375930b01..81e9a393d5b 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.154 2016/01/21 11:23:48 mpi Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.155 2016/03/14 23:08:06 krw Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -156,7 +156,7 @@ ip6_init(void)
 	ip6_randomid_init();
 	nd6_init();
 	frag6_init();
-	ip6_init2((void *)0);
+	ip6_init2(NULL);
 
 	mq_init(&ip6send_mq, 64, IPL_SOFTNET);
 }
diff --git a/sys/ufs/ext2fs/ext2fs_lookup.c b/sys/ufs/ext2fs/ext2fs_lookup.c
index 6f9f670b597..c9d6efba009 100644
--- a/sys/ufs/ext2fs/ext2fs_lookup.c
+++ b/sys/ufs/ext2fs/ext2fs_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_lookup.c,v 1.40 2016/02/16 17:56:12 stefan Exp $	*/
+/*	$OpenBSD: ext2fs_lookup.c,v 1.41 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: ext2fs_lookup.c,v 1.16 2000/08/03 20:29:26 thorpej Exp $	*/
 
 /*
@@ -794,7 +794,7 @@ ext2fs_direnter(struct inode *ip, struct vnode *dvp,
 		auio.uio_iovcnt = 1;
 		auio.uio_rw = UIO_WRITE;
 		auio.uio_segflg = UIO_SYSSPACE;
-		auio.uio_procp = (struct proc *)0;
+		auio.uio_procp = NULL;
 		error = VOP_WRITE(dvp, &auio, IO_SYNC, cnp->cn_cred);
 		if (dirblksize >
 			VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_bsize)
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index b6c966e78f4..ac1af07603d 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mfs_vfsops.c,v 1.48 2015/03/14 03:38:52 jsg Exp $	*/
+/*	$OpenBSD: mfs_vfsops.c,v 1.49 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $	*/
 
 /*
@@ -128,7 +128,7 @@ mfs_mount(struct mount *mp, const char *path, void *data,
 	if (error)
 		return (error);
 	devvp->v_type = VBLK;
-	if (checkalias(devvp, makedev(255, mfs_minor), (struct mount *)0))
+	if (checkalias(devvp, makedev(255, mfs_minor), NULL))
 		panic("mfs_mount: dup dev");
 	mfs_minor++;
 	mfsp = malloc(sizeof *mfsp, M_MFSNODE, M_WAITOK | M_ZERO);
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 692d97e548a..2126a0e892d 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_quota.c,v 1.37 2015/01/09 05:01:57 tedu Exp $	*/
+/*	$OpenBSD: ufs_quota.c,v 1.38 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: ufs_quota.c,v 1.8 1996/02/09 22:36:09 christos Exp $	*/
 
 /*
@@ -916,7 +916,7 @@ dqget(struct vnode *vp, u_long id, struct ufsmount *ump, int type,
 	auio.uio_offset = (off_t)(id * sizeof (struct dqblk));
 	auio.uio_segflg = UIO_SYSSPACE;
 	auio.uio_rw = UIO_READ;
-	auio.uio_procp = (struct proc *)0;
+	auio.uio_procp = NULL;
 	error = VOP_READ(dqvp, &auio, 0, dq->dq_cred);
 	if (auio.uio_resid == sizeof(struct dqblk) && error == 0)
 		memset(&dq->dq_dqb, 0, sizeof(struct dqblk));
@@ -1011,7 +1011,7 @@ dqsync(struct vnode *vp, struct dquot *dq)
 	auio.uio_offset = (off_t)(dq->dq_id * sizeof (struct dqblk));
 	auio.uio_segflg = UIO_SYSSPACE;
 	auio.uio_rw = UIO_WRITE;
-	auio.uio_procp = (struct proc *)0;
+	auio.uio_procp = NULL;
 	error = VOP_WRITE(dqvp, &auio, 0, dq->dq_cred);
 	if (auio.uio_resid && error == 0)
 		error = EIO;