Module Name: src Committed By: matt Date: Tue Mar 20 16:36:05 UTC 2012
Modified Files: src/lib/libc/gen: _sysconf.c disklabel.c fmtmsg.c ftok.c getmntinfo.c getnetgrent.c nlist.c nlist_elf32.c nlist_private.h pthread_atfork.c pw_private.h setmode.c sysctl.c uname.c wait.c wait3.c Log Message: Use C89 definitions. Remove use of __P To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libc/gen/_sysconf.c cvs rdiff -u -r1.35 -r1.36 src/lib/libc/gen/disklabel.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/gen/fmtmsg.c cvs rdiff -u -r1.10 -r1.11 src/lib/libc/gen/ftok.c src/lib/libc/gen/uname.c cvs rdiff -u -r1.16 -r1.17 src/lib/libc/gen/getmntinfo.c cvs rdiff -u -r1.41 -r1.42 src/lib/libc/gen/getnetgrent.c cvs rdiff -u -r1.22 -r1.23 src/lib/libc/gen/nlist.c cvs rdiff -u -r1.33 -r1.34 src/lib/libc/gen/nlist_elf32.c cvs rdiff -u -r1.21 -r1.22 src/lib/libc/gen/nlist_private.h cvs rdiff -u -r1.8 -r1.9 src/lib/libc/gen/pthread_atfork.c \ src/lib/libc/gen/wait.c cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/pw_private.h cvs rdiff -u -r1.31 -r1.32 src/lib/libc/gen/setmode.c \ src/lib/libc/gen/sysctl.c cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gen/wait3.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/libc/gen/_sysconf.c diff -u src/lib/libc/gen/_sysconf.c:1.5 src/lib/libc/gen/_sysconf.c:1.6 --- src/lib/libc/gen/_sysconf.c:1.5 Wed Oct 21 01:07:45 2009 +++ src/lib/libc/gen/_sysconf.c Tue Mar 20 16:36:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: _sysconf.c,v 1.5 2009/10/21 01:07:45 snj Exp $ */ +/* $NetBSD: _sysconf.c,v 1.6 2012/03/20 16:36:04 matt Exp $ */ /* * Copyright (c) 1996 Christos Zoulas. All rights reserved. @@ -26,7 +26,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: _sysconf.c,v 1.5 2009/10/21 01:07:45 snj Exp $"); +__RCSID("$NetBSD: _sysconf.c,v 1.6 2012/03/20 16:36:04 matt Exp $"); #endif /* LIBC_SCCS and not lint */ #if defined(__indr_reference) @@ -34,11 +34,10 @@ __indr_reference(__sysconf, sysconf) #else #include <unistd.h> -long __sysconf __P((int)); /* XXX */ +long __sysconf(int); /* XXX */ long -sysconf(name) - int name; +sysconf(int name) { return __sysconf(name); Index: src/lib/libc/gen/disklabel.c diff -u src/lib/libc/gen/disklabel.c:1.35 src/lib/libc/gen/disklabel.c:1.36 --- src/lib/libc/gen/disklabel.c:1.35 Tue Mar 13 21:13:34 2012 +++ src/lib/libc/gen/disklabel.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.c,v 1.35 2012/03/13 21:13:34 christos Exp $ */ +/* $NetBSD: disklabel.c,v 1.36 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1983, 1987, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 5/3/95"; #else -__RCSID("$NetBSD: disklabel.c,v 1.35 2012/03/13 21:13:34 christos Exp $"); +__RCSID("$NetBSD: disklabel.c,v 1.36 2012/03/20 16:36:05 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -71,9 +71,9 @@ __weak_alias(getdiskbyname,_getdiskbynam #endif #if 0 -static void error __P((int)); +static void error(int); #endif -static int gettype __P((char *, const char *const *)); +static int gettype(char *, const char *const *); static const char *db_array[2] = { _PATH_DISKTAB, 0 }; @@ -208,9 +208,7 @@ getdiskbyname(name) } static int -gettype(t, names) - char *t; - const char *const *names; +gettype(char *t, const char *const *names) { const char *const *nm; Index: src/lib/libc/gen/fmtmsg.c diff -u src/lib/libc/gen/fmtmsg.c:1.4 src/lib/libc/gen/fmtmsg.c:1.5 --- src/lib/libc/gen/fmtmsg.c:1.4 Mon Apr 28 20:22:59 2008 +++ src/lib/libc/gen/fmtmsg.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fmtmsg.c,v 1.4 2008/04/28 20:22:59 martin Exp $ */ +/* $NetBSD: fmtmsg.c,v 1.5 2012/03/20 16:36:05 matt Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: fmtmsg.c,v 1.4 2008/04/28 20:22:59 martin Exp $"); +__RCSID("$NetBSD: fmtmsg.c,v 1.5 2012/03/20 16:36:05 matt Exp $"); #endif /* LIBC_SCCS and not lint */ #include <fmtmsg.h> @@ -40,11 +40,11 @@ __RCSID("$NetBSD: fmtmsg.c,v 1.4 2008/04 #include <stdlib.h> #include <string.h> -static unsigned int msgverb __P((const char *)); -static const char * severity2str __P((int)); -static int writeit __P((FILE *, unsigned int, const char *, +static unsigned int msgverb(const char *); +static const char * severity2str(int); +static int writeit(FILE *, unsigned int, const char *, const char *, const char *, const char *, - const char *)); + const char *); #define MM_VERBLABEL 0x01U #define MM_VERBSEVERITY 0x02U @@ -74,8 +74,7 @@ static const size_t nkeywords = sizeof ( * keywords. */ static unsigned int -msgverb(str) - const char *str; +msgverb(const char *str) { u_int i; unsigned int result; @@ -107,7 +106,7 @@ msgverb(str) return (result); } -static const char * const severities[] = { +static const char severities[][8] = { "", /* MM_NONE */ "HALT", "ERROR", @@ -122,8 +121,7 @@ static const size_t nseverities = sizeof * value, defaulting to NULL for an unknown value. */ static const char * -severity2str(severity) - int severity; +severity2str(int severity) { const char *result; @@ -142,14 +140,9 @@ severity2str(severity) * written, or a negative value in case of an error. */ static int -writeit(stream, which, label, sevstr, text, action, tag) - FILE *stream; - unsigned int which; - const char *label; - const char *sevstr; - const char *text; - const char *action; - const char *tag; +writeit(FILE *stream, unsigned int which, const char *label, + const char *sevstr, const char *text, const char *action, + const char *tag) { int nwritten; @@ -184,13 +177,8 @@ writeit(stream, which, label, sevstr, te } int -fmtmsg(classification, label, severity, text, action, tag) - long classification; - const char *label; - int severity; - const char *text; - const char *action; - const char *tag; +fmtmsg(long classification, const char *label, int severity, + const char *text, const char *action, const char *tag) { FILE *console; const char *p, *sevstr; Index: src/lib/libc/gen/ftok.c diff -u src/lib/libc/gen/ftok.c:1.10 src/lib/libc/gen/ftok.c:1.11 --- src/lib/libc/gen/ftok.c:1.10 Wed Sep 15 19:45:17 2004 +++ src/lib/libc/gen/ftok.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ftok.c,v 1.10 2004/09/15 19:45:17 hubertf Exp $ */ +/* $NetBSD: ftok.c,v 1.11 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1994 SigmaSoft, Th. Lockert <th...@sigmasoft.com> @@ -27,7 +27,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: ftok.c,v 1.10 2004/09/15 19:45:17 hubertf Exp $"); +__RCSID("$NetBSD: ftok.c,v 1.11 2012/03/20 16:36:05 matt Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -43,9 +43,7 @@ __weak_alias(ftok,_ftok) #endif key_t -ftok(path, id) - const char *path; - int id; +ftok(const char *path, int id) { struct stat st; Index: src/lib/libc/gen/uname.c diff -u src/lib/libc/gen/uname.c:1.10 src/lib/libc/gen/uname.c:1.11 --- src/lib/libc/gen/uname.c:1.10 Mon Jan 15 22:26:35 2007 +++ src/lib/libc/gen/uname.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: uname.c,v 1.10 2007/01/15 22:26:35 cbiere Exp $ */ +/* $NetBSD: uname.c,v 1.11 2012/03/20 16:36:05 matt Exp $ */ /*- * Copyright (c) 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)uname.c 8.1 (Berkeley) 1/4/94"; #else -__RCSID("$NetBSD: uname.c,v 1.10 2007/01/15 22:26:35 cbiere Exp $"); +__RCSID("$NetBSD: uname.c,v 1.11 2012/03/20 16:36:05 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -51,8 +51,7 @@ __weak_alias(uname,_uname) #endif int -uname(name) - struct utsname *name; +uname(struct utsname *name) { int mib[2]; size_t len; Index: src/lib/libc/gen/getmntinfo.c diff -u src/lib/libc/gen/getmntinfo.c:1.16 src/lib/libc/gen/getmntinfo.c:1.17 --- src/lib/libc/gen/getmntinfo.c:1.16 Tue Sep 13 01:44:09 2005 +++ src/lib/libc/gen/getmntinfo.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: getmntinfo.c,v 1.16 2005/09/13 01:44:09 christos Exp $ */ +/* $NetBSD: getmntinfo.c,v 1.17 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1989, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)getmntinfo.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: getmntinfo.c,v 1.16 2005/09/13 01:44:09 christos Exp $"); +__RCSID("$NetBSD: getmntinfo.c,v 1.17 2012/03/20 16:36:05 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -51,9 +51,7 @@ __RCSID("$NetBSD: getmntinfo.c,v 1.16 20 * Return information about mounted filesystems. */ int -getmntinfo(mntbufp, flags) - struct statvfs **mntbufp; - int flags; +getmntinfo(struct statvfs **mntbufp, int flags) { static struct statvfs *mntbuf; static int mntsize; Index: src/lib/libc/gen/getnetgrent.c diff -u src/lib/libc/gen/getnetgrent.c:1.41 src/lib/libc/gen/getnetgrent.c:1.42 --- src/lib/libc/gen/getnetgrent.c:1.41 Wed Oct 21 01:07:45 2009 +++ src/lib/libc/gen/getnetgrent.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: getnetgrent.c,v 1.41 2009/10/21 01:07:45 snj Exp $ */ +/* $NetBSD: getnetgrent.c,v 1.42 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -28,7 +28,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: getnetgrent.c,v 1.41 2009/10/21 01:07:45 snj Exp $"); +__RCSID("$NetBSD: getnetgrent.c,v 1.42 2012/03/20 16:36:05 matt Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -142,8 +142,7 @@ getstring(char **pp, int del, char __aco * getnetgroup(): Parse a netgroup, and advance the pointer */ static struct netgroup * -getnetgroup(pp) - char **pp; +getnetgroup(char **pp) { struct netgroup *ng; Index: src/lib/libc/gen/nlist.c diff -u src/lib/libc/gen/nlist.c:1.22 src/lib/libc/gen/nlist.c:1.23 --- src/lib/libc/gen/nlist.c:1.22 Thu Aug 20 08:30:04 2009 +++ src/lib/libc/gen/nlist.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: nlist.c,v 1.22 2009/08/20 08:30:04 he Exp $ */ +/* $NetBSD: nlist.c,v 1.23 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1989, 1993 @@ -66,7 +66,7 @@ #if 0 static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: nlist.c,v 1.22 2009/08/20 08:30:04 he Exp $"); +__RCSID("$NetBSD: nlist.c,v 1.23 2012/03/20 16:36:05 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -92,7 +92,7 @@ __weak_alias(nlist,_nlist) #include "nlist_private.h" static const struct { - int (*fdnlist) __P((int, struct nlist *)); + int (*fdnlist)(int, struct nlist *); } fdnlist_fmts[] = { #ifdef NLIST_AOUT { __fdnlist_aout }, Index: src/lib/libc/gen/nlist_elf32.c diff -u src/lib/libc/gen/nlist_elf32.c:1.33 src/lib/libc/gen/nlist_elf32.c:1.34 --- src/lib/libc/gen/nlist_elf32.c:1.33 Sat Oct 15 21:06:58 2011 +++ src/lib/libc/gen/nlist_elf32.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: nlist_elf32.c,v 1.33 2011/10/15 21:06:58 christos Exp $ */ +/* $NetBSD: nlist_elf32.c,v 1.34 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou @@ -36,7 +36,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: nlist_elf32.c,v 1.33 2011/10/15 21:06:58 christos Exp $"); +__RCSID("$NetBSD: nlist_elf32.c,v 1.34 2012/03/20 16:36:05 matt Exp $"); #endif /* LIBC_SCCS and not lint */ /* If not included by nlist_elf64.c, ELFSIZE won't be defined. */ @@ -73,9 +73,7 @@ __RCSID("$NetBSD: nlist_elf32.c,v 1.33 2 #define BADUNMAP goto unmap int -ELFNAMEEND(__fdnlist)(fd, list) - int fd; - struct nlist *list; +ELFNAMEEND(__fdnlist)(int fd, struct nlist *list) { struct stat st; struct nlist *p; Index: src/lib/libc/gen/nlist_private.h diff -u src/lib/libc/gen/nlist_private.h:1.21 src/lib/libc/gen/nlist_private.h:1.22 --- src/lib/libc/gen/nlist_private.h:1.21 Mon Jan 17 23:32:31 2011 +++ src/lib/libc/gen/nlist_private.h Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: nlist_private.h,v 1.21 2011/01/17 23:32:31 matt Exp $ */ +/* $NetBSD: nlist_private.h,v 1.22 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou @@ -74,17 +74,17 @@ struct nlist; #ifdef NLIST_AOUT -int __fdnlist_aout __P((int, struct nlist *)); +int __fdnlist_aout(int, struct nlist *); #endif #ifdef NLIST_COFF -int __fdnlist_coff __P((int, struct nlist *)); +int __fdnlist_coff(int, struct nlist *); #endif #ifdef NLIST_ECOFF -int __fdnlist_ecoff __P((int, struct nlist *)); +int __fdnlist_ecoff(int, struct nlist *); #endif #ifdef NLIST_ELF32 -int __fdnlist_elf32 __P((int, struct nlist *)); +int __fdnlist_elf32(int, struct nlist *); #endif #ifdef NLIST_ELF64 -int __fdnlist_elf64 __P((int, struct nlist *)); +int __fdnlist_elf64(int, struct nlist *); #endif Index: src/lib/libc/gen/pthread_atfork.c diff -u src/lib/libc/gen/pthread_atfork.c:1.8 src/lib/libc/gen/pthread_atfork.c:1.9 --- src/lib/libc/gen/pthread_atfork.c:1.8 Mon Apr 28 20:22:59 2008 +++ src/lib/libc/gen/pthread_atfork.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_atfork.c,v 1.8 2008/04/28 20:22:59 martin Exp $ */ +/* $NetBSD: pthread_atfork.c,v 1.9 2012/03/20 16:36:05 matt Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: pthread_atfork.c,v 1.8 2008/04/28 20:22:59 martin Exp $"); +__RCSID("$NetBSD: pthread_atfork.c,v 1.9 2012/03/20 16:36:05 matt Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -47,7 +47,7 @@ __weak_alias(pthread_atfork, _pthread_at __weak_alias(fork, _fork) #endif /* __weak_alias */ -pid_t __fork __P((void)); /* XXX */ +pid_t __fork(void); /* XXX */ struct atfork_callback { SIMPLEQ_ENTRY(atfork_callback) next; Index: src/lib/libc/gen/wait.c diff -u src/lib/libc/gen/wait.c:1.8 src/lib/libc/gen/wait.c:1.9 --- src/lib/libc/gen/wait.c:1.8 Thu Aug 7 16:43:00 2003 +++ src/lib/libc/gen/wait.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: wait.c,v 1.8 2003/08/07 16:43:00 agc Exp $ */ +/* $NetBSD: wait.c,v 1.9 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1988, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)wait.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: wait.c,v 1.8 2003/08/07 16:43:00 agc Exp $"); +__RCSID("$NetBSD: wait.c,v 1.9 2012/03/20 16:36:05 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -50,8 +50,7 @@ __weak_alias(wait,_wait) pid_t -wait(istat) - int *istat; +wait(int *istat) { - return (wait4(WAIT_ANY, istat, 0, (struct rusage *)0)); + return (wait4(WAIT_ANY, istat, 0, (struct rusage *)NULL)); } Index: src/lib/libc/gen/pw_private.h diff -u src/lib/libc/gen/pw_private.h:1.2 src/lib/libc/gen/pw_private.h:1.3 --- src/lib/libc/gen/pw_private.h:1.2 Sat Jul 26 19:24:43 2003 +++ src/lib/libc/gen/pw_private.h Tue Mar 20 16:36:05 2012 @@ -1,8 +1,8 @@ -/* $NetBSD: pw_private.h,v 1.2 2003/07/26 19:24:43 salo Exp $ */ +/* $NetBSD: pw_private.h,v 1.3 2012/03/20 16:36:05 matt Exp $ */ /* * Written by Jason R. Thorpe <thor...@netbsd.org>, June 26, 1998. * Public domain. */ -int __pw_scan __P((char *bp, struct passwd *pw, int *flags)); +int __pw_scan(char *bp, struct passwd *pw, int *flags); Index: src/lib/libc/gen/setmode.c diff -u src/lib/libc/gen/setmode.c:1.31 src/lib/libc/gen/setmode.c:1.32 --- src/lib/libc/gen/setmode.c:1.31 Sat Oct 1 20:08:01 2005 +++ src/lib/libc/gen/setmode.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: setmode.c,v 1.31 2005/10/01 20:08:01 christos Exp $ */ +/* $NetBSD: setmode.c,v 1.32 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94"; #else -__RCSID("$NetBSD: setmode.c,v 1.31 2005/10/01 20:08:01 christos Exp $"); +__RCSID("$NetBSD: setmode.c,v 1.32 2012/03/20 16:36:05 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -77,10 +77,10 @@ typedef struct bitcmd { #define CMD2_OBITS 0x08 #define CMD2_UBITS 0x10 -static BITCMD *addcmd __P((BITCMD *, mode_t, mode_t, mode_t, mode_t)); -static void compress_mode __P((BITCMD *)); +static BITCMD *addcmd(BITCMD *, mode_t, mode_t, mode_t, mode_t); +static void compress_mode(BITCMD *); #ifdef SETMODE_DEBUG -static void dumpmode __P((BITCMD *)); +static void dumpmode(BITCMD *); #endif /* @@ -367,9 +367,7 @@ out: } static BITCMD * -addcmd(set, op, who, oparg, mask) - BITCMD *set; - mode_t oparg, who, op, mask; +addcmd(BITCMD *set, mode_t oparg, mode_t who, mode_t op, mode_t mask) { _DIAGASSERT(set != NULL); @@ -416,8 +414,7 @@ addcmd(set, op, who, oparg, mask) #ifdef SETMODE_DEBUG static void -dumpmode(set) - BITCMD *set; +dumpmode(BITCMD *set) { _DIAGASSERT(set != NULL); @@ -440,8 +437,7 @@ dumpmode(set) * compacted, but it's not worth the effort. */ static void -compress_mode(set) - BITCMD *set; +compress_mode(BITCMD *set) { BITCMD *nset; int setbits, clrbits, Xbits, op; Index: src/lib/libc/gen/sysctl.c diff -u src/lib/libc/gen/sysctl.c:1.31 src/lib/libc/gen/sysctl.c:1.32 --- src/lib/libc/gen/sysctl.c:1.31 Tue Mar 13 21:13:36 2012 +++ src/lib/libc/gen/sysctl.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: sysctl.c,v 1.31 2012/03/13 21:13:36 christos Exp $ */ +/* $NetBSD: sysctl.c,v 1.32 2012/03/20 16:36:05 matt Exp $ */ /*- * Copyright (c) 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)sysctl.c 8.2 (Berkeley) 1/4/94"; #else -__RCSID("$NetBSD: sysctl.c,v 1.31 2012/03/13 21:13:36 christos Exp $"); +__RCSID("$NetBSD: sysctl.c,v 1.32 2012/03/20 16:36:05 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -70,12 +70,9 @@ static size_t __cvt_node_out(uint, const #include <stdlib.h> int -sysctl(name, namelen, oldp, oldlenp, newp, newlen) - const int *name; - unsigned int namelen; - void *oldp; - const void *newp; - size_t *oldlenp, newlen; +sysctl(const int *name, unsigned int namelen, + void *oldp, size_t *oldlenp, + const void *newp, size_t newlen) { size_t oldlen, savelen; int error; @@ -105,12 +102,9 @@ sysctl(name, namelen, oldp, oldlenp, new } static int -user_sysctl(name, namelen, oldp, oldlenp, newp, newlen) - const int *name; - unsigned int namelen; - void *oldp; - const void *newp; - size_t *oldlenp, newlen; +user_sysctl(const int *name, unsigned int namelen, + void *oldp, size_t *oldlenp, + const void *newp, size_t newlen) { #define _INT(s, n, v, d) { \ .sysctl_flags = CTLFLAG_IMMEDIATE|CTLFLAG_PERMANENT| \ Index: src/lib/libc/gen/wait3.c diff -u src/lib/libc/gen/wait3.c:1.9 src/lib/libc/gen/wait3.c:1.10 --- src/lib/libc/gen/wait3.c:1.9 Tue Mar 23 20:28:59 2010 +++ src/lib/libc/gen/wait3.c Tue Mar 20 16:36:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: wait3.c,v 1.9 2010/03/23 20:28:59 drochner Exp $ */ +/* $NetBSD: wait3.c,v 1.10 2012/03/20 16:36:05 matt Exp $ */ /* * Copyright (c) 1988, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)wait3.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: wait3.c,v 1.9 2010/03/23 20:28:59 drochner Exp $"); +__RCSID("$NetBSD: wait3.c,v 1.10 2012/03/20 16:36:05 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -45,10 +45,7 @@ __RCSID("$NetBSD: wait3.c,v 1.9 2010/03/ #include <sys/resource.h> pid_t -wait3(istat, options, rup) - int *istat; - int options; - struct rusage *rup; +wait3(int *istat, int options, struct rusage *rup) { return (wait4(WAIT_ANY, istat, options, rup)); }