Module Name: src
Committed By: matt
Date: Tue Mar 20 17:06:00 UTC 2012
Modified Files:
src/lib/libc/compat/gen: compat_getmntinfo.c compat_sigsetops.c
compat_timezone.c
src/lib/libc/compat/net: compat_ns_addr.c compat_ns_ntoa.c
src/lib/libc/compat/sys: compat_getdirentries.c compat_msync.c
compat_sigaltstack.c
Log Message:
Switch to C89 definitions.
Remove use of __P
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/gen/compat_getmntinfo.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/gen/compat_sigsetops.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/gen/compat_timezone.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/net/compat_ns_addr.c \
src/lib/libc/compat/net/compat_ns_ntoa.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/sys/compat_getdirentries.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/sys/compat_msync.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/sys/compat_sigaltstack.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/compat/gen/compat_getmntinfo.c
diff -u src/lib/libc/compat/gen/compat_getmntinfo.c:1.1 src/lib/libc/compat/gen/compat_getmntinfo.c:1.2
--- src/lib/libc/compat/gen/compat_getmntinfo.c:1.1 Tue Sep 13 01:44:09 2005
+++ src/lib/libc/compat/gen/compat_getmntinfo.c Tue Mar 20 17:05:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_getmntinfo.c,v 1.1 2005/09/13 01:44:09 christos Exp $ */
+/* $NetBSD: compat_getmntinfo.c,v 1.2 2012/03/20 17:05:59 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: compat_getmntinfo.c,v 1.1 2005/09/13 01:44:09 christos Exp $");
+__RCSID("$NetBSD: compat_getmntinfo.c,v 1.2 2012/03/20 17:05:59 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -58,9 +58,7 @@ __weak_alias(getmntinfo,_getmntinfo)
* Return information about mounted filesystems.
*/
int
-getmntinfo(mntbufp, flags)
- struct statfs12 **mntbufp;
- int flags;
+getmntinfo(struct statfs12 **mntbufp, int flags)
{
static struct statfs12 *mntbuf;
static int mntsize;
Index: src/lib/libc/compat/gen/compat_sigsetops.c
diff -u src/lib/libc/compat/gen/compat_sigsetops.c:1.2 src/lib/libc/compat/gen/compat_sigsetops.c:1.3
--- src/lib/libc/compat/gen/compat_sigsetops.c:1.2 Sun Jan 11 02:46:25 2009
+++ src/lib/libc/compat/gen/compat_sigsetops.c Tue Mar 20 17:05:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigsetops.c,v 1.2 2009/01/11 02:46:25 christos Exp $ */
+/* $NetBSD: compat_sigsetops.c,v 1.3 2012/03/20 17:05:59 matt Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -36,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)sigsetops.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: compat_sigsetops.c,v 1.2 2009/01/11 02:46:25 christos Exp $");
+__RCSID("$NetBSD: compat_sigsetops.c,v 1.3 2012/03/20 17:05:59 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -66,25 +66,21 @@ __warn_references(sigismember,
"warning: reference to compatibility sigismember(); include <signal.h> for correct reference")
int
-sigemptyset(set)
- sigset13_t *set;
+sigemptyset(sigset13_t *set)
{
*set = 0;
return (0);
}
int
-sigfillset(set)
- sigset13_t *set;
+sigfillset(sigset13_t *set)
{
*set = ~(sigset13_t)0;
return (0);
}
int
-sigaddset(set, signo)
- sigset13_t *set;
- int signo;
+sigaddset(sigset13_t *set, int signo)
{
if (signo <= 0 || signo >= NSIG13) {
errno = EINVAL;
@@ -95,9 +91,7 @@ sigaddset(set, signo)
}
int
-sigdelset(set, signo)
- sigset13_t *set;
- int signo;
+sigdelset(sigset13_t *set, int signo)
{
if (signo <= 0 || signo >= NSIG13) {
errno = EINVAL;
@@ -108,9 +102,7 @@ sigdelset(set, signo)
}
int
-sigismember(set, signo)
- const sigset13_t *set;
- int signo;
+sigismember(const sigset13_t *set, int signo)
{
if (signo <= 0 || signo >= NSIG13) {
errno = EINVAL;
Index: src/lib/libc/compat/gen/compat_timezone.c
diff -u src/lib/libc/compat/gen/compat_timezone.c:1.3 src/lib/libc/compat/gen/compat_timezone.c:1.4
--- src/lib/libc/compat/gen/compat_timezone.c:1.3 Sun Jan 11 02:46:25 2009
+++ src/lib/libc/compat/gen/compat_timezone.c Tue Mar 20 17:05:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_timezone.c,v 1.3 2009/01/11 02:46:25 christos Exp $ */
+/* $NetBSD: compat_timezone.c,v 1.4 2012/03/20 17:05:59 matt Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)timezone.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: compat_timezone.c,v 1.3 2009/01/11 02:46:25 christos Exp $");
+__RCSID("$NetBSD: compat_timezone.c,v 1.4 2012/03/20 17:05:59 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -116,9 +116,7 @@ static const struct zone {
* STANDARD LIBRARY.
*/
char *
-_tztab(zone,dst)
- int zone;
- int dst;
+_tztab(int zone, int dst)
{
const struct zone *zp;
char sign;
Index: src/lib/libc/compat/net/compat_ns_addr.c
diff -u src/lib/libc/compat/net/compat_ns_addr.c:1.1 src/lib/libc/compat/net/compat_ns_addr.c:1.2
--- src/lib/libc/compat/net/compat_ns_addr.c:1.1 Sat Aug 26 16:07:01 2006
+++ src/lib/libc/compat/net/compat_ns_addr.c Tue Mar 20 17:05:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_ns_addr.c,v 1.1 2006/08/26 16:07:01 matt Exp $ */
+/* $NetBSD: compat_ns_addr.c,v 1.2 2012/03/20 17:05:59 matt Exp $ */
/*
* Copyright (c) 1986, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ns_addr.c 8.1 (Berkeley) 6/7/93";
#else
-__RCSID("$NetBSD: compat_ns_addr.c,v 1.1 2006/08/26 16:07:01 matt Exp $");
+__RCSID("$NetBSD: compat_ns_addr.c,v 1.2 2012/03/20 17:05:59 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -49,12 +49,11 @@ __RCSID("$NetBSD: compat_ns_addr.c,v 1.1
#include <stdio.h>
#include <string.h>
-static void Field __P((char *, u_int8_t *, int));
-static void cvtbase __P((long, int, int[], int, u_int8_t[], int));
+static void Field(char *, uint8_t *, int);
+static void cvtbase(long, int, int[], int, uint8_t [], int);
struct ns_addr
-ns_addr(name)
- const char *name;
+ns_addr(const char *name)
{
char separator;
char *hostname, *socketname, *cp;
@@ -93,7 +92,7 @@ ns_addr(name)
socketname = strchr(hostname, separator);
if (socketname) {
*socketname++ = 0;
- Field(socketname, (u_int8_t *)(void *)&addr.x_port, 2);
+ Field(socketname, (uint8_t *)(void *)&addr.x_port, 2);
}
Field(hostname, addr.x_host.c_host, 6);
@@ -102,10 +101,7 @@ ns_addr(name)
}
static void
-Field(buf, out, len)
- char *buf;
- u_int8_t *out;
- int len;
+Field(char *buf, uint8_t *out, int len)
{
register char *bp = buf;
int i, ibase, base16 = 0, base10 = 0, clen = 0;
@@ -218,19 +214,15 @@ Field(buf, out, len)
}
static void
-cvtbase(oldbase,newbase,input,inlen,result,reslen)
- long oldbase;
- int newbase;
- int input[];
- int inlen;
- unsigned char result[];
- int reslen;
+cvtbase(long oldbase, int newbase, int input[], int inlen,
+ uint8_t result[], int reslen)
{
int d, e;
long sum;
_DIAGASSERT(input != NULL);
_DIAGASSERT(result != NULL);
+ _DIAGASSERT(inlen > 0);
e = 1;
while (e > 0 && reslen > 0) {
Index: src/lib/libc/compat/net/compat_ns_ntoa.c
diff -u src/lib/libc/compat/net/compat_ns_ntoa.c:1.1 src/lib/libc/compat/net/compat_ns_ntoa.c:1.2
--- src/lib/libc/compat/net/compat_ns_ntoa.c:1.1 Sat Aug 26 16:07:01 2006
+++ src/lib/libc/compat/net/compat_ns_ntoa.c Tue Mar 20 17:05:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_ns_ntoa.c,v 1.1 2006/08/26 16:07:01 matt Exp $ */
+/* $NetBSD: compat_ns_ntoa.c,v 1.2 2012/03/20 17:05:59 matt Exp $ */
/*
* Copyright (c) 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ns_ntoa.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: compat_ns_ntoa.c,v 1.1 2006/08/26 16:07:01 matt Exp $");
+__RCSID("$NetBSD: compat_ns_ntoa.c,v 1.2 2012/03/20 17:05:59 matt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -44,19 +44,18 @@ __RCSID("$NetBSD: compat_ns_ntoa.c,v 1.1
#include <assert.h>
#include <stdio.h>
-static char *spectHex __P((char *));
+static char *spectHex(char *);
char *
-ns_ntoa(addr)
- struct ns_addr addr;
+ns_ntoa(struct ns_addr addr)
{
static char obuf[40];
- union { union ns_net net_e; u_int32_t long_e; } net;
- u_int16_t port = htons(addr.x_port);
+ union { union ns_net net_e; uint32_t long_e; } net;
+ uint16_t port = htons(addr.x_port);
char *cp;
char *cp2;
- u_int8_t *up = addr.x_host.c_host;
- u_int8_t *uplim = up + 6;
+ uint8_t *up = addr.x_host.c_host;
+ uint8_t *uplim = up + 6;
net.net_e = addr.x_net;
sprintf(obuf, "%x", ntohl(net.long_e));
@@ -85,8 +84,7 @@ ns_ntoa(addr)
}
static char *
-spectHex(p0)
- char *p0;
+spectHex(char *p0)
{
int ok = 0;
int nonzero = 0;
Index: src/lib/libc/compat/sys/compat_getdirentries.c
diff -u src/lib/libc/compat/sys/compat_getdirentries.c:1.2 src/lib/libc/compat/sys/compat_getdirentries.c:1.3
--- src/lib/libc/compat/sys/compat_getdirentries.c:1.2 Sun Feb 22 06:33:38 2009
+++ src/lib/libc/compat/sys/compat_getdirentries.c Tue Mar 20 17:06:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_getdirentries.c,v 1.2 2009/02/22 06:33:38 dholland Exp $ */
+/* $NetBSD: compat_getdirentries.c,v 1.3 2012/03/20 17:06:00 matt Exp $ */
/*
* Copyright (c) 1997 Frank van der Linden
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_getdirentries.c,v 1.2 2009/02/22 06:33:38 dholland Exp $");
+__RCSID("$NetBSD: compat_getdirentries.c,v 1.3 2012/03/20 17:06:00 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#define __LIBC12_SOURCE__
@@ -48,10 +48,7 @@ __warn_references(getdirentries,
"reference to compatibility-only getdirentries(); this will break; use getdents() or readdir() instead")
int
-getdirentries(fd, buf, nbytes, basep)
- int fd, nbytes;
- char *buf;
- long *basep;
+getdirentries(int fd, char *buf, int nbytes, long *basep)
{
*basep = (long)lseek(fd, (off_t)0, SEEK_CUR);
return getdents(fd, buf, (size_t)nbytes);
Index: src/lib/libc/compat/sys/compat_msync.c
diff -u src/lib/libc/compat/sys/compat_msync.c:1.1 src/lib/libc/compat/sys/compat_msync.c:1.2
--- src/lib/libc/compat/sys/compat_msync.c:1.1 Tue Sep 13 01:44:09 2005
+++ src/lib/libc/compat/sys/compat_msync.c Tue Mar 20 17:06:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_msync.c,v 1.1 2005/09/13 01:44:09 christos Exp $ */
+/* $NetBSD: compat_msync.c,v 1.2 2012/03/20 17:06:00 matt Exp $ */
/*
* Copyright (c) 1997 Frank van der Linden
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_msync.c,v 1.1 2005/09/13 01:44:09 christos Exp $");
+__RCSID("$NetBSD: compat_msync.c,v 1.2 2012/03/20 17:06:00 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#define __LIBC12_SOURCE__
@@ -46,9 +46,7 @@ __warn_references(msync,
"warning: reference to compatibility msync(); include <sys/mman.h> for correct reference")
int
-msync(addr, size)
- void *addr;
- size_t size;
+msync(void *addr, size_t size)
{
return __msync13(addr, size, MS_SYNC|MS_INVALIDATE);
}
Index: src/lib/libc/compat/sys/compat_sigaltstack.c
diff -u src/lib/libc/compat/sys/compat_sigaltstack.c:1.4 src/lib/libc/compat/sys/compat_sigaltstack.c:1.5
--- src/lib/libc/compat/sys/compat_sigaltstack.c:1.4 Tue Mar 13 21:13:32 2012
+++ src/lib/libc/compat/sys/compat_sigaltstack.c Tue Mar 20 17:06:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigaltstack.c,v 1.4 2012/03/13 21:13:32 christos Exp $ */
+/* $NetBSD: compat_sigaltstack.c,v 1.5 2012/03/20 17:06:00 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_sigaltstack.c,v 1.4 2012/03/13 21:13:32 christos Exp $");
+__RCSID("$NetBSD: compat_sigaltstack.c,v 1.5 2012/03/20 17:06:00 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#define __LIBC12_SOURCE__
@@ -44,9 +44,7 @@ __RCSID("$NetBSD: compat_sigaltstack.c,v
#include <stddef.h>
int
-sigaltstack(onss, ooss)
- const struct sigaltstack13 *onss;
- struct sigaltstack13 *ooss;
+sigaltstack(const struct sigaltstack13 *onss, struct sigaltstack13 *ooss)
{
stack_t nss, oss;
int error;
