reinstate NULL cast by request, where the NULL was being passed as a vararg

8 files changed, 26 insertions, 26 deletions

diff --git a/cribbage/instr.c b/cribbage/instr.c
index 9f1376b9..5cd8f71f 100644
--- a/cribbage/instr.c
+++ b/cribbage/instr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: instr.c,v 1.13 2011/08/31 16:24:55 plunky Exp $	*/
+/*	$NetBSD: instr.c,v 1.14 2011/09/01 07:18:50 plunky Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)instr.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: instr.c,v 1.13 2011/08/31 16:24:55 plunky Exp $");
+__RCSID("$NetBSD: instr.c,v 1.14 2011/09/01 07:18:50 plunky Exp $");
 #endif
 #endif /* not lint */
 
@@ -85,7 +85,7 @@ instructions(void)
 			warn("dup2");
 			_exit(1);
 		}
-		execl("/bin/sh", "sh", "-c", path, NULL);
+		execl("/bin/sh", "sh", "-c", path, (char *) NULL);
 		warn(NULL);
 		_exit(1);
 	default:
diff --git a/fish/fish.c b/fish/fish.c
index c9a137b9..c7c342ab 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fish.c,v 1.21 2011/08/31 16:24:55 plunky Exp $	*/
+/*	$NetBSD: fish.c,v 1.22 2011/09/01 07:18:50 plunky Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\
 #if 0
 static char sccsid[] = "@(#)fish.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: fish.c,v 1.21 2011/08/31 16:24:55 plunky Exp $");
+__RCSID("$NetBSD: fish.c,v 1.22 2011/09/01 07:18:50 plunky Exp $");
 #endif
 #endif /* not lint */
 
@@ -456,7 +456,7 @@ instructions(void)
 			err(1, "open %s", _PATH_INSTR);
 		if (dup2(fd, 0) == -1)
 			err(1, "dup2");
-		(void)execl("/bin/sh", "sh", "-c", pager, NULL);
+		(void)execl("/bin/sh", "sh", "-c", pager, (char *) NULL);
 		err(1, "exec sh -c %s", pager);
 		/*NOTREACHED*/
 	case -1:
diff --git a/hack/hack.pager.c b/hack/hack.pager.c
index d2e6422b..6d9855f5 100644
--- a/hack/hack.pager.c
+++ b/hack/hack.pager.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.pager.c,v 1.20 2011/08/31 16:24:56 plunky Exp $	*/
+/*	$NetBSD: hack.pager.c,v 1.21 2011/09/01 07:18:50 plunky Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.pager.c,v 1.20 2011/08/31 16:24:56 plunky Exp $");
+__RCSID("$NetBSD: hack.pager.c,v 1.21 2011/09/01 07:18:50 plunky Exp $");
 #endif				/* not lint */
 
 /* This file contains the command routine dowhatis() and a pager. */
@@ -392,7 +392,7 @@ page_file(const char *fnam, boolean silent)
 				if (!silent)
 					printf("Cannot open %s as stdin.\n", fnam);
 			} else {
-				execl(catmore, "page", NULL);
+				execl(catmore, "page", (char *)NULL);
 				if (!silent)
 					printf("Cannot exec %s.\n", catmore);
 			}
@@ -428,9 +428,9 @@ dosh(void)
 	char           *str;
 	if (child(0)) {
 		if ((str = getenv("SHELL")) != NULL)
-			execl(str, str, NULL);
+			execl(str, str, (char *)NULL);
 		else
-			execl("/bin/sh", "sh", NULL);
+			execl("/bin/sh", "sh", (char *)NULL);
 		pline("sh: cannot execute.");
 		exit(1);
 	}
diff --git a/hack/hack.unix.c b/hack/hack.unix.c
index 8e82fefa..dd4c6799 100644
--- a/hack/hack.unix.c
+++ b/hack/hack.unix.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.unix.c,v 1.16 2011/08/31 16:24:56 plunky Exp $	*/
+/*	$NetBSD: hack.unix.c,v 1.17 2011/09/01 07:18:50 plunky Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.unix.c,v 1.16 2011/08/31 16:24:56 plunky Exp $");
+__RCSID("$NetBSD: hack.unix.c,v 1.17 2011/09/01 07:18:50 plunky Exp $");
 #endif				/* not lint */
 
 /* This file collects some Unix dependencies; hack.pager.c contains some more */
