Module Name:    src
Committed By:   matt
Date:           Tue Mar 20 16:26:12 UTC 2012

Modified Files:
        src/lib/libc/sys: ftruncate.c lseek.c mmap.c ntp_adjtime.c preadv.c
            pwritev.c sigwait.c sigwaitinfo.c truncate.c

Log Message:
Convert to C89 prototypes.  Remove use of __P


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/sys/ftruncate.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/sys/lseek.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/sys/mmap.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/sys/ntp_adjtime.c \
    src/lib/libc/sys/truncate.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/sys/preadv.c src/lib/libc/sys/pwritev.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/sys/sigwait.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/sys/sigwaitinfo.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/sys/ftruncate.c
diff -u src/lib/libc/sys/ftruncate.c:1.13 src/lib/libc/sys/ftruncate.c:1.14
--- src/lib/libc/sys/ftruncate.c:1.13	Fri Nov 23 12:39:15 2007
+++ src/lib/libc/sys/ftruncate.c	Tue Mar 20 16:26:12 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftruncate.c,v 1.13 2007/11/23 12:39:15 uebayasi Exp $	*/
+/*	$NetBSD: ftruncate.c,v 1.14 2012/03/20 16:26:12 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)ftruncate.c	8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: ftruncate.c,v 1.13 2007/11/23 12:39:15 uebayasi Exp $");
+__RCSID("$NetBSD: ftruncate.c,v 1.14 2012/03/20 16:26:12 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -54,9 +54,7 @@ int __ftruncate(int, int, off_t);
  * is not supplied by GCC 1.X but is supplied by GCC 2.X.
  */
 int
