Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src reinstate NULL cast by request, where the NULL was being pas...



details:   https://anonhg.NetBSD.org/src/rev/83dfe07bfaed
branches:  trunk
changeset: 769135:83dfe07bfaed
user:      plunky <plunky%NetBSD.org@localhost>
date:      Thu Sep 01 07:18:50 2011 +0000

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

diffstat:

 games/cribbage/instr.c            |   6 +++---
 games/fish/fish.c                 |   6 +++---
 games/hack/hack.pager.c           |  10 +++++-----
 games/hack/hack.unix.c            |   6 +++---
 games/hunt/hunt/hunt.c            |   8 ++++----
 games/phantasia/misc.c            |   4 ++--
 games/rogue/machdep.c             |   6 +++---
 games/wump/wump.c                 |   6 +++---
 usr.bin/sdiff/edit.c              |   4 ++--
 usr.sbin/rpc.pcnfsd/pcnfsd_misc.c |   4 ++--
 10 files changed, 30 insertions(+), 30 deletions(-)

diffs (259 lines):

diff -r 753eb52b5c89 -r 83dfe07bfaed games/cribbage/instr.c
--- a/games/cribbage/instr.c    Thu Sep 01 06:41:38 2011 +0000
+++ b/games/cribbage/instr.c    Thu Sep 01 07:18:50 2011 +0000
@@ -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 @@
                        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 -r 753eb52b5c89 -r 83dfe07bfaed games/fish/fish.c
--- a/games/fish/fish.c Thu Sep 01 06:41:38 2011 +0000
+++ b/games/fish/fish.c Thu Sep 01 07:18:50 2011 +0000
@@ -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 @@
 #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 @@
                        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 -r 753eb52b5c89 -r 83dfe07bfaed games/hack/hack.pager.c
--- a/games/hack/hack.pager.c   Thu Sep 01 06:41:38 2011 +0000
+++ b/games/hack/hack.pager.c   Thu Sep 01 07:18:50 2011 +0000
@@ -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 @@
                                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 @@
        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 -r 753eb52b5c89 -r 83dfe07bfaed games/hack/hack.unix.c
--- a/games/hack/hack.unix.c    Thu Sep 01 06:41:38 2011 +0000
+++ b/games/hack/hack.unix.c    Thu Sep 01 07:18:50 2011 +0000
@@ -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 @@
        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 -r 753eb52b5c89 -r 83dfe07bfaed games/hunt/hunt/hunt.c
--- a/games/hunt/hunt/hunt.c    Thu Sep 01 06:41:38 2011 +0000
+++ b/games/hunt/hunt/hunt.c    Thu Sep 01 07:18:50 2011 +0000
@@ -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 @@
 #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 -r 753eb52b5c89 -r 83dfe07bfaed games/phantasia/misc.c
--- a/games/phantasia/misc.c    Thu Sep 01 06:41:38 2011 +0000
+++ b/games/phantasia/misc.c    Thu Sep 01 07:18:50 2011 +0000
@@ -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 @@
        if (ch == 'Y') {
                cleanup(FALSE);
                execl(_PATH_GAMEPROG, "phantasia", "-s",
-                   (Wizard ? "-S" : NULL), NULL);
+                   (Wizard ? "-S" : (char *) NULL), (char *) NULL);
                exit(0);
                /* NOTREACHED */
        }
diff -r 753eb52b5c89 -r 83dfe07bfaed games/rogue/machdep.c
--- a/games/rogue/machdep.c     Thu Sep 01 06:41:38 2011 +0000
+++ b/games/rogue/machdep.c     Thu Sep 01 07:18:50 2011 +0000
@@ -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 @@
        case -1:
                break;
        case 0:
-               execl(shell, shell, NULL);
+               execl(shell, shell, (char *)NULL);
                _exit(255);
        default:
                waitpid(pid, &w, 0);
diff -r 753eb52b5c89 -r 83dfe07bfaed games/wump/wump.c
--- a/games/wump/wump.c Thu Sep 01 06:41:38 2011 +0000
+++ b/games/wump/wump.c Thu Sep 01 07:18:50 2011 +0000
@@ -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 @@
 #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 @@
                        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");
diff -r 753eb52b5c89 -r 83dfe07bfaed usr.bin/sdiff/edit.c
--- a/usr.bin/sdiff/edit.c      Thu Sep 01 06:41:38 2011 +0000
+++ b/usr.bin/sdiff/edit.c      Thu Sep 01 07:18:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: edit.c,v 1.3 2011/08/31 16:24:58 plunky Exp $  */
+/*     $NetBSD: edit.c,v 1.4 2011/09/01 07:18:51 plunky Exp $  */
 /*     $OpenBSD: edit.c,v 1.14 2006/05/25 03:20:32 ray Exp $ */
 
 /*
@@ -41,7 +41,7 @@
        switch (pid = fork()) {
        case 0:
                /* child */
-               execlp(editor, editor, filename, NULL);
+               execlp(editor, editor, filename, (void *)NULL);
                warn("could not execute editor: %s", editor);
                cleanup(filename);
        case -1:
diff -r 753eb52b5c89 -r 83dfe07bfaed usr.sbin/rpc.pcnfsd/pcnfsd_misc.c
--- a/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c Thu Sep 01 06:41:38 2011 +0000
+++ b/usr.sbin/rpc.pcnfsd/pcnfsd_misc.c Thu Sep 01 07:18:50 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcnfsd_misc.c,v 1.13 2011/08/31 16:24:59 plunky Exp $  */
+/*     $NetBSD: pcnfsd_misc.c,v 1.14 2011/09/01 07:18:51 plunky Exp $  */
 
 /* RE_SID: @(%)/usr/dosnfs/shades_SCCS/unix/pcnfsd/v2/src/SCCS/s.pcnfsd_misc.c 1.5 92/01/24 19:59:13 SMI */
 /*
@@ -455,7 +455,7 @@
                (void) setgid(cached_gid);
                (void) setuid(cached_uid);
 
-               (void) execl("/bin/sh", "sh", "-c", cmd, NULL);
+               (void) execl("/bin/sh", "sh", "-c", cmd, (char *) NULL);
                _exit(255);
        }
        if (pid == -1) {



Home | Main Index | Thread Index | Old Index