@@ -506,7 +506,7 @@ readmail(void)
 	if (!(mr = getenv("MAILREADER")))
 		mr = DEF_MAILREADER;
 	if (child(1)) {
-		execl(mr, mr, NULL);
+		execl(mr, mr, (char *)NULL);
 		exit(1);
 	}
 #else	/* DEF_MAILREADER */
diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
index 30bdb55a..133741b7 100644
--- a/hunt/hunt/hunt.c
+++ b/hunt/hunt/hunt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hunt.c,v 1.40 2011/08/31 16:24:56 plunky Exp $	*/
+/*	$NetBSD: hunt.c,v 1.41 2011/09/01 07:18:50 plunky Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hunt.c,v 1.40 2011/08/31 16:24:56 plunky Exp $");
+__RCSID("$NetBSD: hunt.c,v 1.41 2011/09/01 07:18:50 plunky Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -624,10 +624,10 @@ start_driver(void)
 #else
 		if (use_port == NULL)
 #endif
-			execl(Driver, "HUNT", NULL);
+			execl(Driver, "HUNT", (char *) NULL);
 #ifdef INTERNET
 		else
-			execl(Driver, "HUNT", "-p", use_port, NULL);
+			execl(Driver, "HUNT", "-p", use_port, (char *) NULL);
 #endif
 		/* only get here if exec failed */
 		(void) kill(getppid(), SIGUSR1);	/* tell mom */
diff --git a/phantasia/misc.c b/phantasia/misc.c
index 5dd4d8ee..59785376 100644
--- a/phantasia/misc.c
+++ b/phantasia/misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.20 2011/08/31 16:24:56 plunky Exp $	*/
+/*	$NetBSD: misc.c,v 1.21 2011/09/01 07:18:50 plunky Exp $	*/
 
 /*
  * misc.c  Phantasia miscellaneous support routines
@@ -682,7 +682,7 @@ death(const char *how)
 	if (ch == 'Y') {
 		cleanup(FALSE);
 		execl(_PATH_GAMEPROG, "phantasia", "-s",
-		    (Wizard ? "-S" : NULL), NULL);
+		    (Wizard ? "-S" : (char *) NULL), (char *) NULL);
 		exit(0);
 		/* NOTREACHED */
 	}
diff --git a/rogue/machdep.c b/rogue/machdep.c
index 531c175e..072e4d69 100644
--- a/rogue/machdep.c
+++ b/rogue/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.18 2011/08/31 16:24:56 plunky Exp $	*/
+/*	$NetBSD: machdep.c,v 1.19 2011/09/01 07:18:51 plunky Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)machdep.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: machdep.c,v 1.18 2011/08/31 16:24:56 plunky Exp $");
+__RCSID("$NetBSD: machdep.c,v 1.19 2011/09/01 07:18:51 plunky Exp $");
 #endif
 #endif /* not lint */
 
@@ -481,7 +481,7 @@ md_shell(const char *shell)
 	case -1:
 		break;
 	case 0:
-		execl(shell, shell, NULL);
+		execl(shell, shell, (char *)NULL);
 		_exit(255);
 	default:
 		waitpid(pid, &w, 0);
diff --git a/wump/wump.c b/wump/wump.c
index 770aebab..559ebc9b 100644
--- a/wump/wump.c
+++ b/wump/wump.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wump.c,v 1.28 2011/08/31 16:24:57 plunky Exp $	*/
+/*	$NetBSD: wump.c,v 1.29 2011/09/01 07:18:51 plunky Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
 #if 0
 static char sccsid[] = "@(#)wump.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: wump.c,v 1.28 2011/08/31 16:24:57 plunky Exp $");
+__RCSID("$NetBSD: wump.c,v 1.29 2011/09/01 07:18:51 plunky Exp $");
 #endif
 #endif /* not lint */
 
@@ -781,7 +781,7 @@ puff of greasy black smoke! (poof)\n");
 			err(1, "open %s", _PATH_WUMPINFO);
 		if (dup2(fd, STDIN_FILENO) == -1)
 			err(1, "dup2");
-		(void)execl("/bin/sh", "sh", "-c", pager, NULL);
+		(void)execl("/bin/sh", "sh", "-c", pager, (char *) NULL);
 		err(1, "exec sh -c %s", pager);
 	case -1:
 		err(1, "fork");