-ftruncate(fd, length)
-	int	fd;
-	off_t	length;
+ftruncate(int fd, off_t length)
 {
 
 	return __ftruncate(fd, 0, length);

Index: src/lib/libc/sys/lseek.c
diff -u src/lib/libc/sys/lseek.c:1.10 src/lib/libc/sys/lseek.c:1.11
--- src/lib/libc/sys/lseek.c:1.10	Fri Nov 23 12:39:15 2007
+++ src/lib/libc/sys/lseek.c	Tue Mar 20 16:26:12 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: lseek.c,v 1.10 2007/11/23 12:39:15 uebayasi Exp $	*/
+/*	$NetBSD: lseek.c,v 1.11 2012/03/20 16:26:12 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)lseek.c	8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: lseek.c,v 1.10 2007/11/23 12:39:15 uebayasi Exp $");
+__RCSID("$NetBSD: lseek.c,v 1.11 2012/03/20 16:26:12 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -54,10 +54,7 @@ off_t __lseek(int, int, off_t, int);
  * is not supplied by GCC 1.X but is supplied by GCC 2.X.
  */
 off_t
-lseek(fd, offset, whence)
-	int	fd;
-	off_t	offset;
-	int	whence;
+lseek(int fd, off_t offset, int whence)
 {
 
 	return __lseek(fd, 0, offset, whence);

Index: src/lib/libc/sys/mmap.c
diff -u src/lib/libc/sys/mmap.c:1.14 src/lib/libc/sys/mmap.c:1.15
--- src/lib/libc/sys/mmap.c:1.14	Fri Nov 23 12:39:15 2007
+++ src/lib/libc/sys/mmap.c	Tue Mar 20 16:26:12 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: mmap.c,v 1.14 2007/11/23 12:39:15 uebayasi Exp $	*/
+/*	$NetBSD: mmap.c,v 1.15 2012/03/20 16:26:12 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: mmap.c,v 1.14 2007/11/23 12:39:15 uebayasi Exp $");
+__RCSID("$NetBSD: mmap.c,v 1.15 2012/03/20 16:26:12 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -55,13 +55,7 @@ void *__mmap(void *, size_t, int, int, i
  * is not supplied by GCC 1.X but is supplied by GCC 2.X.
  */
 void *
-mmap(addr, len, prot, flags, fd, offset)
-	void   *addr;
-	size_t	len;
-	int	prot;
-	int	flags;
-	int	fd;
-	off_t	offset;
+mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
 
 	return __mmap(addr, len, prot, flags, fd, 0, offset);

Index: src/lib/libc/sys/ntp_adjtime.c
diff -u src/lib/libc/sys/ntp_adjtime.c:1.12 src/lib/libc/sys/ntp_adjtime.c:1.13
--- src/lib/libc/sys/ntp_adjtime.c:1.12	Sat Oct 15 23:00:02 2011
+++ src/lib/libc/sys/ntp_adjtime.c	Tue Mar 20 16:26:12 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: ntp_adjtime.c,v 1.12 2011/10/15 23:00:02 christos Exp $ */
+/*	$NetBSD: ntp_adjtime.c,v 1.13 2012/03/20 16:26:12 matt Exp $ */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.      
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: ntp_adjtime.c,v 1.12 2011/10/15 23:00:02 christos Exp $");
+__RCSID("$NetBSD: ntp_adjtime.c,v 1.13 2012/03/20 16:26:12 matt Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -60,8 +60,7 @@ extern int __clockctl_fd;
 int __ntp_adjtime(struct timex *);
 
 int
-ntp_adjtime(tp)
-	struct timex *tp;
+ntp_adjtime(struct timex *tp)
 {
 	struct clockctl_ntp_adjtime args;
 	int error;
Index: src/lib/libc/sys/truncate.c
diff -u src/lib/libc/sys/truncate.c:1.12 src/lib/libc/sys/truncate.c:1.13
--- src/lib/libc/sys/truncate.c:1.12	Fri Nov 23 12:39:16 2007
+++ src/lib/libc/sys/truncate.c	Tue Mar 20 16:26:12 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: truncate.c,v 1.12 2007/11/23 12:39:16 uebayasi Exp $	*/
+/*	$NetBSD: truncate.c,v 1.13 2012/03/20 16:26:12 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)truncate.c	8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: truncate.c,v 1.12 2007/11/23 12:39:16 uebayasi Exp $");
+__RCSID("$NetBSD: truncate.c,v 1.13 2012/03/20 16:26:12 matt Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -49,9 +49,7 @@ int __truncate(const char *, int, off_t)
  * is not supplied by GCC 1.X but is supplied by GCC 2.X.
  */
 int
-truncate(path, length)
-	const char *path;
-	off_t length;
+truncate(const char *path, off_t length)
 {
 
 	return __truncate(path, 0, length);

Index: src/lib/libc/sys/preadv.c
diff -u src/lib/libc/sys/preadv.c:1.6 src/lib/libc/sys/preadv.c:1.7
--- src/lib/libc/sys/preadv.c:1.6	Fri Nov 23 12:39:15 2007
+++ src/lib/libc/sys/preadv.c	Tue Mar 20 16:26:12 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: preadv.c,v 1.6 2007/11/23 12:39:15 uebayasi Exp $	*/
+/*	$NetBSD: preadv.c,v 1.7 2012/03/20 16:26:12 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: preadv.c,v 1.6 2007/11/23 12:39:15 uebayasi Exp $");
+__RCSID("$NetBSD: preadv.c,v 1.7 2012/03/20 16:26:12 matt Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -46,11 +46,7 @@ ssize_t __preadv(int, const struct iovec
  * is not supplied by GCC 1.X but is supplied by GCC 2.X.
  */
 ssize_t
-preadv(fd, iovp, iovcnt, offset)
-	int fd;
-	const struct iovec *iovp;
-	int iovcnt;
-	off_t offset;
+preadv(int fd, const struct iovec *iovp, int iovcnt, off_t offset)
 {
 
 	return __preadv(fd, iovp, iovcnt, 0, offset);
Index: src/lib/libc/sys/pwritev.c
diff -u src/lib/libc/sys/pwritev.c:1.6 src/lib/libc/sys/pwritev.c:1.7
--- src/lib/libc/sys/pwritev.c:1.6	Fri Nov 23 12:39:16 2007
+++ src/lib/libc/sys/pwritev.c	Tue Mar 20 16:26:12 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: pwritev.c,v 1.6 2007/11/23 12:39:16 uebayasi Exp $	*/
+/*	$NetBSD: pwritev.c,v 1.7 2012/03/20 16:26:12 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pwritev.c,v 1.6 2007/11/23 12:39:16 uebayasi Exp $");
+__RCSID("$NetBSD: pwritev.c,v 1.7 2012/03/20 16:26:12 matt Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -46,11 +46,7 @@ ssize_t __pwritev(int, const struct iove
  * is not supplied by GCC 1.X but is supplied by GCC 2.X.
  */
 ssize_t
-pwritev(fd, iovp, iovcnt, offset)
-	int fd;
-	const struct iovec *iovp;
-	int iovcnt;
-	off_t offset;
+pwritev(int fd, const struct iovec *iovp, int iovcnt, off_t offset)
 {
 
 	return __pwritev(fd, iovp, iovcnt, 0, offset);

Index: src/lib/libc/sys/sigwait.c
diff -u src/lib/libc/sys/sigwait.c:1.4 src/lib/libc/sys/sigwait.c:1.5
--- src/lib/libc/sys/sigwait.c:1.4	Mon May 31 11:02:24 2010
+++ src/lib/libc/sys/sigwait.c	Tue Mar 20 16:26:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sigwait.c,v 1.4 2010/05/31 11:02:24 drochner Exp $ */
+/* $NetBSD: sigwait.c,v 1.5 2012/03/20 16:26:12 matt Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sigwait.c,v 1.4 2010/05/31 11:02:24 drochner Exp $");
+__RCSID("$NetBSD: sigwait.c,v 1.5 2012/03/20 16:26:12 matt Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -45,7 +45,7 @@ __RCSID("$NetBSD: sigwait.c,v 1.4 2010/0
 __weak_alias(sigwait,_sigwait)
 #endif
 
-int	_sigwait __P((const sigset_t * __restrict, int * __restrict));
+int	_sigwait(const sigset_t * __restrict, int * __restrict);
 
 /*
  * This is wrapper around sigtimedwait(2), providing sigwait()

Index: src/lib/libc/sys/sigwaitinfo.c
diff -u src/lib/libc/sys/sigwaitinfo.c:1.2 src/lib/libc/sys/sigwaitinfo.c:1.3
--- src/lib/libc/sys/sigwaitinfo.c:1.2	Mon Apr 28 20:23:00 2008
+++ src/lib/libc/sys/sigwaitinfo.c	Tue Mar 20 16:26:12 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sigwaitinfo.c,v 1.2 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: sigwaitinfo.c,v 1.3 2012/03/20 16:26:12 matt Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sigwaitinfo.c,v 1.2 2008/04/28 20:23:00 martin Exp $");
+__RCSID("$NetBSD: sigwaitinfo.c,v 1.3 2012/03/20 16:26:12 matt Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -44,8 +44,7 @@ __RCSID("$NetBSD: sigwaitinfo.c,v 1.2 20
 __weak_alias(sigwaitinfo,_sigwaitinfo)
 #endif
 
-int	_sigwaitinfo __P((const sigset_t * __restrict,
-	    siginfo_t * __restrict info));
+int	_sigwaitinfo(const sigset_t * __restrict, siginfo_t * __restrict info);
 
 /*
  * This is wrapper around sigtimedwait(2), providing sigwaitinfo()

Reply via email to