Module Name: src
Committed By: plunky
Date: Fri Sep 16 16:13:18 UTC 2011
Modified Files:
src/lib/libedit: filecomplete.c
src/lib/libutil: login_tty.c
src/libexec/atrun: atrun.c
src/libexec/ftpd: ftpcmd.y ftpd.c logutmp.c
src/libexec/rlogind: rlogind.c
src/libexec/rpc.rquotad: rquotad.c
src/libexec/rpc.rstatd: rstat_proc.c
src/libexec/rpc.rwalld: rwalld.c
src/libexec/rpc.sprayd: sprayd.c
src/sbin/dump: tape.c
src/sbin/fsck_ext2fs: setup.c
src/sbin/ping6: ping6.c
src/sbin/restore: symtab.c
src/tests/fs/nfs/nfsservice/rpcbind: rpcb_svc.c rpcb_svc_4.c
rpcb_svc_com.c rpcbind.c
src/tests/lib/libc/regex: main.c
Log Message:
NULL does not need a cast, here
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libutil/login_tty.c
cvs rdiff -u -r1.20 -r1.21 src/libexec/atrun/atrun.c
cvs rdiff -u -r1.92 -r1.93 src/libexec/ftpd/ftpcmd.y
cvs rdiff -u -r1.196 -r1.197 src/libexec/ftpd/ftpd.c
cvs rdiff -u -r1.11 -r1.12 src/libexec/ftpd/logutmp.c
cvs rdiff -u -r1.40 -r1.41 src/libexec/rlogind/rlogind.c
cvs rdiff -u -r1.29 -r1.30 src/libexec/rpc.rquotad/rquotad.c
cvs rdiff -u -r1.45 -r1.46 src/libexec/rpc.rstatd/rstat_proc.c
cvs rdiff -u -r1.22 -r1.23 src/libexec/rpc.rwalld/rwalld.c
cvs rdiff -u -r1.17 -r1.18 src/libexec/rpc.sprayd/sprayd.c
cvs rdiff -u -r1.49 -r1.50 src/sbin/dump/tape.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/fsck_ext2fs/setup.c
cvs rdiff -u -r1.77 -r1.78 src/sbin/ping6/ping6.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/restore/symtab.c
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c \
src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c \
src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/regex/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.30 src/lib/libedit/filecomplete.c:1.31
--- src/lib/libedit/filecomplete.c:1.30 Tue Aug 16 16:25:15 2011
+++ src/lib/libedit/filecomplete.c Fri Sep 16 16:13:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: filecomplete.c,v 1.30 2011/08/16 16:25:15 christos Exp $ */
+/* $NetBSD: filecomplete.c,v 1.31 2011/09/16 16:13:16 plunky Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.30 2011/08/16 16:25:15 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.31 2011/09/16 16:13:16 plunky Exp $");
#endif /* not lint && not SCCSID */
#include <sys/types.h>
@@ -333,7 +333,7 @@
match_list[0] = retstr;
/* add NULL as last pointer to the array */
- match_list[matches + 1] = (char *) NULL;
+ match_list[matches + 1] = NULL;
return match_list;
}
Index: src/lib/libutil/login_tty.c
diff -u src/lib/libutil/login_tty.c:1.12 src/lib/libutil/login_tty.c:1.13
--- src/lib/libutil/login_tty.c:1.12 Sat Feb 9 05:07:26 2008
+++ src/lib/libutil/login_tty.c Fri Sep 16 16:13:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: login_tty.c,v 1.12 2008/02/09 05:07:26 dholland Exp $ */
+/* $NetBSD: login_tty.c,v 1.13 2011/09/16 16:13:16 plunky Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)login_tty.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: login_tty.c,v 1.12 2008/02/09 05:07:26 dholland Exp $");
+__RCSID("$NetBSD: login_tty.c,v 1.13 2011/09/16 16:13:16 plunky Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -53,7 +53,7 @@
_DIAGASSERT(fd != -1);
(void) setsid();
- if (ioctl(fd, TIOCSCTTY, (char *)NULL) == -1)
+ if (ioctl(fd, TIOCSCTTY, NULL) == -1)
return (-1);
(void) dup2(fd, STDIN_FILENO);
(void) dup2(fd, STDOUT_FILENO);
Index: src/libexec/atrun/atrun.c
diff -u src/libexec/atrun/atrun.c:1.20 src/libexec/atrun/atrun.c:1.21
--- src/libexec/atrun/atrun.c:1.20 Mon Aug 1 12:28:54 2011
+++ src/libexec/atrun/atrun.c Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $ */
+/* $NetBSD: atrun.c,v 1.21 2011/09/16 16:13:17 plunky Exp $ */
/*
* atrun.c - run jobs queued by at; run with root privileges.
@@ -59,7 +59,7 @@
#if 0
static char rcsid[] = "$OpenBSD: atrun.c,v 1.7 1997/09/08 22:12:10 millert Exp $";
#else
-__RCSID("$NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $");
+__RCSID("$NetBSD: atrun.c,v 1.21 2011/09/16 16:13:17 plunky Exp $");
#endif
static int debug = 0;
@@ -327,7 +327,7 @@
/* We're the parent. Let's wait. */
(void)close(fd_in);
(void)close(fd_out);
- (void)waitpid(pid, (int *)NULL, 0);
+ (void)waitpid(pid, NULL, 0);
/*
* Send mail. Unlink the output file first, so it is deleted
Index: src/libexec/ftpd/ftpcmd.y
diff -u src/libexec/ftpd/ftpcmd.y:1.92 src/libexec/ftpd/ftpcmd.y:1.93
--- src/libexec/ftpd/ftpcmd.y:1.92 Fri Jul 1 02:46:15 2011
+++ src/libexec/ftpd/ftpcmd.y Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpcmd.y,v 1.92 2011/07/01 02:46:15 joerg Exp $ */
+/* $NetBSD: ftpcmd.y,v 1.93 2011/09/16 16:13:17 plunky Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
#if 0
static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94";
#else
-__RCSID("$NetBSD: ftpcmd.y,v 1.92 2011/07/01 02:46:15 joerg Exp $");
+__RCSID("$NetBSD: ftpcmd.y,v 1.93 2011/09/16 16:13:17 plunky Exp $");
#endif
#endif /* not lint */
@@ -1633,7 +1633,7 @@
c = cmdp[cpos];
cmdp[cpos] = '\0';
yylval.u.i = atoi(cp);
- yylval.u.ll = STRTOLL(cp, (char **)NULL, 10);
+ yylval.u.ll = STRTOLL(cp, NULL, 10);
cmdp[cpos] = c;
return (NUMBER);
}
Index: src/libexec/ftpd/ftpd.c
diff -u src/libexec/ftpd/ftpd.c:1.196 src/libexec/ftpd/ftpd.c:1.197
--- src/libexec/ftpd/ftpd.c:1.196 Sun Sep 4 23:16:41 2011
+++ src/libexec/ftpd/ftpd.c Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ftpd.c,v 1.196 2011/09/04 23:16:41 lukem Exp $ */
+/* $NetBSD: ftpd.c,v 1.197 2011/09/16 16:13:17 plunky Exp $ */
/*
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
#if 0
static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: ftpd.c,v 1.196 2011/09/04 23:16:41 lukem Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.197 2011/09/16 16:13:17 plunky Exp $");
#endif
#endif /* not lint */
@@ -2547,7 +2547,7 @@
int ispassive, af;
off_t otbi, otbo, otb;
- a = p = (unsigned char *)NULL;
+ a = p = NULL;
reply(-211, "%s FTP server status:", hostname);
reply(0, "Version: %s", EMPTYSTR(version) ? "<suppressed>" : version);
Index: src/libexec/ftpd/logutmp.c
diff -u src/libexec/ftpd/logutmp.c:1.11 src/libexec/ftpd/logutmp.c:1.12
--- src/libexec/ftpd/logutmp.c:1.11 Mon Jun 9 01:00:23 2008
+++ src/libexec/ftpd/logutmp.c Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: logutmp.c,v 1.11 2008/06/09 01:00:23 lukem Exp $ */
+/* $NetBSD: logutmp.c,v 1.12 2011/09/16 16:13:17 plunky Exp $ */
/*
* Portions Copyright (c) 1988, 1993
@@ -56,7 +56,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: logutmp.c,v 1.11 2008/06/09 01:00:23 lukem Exp $");
+__RCSID("$NetBSD: logutmp.c,v 1.12 2011/09/16 16:13:17 plunky Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -98,7 +98,7 @@
*/
if (topslot < 0) {
topslot = 0;
- while (getttyent() != (struct ttyent *)NULL)
+ while (getttyent() != NULL)
topslot++;
}
if ((topslot < 0) || ((fd < 0)
Index: src/libexec/rlogind/rlogind.c
diff -u src/libexec/rlogind/rlogind.c:1.40 src/libexec/rlogind/rlogind.c:1.41
--- src/libexec/rlogind/rlogind.c:1.40 Sat Aug 27 15:45:52 2011
+++ src/libexec/rlogind/rlogind.c Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rlogind.c,v 1.40 2011/08/27 15:45:52 joerg Exp $ */
+/* $NetBSD: rlogind.c,v 1.41 2011/09/16 16:13:17 plunky Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -69,7 +69,7 @@
#if 0
static char sccsid[] = "@(#)rlogind.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: rlogind.c,v 1.40 2011/08/27 15:45:52 joerg Exp $");
+__RCSID("$NetBSD: rlogind.c,v 1.41 2011/09/16 16:13:17 plunky Exp $");
#endif
#endif /* not lint */
@@ -365,7 +365,7 @@
"Connection received using IP options (ignored):%s",
lbuf);
if (setsockopt(0, ipproto, IP_OPTIONS,
- (char *)NULL, optsize) != 0) {
+ NULL, optsize) != 0) {
syslog(LOG_ERR,
"setsockopt IP_OPTIONS NULL: %m");
exit(1);
Index: src/libexec/rpc.rquotad/rquotad.c
diff -u src/libexec/rpc.rquotad/rquotad.c:1.29 src/libexec/rpc.rquotad/rquotad.c:1.30
--- src/libexec/rpc.rquotad/rquotad.c:1.29 Tue Aug 30 17:06:20 2011
+++ src/libexec/rpc.rquotad/rquotad.c Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rquotad.c,v 1.29 2011/08/30 17:06:20 plunky Exp $ */
+/* $NetBSD: rquotad.c,v 1.30 2011/09/16 16:13:17 plunky Exp $ */
/*
* by Manuel Bouyer (bou...@ensta.fr). Public domain.
@@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rquotad.c,v 1.29 2011/08/30 17:06:20 plunky Exp $");
+__RCSID("$NetBSD: rquotad.c,v 1.30 2011/09/16 16:13:17 plunky Exp $");
#endif
#include <sys/param.h>
@@ -126,7 +126,7 @@
{
switch (request->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, NULL);
break;
case RQUOTAPROC_GETQUOTA:
@@ -147,7 +147,7 @@
{
switch (request->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, NULL);
break;
case RQUOTAPROC_GETQUOTA:
Index: src/libexec/rpc.rstatd/rstat_proc.c
diff -u src/libexec/rpc.rstatd/rstat_proc.c:1.45 src/libexec/rpc.rstatd/rstat_proc.c:1.46
--- src/libexec/rpc.rstatd/rstat_proc.c:1.45 Tue Aug 30 17:06:20 2011
+++ src/libexec/rpc.rstatd/rstat_proc.c Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rstat_proc.c,v 1.45 2011/08/30 17:06:20 plunky Exp $ */
+/* $NetBSD: rstat_proc.c,v 1.46 2011/09/16 16:13:17 plunky Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";
static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: rstat_proc.c,v 1.45 2011/08/30 17:06:20 plunky Exp $");
+__RCSID("$NetBSD: rstat_proc.c,v 1.46 2011/09/16 16:13:17 plunky Exp $");
#endif
#endif
@@ -378,7 +378,7 @@
switch (rqstp->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, NULL);
goto leave;
case RSTATPROC_STATS:
Index: src/libexec/rpc.rwalld/rwalld.c
diff -u src/libexec/rpc.rwalld/rwalld.c:1.22 src/libexec/rpc.rwalld/rwalld.c:1.23
--- src/libexec/rpc.rwalld/rwalld.c:1.22 Tue Aug 30 17:06:20 2011
+++ src/libexec/rpc.rwalld/rwalld.c Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rwalld.c,v 1.22 2011/08/30 17:06:20 plunky Exp $ */
+/* $NetBSD: rwalld.c,v 1.23 2011/09/16 16:13:17 plunky Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rwalld.c,v 1.22 2011/08/30 17:06:20 plunky Exp $");
+__RCSID("$NetBSD: rwalld.c,v 1.23 2011/09/16 16:13:17 plunky Exp $");
#endif /* not lint */
#include <unistd.h>
@@ -157,7 +157,7 @@
switch (rqstp->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, NULL);
goto leave;
case WALLPROC_WALL:
Index: src/libexec/rpc.sprayd/sprayd.c
diff -u src/libexec/rpc.sprayd/sprayd.c:1.17 src/libexec/rpc.sprayd/sprayd.c:1.18
--- src/libexec/rpc.sprayd/sprayd.c:1.17 Tue Aug 30 17:06:21 2011
+++ src/libexec/rpc.sprayd/sprayd.c Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sprayd.c,v 1.17 2011/08/30 17:06:21 plunky Exp $ */
+/* $NetBSD: sprayd.c,v 1.18 2011/09/16 16:13:17 plunky Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: sprayd.c,v 1.17 2011/08/30 17:06:21 plunky Exp $");
+__RCSID("$NetBSD: sprayd.c,v 1.18 2011/09/16 16:13:17 plunky Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -131,7 +131,7 @@
/*FALLTHROUGH*/
case NULLPROC:
- (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, NULL);
return;
case SPRAYPROC_SPRAY:
Index: src/sbin/dump/tape.c
diff -u src/sbin/dump/tape.c:1.49 src/sbin/dump/tape.c:1.50
--- src/sbin/dump/tape.c:1.49 Sat Feb 16 17:58:01 2008
+++ src/sbin/dump/tape.c Fri Sep 16 16:13:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tape.c,v 1.49 2008/02/16 17:58:01 matt Exp $ */
+/* $NetBSD: tape.c,v 1.50 2011/09/16 16:13:17 plunky Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: tape.c,v 1.49 2008/02/16 17:58:01 matt Exp $");
+__RCSID("$NetBSD: tape.c,v 1.50 2011/09/16 16:13:17 plunky Exp $");
#endif
#endif /* not lint */
@@ -383,7 +383,7 @@
}
(void) close(slaves[f].fd);
}
- while (wait((int *)NULL) >= 0) /* wait for any signals from slaves */
+ while (wait(NULL) >= 0) /* wait for any signals from slaves */
/* void */;
if (pipeout)
Index: src/sbin/fsck_ext2fs/setup.c
diff -u src/sbin/fsck_ext2fs/setup.c:1.27 src/sbin/fsck_ext2fs/setup.c:1.28
--- src/sbin/fsck_ext2fs/setup.c:1.27 Mon Oct 19 18:41:08 2009
+++ src/sbin/fsck_ext2fs/setup.c Fri Sep 16 16:13:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.27 2009/10/19 18:41:08 bouyer Exp $ */
+/* $NetBSD: setup.c,v 1.28 2011/09/16 16:13:18 plunky Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
#if 0
static char sccsid[] = "@(#)setup.c 8.5 (Berkeley) 11/23/94";
#else
-__RCSID("$NetBSD: setup.c,v 1.27 2009/10/19 18:41:08 bouyer Exp $");
+__RCSID("$NetBSD: setup.c,v 1.28 2011/09/16 16:13:18 plunky Exp $");
#endif
#endif /* not lint */
@@ -134,7 +134,7 @@
asblk.b_un.b_buf = malloc(SBSIZE);
if (sblk.b_un.b_buf == NULL || asblk.b_un.b_buf == NULL)
errexit("cannot allocate space for superblock");
- if ((lp = getdisklabel((char *)NULL, fsreadfd)) != NULL)
+ if ((lp = getdisklabel(NULL, fsreadfd)) != NULL)
dev_bsize = secsize = lp->d_secsize;
else
dev_bsize = secsize = DEV_BSIZE;
Index: src/sbin/ping6/ping6.c
diff -u src/sbin/ping6/ping6.c:1.77 src/sbin/ping6/ping6.c:1.78
--- src/sbin/ping6/ping6.c:1.77 Wed Aug 31 22:27:26 2011
+++ src/sbin/ping6/ping6.c Fri Sep 16 16:13:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ping6.c,v 1.77 2011/08/31 22:27:26 christos Exp $ */
+/* $NetBSD: ping6.c,v 1.78 2011/09/16 16:13:18 plunky Exp $ */
/* $KAME: ping6.c,v 1.164 2002/11/16 14:05:37 itojun Exp $ */
/*
@@ -77,7 +77,7 @@
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ping6.c,v 1.77 2011/08/31 22:27:26 christos Exp $");
+__RCSID("$NetBSD: ping6.c,v 1.78 2011/09/16 16:13:18 plunky Exp $");
#endif
#endif
@@ -401,7 +401,7 @@
errx(1, "Must be superuser to flood ping");
}
options |= F_FLOOD;
- setbuf(stdout, (char *)NULL);
+ setbuf(stdout, NULL);
break;
case 'g':
gateway = optarg;
Index: src/sbin/restore/symtab.c
diff -u src/sbin/restore/symtab.c:1.27 src/sbin/restore/symtab.c:1.28
--- src/sbin/restore/symtab.c:1.27 Tue Jan 4 23:46:34 2011
+++ src/sbin/restore/symtab.c Fri Sep 16 16:13:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: symtab.c,v 1.27 2011/01/04 23:46:34 wiz Exp $ */
+/* $NetBSD: symtab.c,v 1.28 2011/09/16 16:13:18 plunky Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)symtab.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: symtab.c,v 1.27 2011/01/04 23:46:34 wiz Exp $");
+__RCSID("$NetBSD: symtab.c,v 1.28 2011/09/16 16:13:18 plunky Exp $");
#endif
#endif /* not lint */
@@ -549,7 +549,7 @@
entrytblsize = maxino / HASHFACTOR;
entry = (struct entry **)
calloc((unsigned)entrytblsize, sizeof(struct entry *));
- if (entry == (struct entry **)NULL)
+ if (entry == NULL)
panic("no memory for entry table\n");
ep = addentry(".", ROOTINO, NODE);
ep->e_flags |= NEW;
Index: src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c
diff -u src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c:1.1 src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c:1.2
--- src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c:1.1 Mon Jul 26 15:53:00 2010
+++ src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c Fri Sep 16 16:13:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_svc.c,v 1.1 2010/07/26 15:53:00 pooka Exp $ */
+/* $NetBSD: rpcb_svc.c,v 1.2 2011/09/16 16:13:18 plunky Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -89,7 +89,7 @@
#endif
/* This call just logs, no actual checks */
check_access(transp, rqstp->rq_proc, NULL, RPCBVERS);
- (void) svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
+ (void) svc_sendreply(transp, (xdrproc_t)xdr_void, NULL);
return;
case RPCBPROC_SET:
Index: src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c
diff -u src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c:1.1 src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c:1.2
--- src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c:1.1 Mon Jul 26 15:53:00 2010
+++ src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c Fri Sep 16 16:13:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_svc_4.c,v 1.1 2010/07/26 15:53:00 pooka Exp $ */
+/* $NetBSD: rpcb_svc_4.c,v 1.2 2011/09/16 16:13:18 plunky Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -91,8 +91,7 @@
fprintf(stderr, "RPCBPROC_NULL\n");
#endif
check_access(transp, rqstp->rq_proc, NULL, RPCBVERS4);
- (void) svc_sendreply(transp, (xdrproc_t) xdr_void,
- (char *)NULL);
+ (void) svc_sendreply(transp, (xdrproc_t) xdr_void, NULL);
return;
case RPCBPROC_SET:
Index: src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c
diff -u src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c:1.1 src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c:1.2
--- src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c:1.1 Mon Jul 26 15:53:00 2010
+++ src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c Fri Sep 16 16:13:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_svc_com.c,v 1.1 2010/07/26 15:53:00 pooka Exp $ */
+/* $NetBSD: rpcb_svc_com.c,v 1.2 2011/09/16 16:13:18 plunky Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -174,7 +174,7 @@
* add to the end of the list
*/
rbl = (rpcblist_ptr) malloc((u_int)sizeof (RPCBLIST));
- if (rbl == (rpcblist_ptr)NULL) {
+ if (rbl == NULL) {
return (FALSE);
}
a = &(rbl->rpcb_map);
@@ -193,7 +193,7 @@
free((void *)rbl);
return (FALSE);
}
- rbl->rpcb_next = (rpcblist_ptr)NULL;
+ rbl->rpcb_next = NULL;
if (list_rbl == NULL) {
list_rbl = rbl;
} else {
@@ -597,7 +597,7 @@
char *buf_alloc = NULL, *outbufp;
char *outbuf_alloc = NULL;
char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX];
- struct netbuf *na = (struct netbuf *) NULL;
+ struct netbuf *na = NULL;
struct rpc_msg call_msg;
int outlen;
u_int sendsz;
@@ -684,7 +684,7 @@
rpcbs_rmtcall(versnum - 2, reply_type, a.rmt_prog, a.rmt_vers,
a.rmt_proc, transp->xp_netid, rbl);
- if (rbl == (rpcblist_ptr)NULL) {
+ if (rbl == NULL) {
#ifdef RPCBIND_DEBUG
if (debugging)
fprintf(stderr, "not found\n");
@@ -717,7 +717,7 @@
if (reply_type == RPCBPROC_INDIRECT) {
uaddr = mergeaddr(transp, transp->xp_netid,
rbl->rpcb_map.r_addr, NULL);
- if ((uaddr == (char *) NULL) || uaddr[0] == '\0') {
+ if (uaddr == NULL || uaddr[0] == '\0') {
svcerr_noprog(transp);
if (uaddr != NULL) {
free((void *) uaddr);
@@ -729,7 +729,7 @@
}
}
nconf = rpcbind_get_conf(transp->xp_netid);
- if (nconf == (struct netconfig *)NULL) {
+ if (nconf == NULL) {
if (reply_type == RPCBPROC_INDIRECT)
svcerr_systemerr(transp);
if (debugging)
Index: src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c
diff -u src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c:1.2 src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c:1.3
--- src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c:1.2 Wed Jul 28 15:11:30 2010
+++ src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c Fri Sep 16 16:13:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcbind.c,v 1.2 2010/07/28 15:11:30 pooka Exp $ */
+/* $NetBSD: rpcbind.c,v 1.3 2011/09/16 16:13:18 plunky Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -356,7 +356,7 @@
my_xprt = (SVCXPRT *)svc_tli_create(fd, nconf, &taddr, RPC_MAXDATASIZE,
RPC_MAXDATASIZE);
- if (my_xprt == (SVCXPRT *)NULL) {
+ if (my_xprt == NULL) {
warnx("Could not create service for `%s'", nconf->nc_netid);
goto error;
}
Index: src/tests/lib/libc/regex/main.c
diff -u src/tests/lib/libc/regex/main.c:1.1 src/tests/lib/libc/regex/main.c:1.2
--- src/tests/lib/libc/regex/main.c:1.1 Sat Jan 8 18:10:31 2011
+++ src/tests/lib/libc/regex/main.c Fri Sep 16 16:13:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1 2011/01/08 18:10:31 pgoyette Exp $ */
+/* $NetBSD: main.c,v 1.2 2011/09/16 16:13:18 plunky Exp $ */
/*-
* Copyright (c) 1993 The NetBSD Foundation, Inc.
@@ -192,20 +192,20 @@
options('c', f[1]) &~ REG_EXTENDED);
}
- ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
+ ne = regerror(REG_BADPAT, NULL, erbuf, sizeof(erbuf));
if (strcmp(erbuf, badpat) != 0 || ne != strlen(badpat)+1) {
fprintf(stderr, "end: regerror() test gave `%s' not `%s'\n",
erbuf, badpat);
status = 1;
}
- ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, (size_t)SHORT);
+ ne = regerror(REG_BADPAT, NULL, erbuf, (size_t)SHORT);
if (strncmp(erbuf, badpat, SHORT-1) != 0 || erbuf[SHORT-1] != '\0' ||
ne != strlen(badpat)+1) {
fprintf(stderr, "end: regerror() short test gave `%s' not `%.*s'\n",
erbuf, SHORT-1, badpat);
status = 1;
}
- ne = regerror(REG_ITOA|REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
+ ne = regerror(REG_ITOA|REG_BADPAT, NULL, erbuf, sizeof(erbuf));
if (strcmp(erbuf, bpname) != 0 || ne != strlen(bpname)+1) {
fprintf(stderr, "end: regerror() ITOA test gave `%s' not `%s'\n",
erbuf, bpname);
@@ -501,7 +501,7 @@
static char epbuf[100];
size_t len;
- len = regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
+ len = regerror(REG_ITOA|err, NULL, epbuf, sizeof(epbuf));
assert(len <= sizeof(epbuf));
return(epbuf);
}
