ansification; checked by pval

14 files changed, 33 insertions, 76 deletions

diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c
index 1ea26845985..8d95281064e 100644
--- a/lib/libc/sys/ftruncate.c
+++ b/lib/libc/sys/ftruncate.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ftruncate.c,v 1.10 2003/06/02 20:18:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: ftruncate.c,v 1.11 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -44,9 +44,7 @@ quad_t __syscall(quad_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)
 {
 	int retval;
 
diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c
index 4340d889491..d811ce9b8ae 100644
--- a/lib/libc/sys/lseek.c
+++ b/lib/libc/sys/lseek.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: lseek.c,v 1.9 2003/06/02 20:18:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: lseek.c,v 1.10 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -40,10 +40,7 @@ static char rcsid[] = "$OpenBSD: lseek.c,v 1.9 2003/06/02 20:18:39 millert Exp $
  * 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)
 {
 	extern off_t __syscall();
 	off_t retval;
diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c
index 09d2691639e..eb51fb70f62 100644
--- a/lib/libc/sys/mmap.c
+++ b/lib/libc/sys/mmap.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: mmap.c,v 1.11 2003/06/02 20:18:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: mmap.c,v 1.12 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -44,13 +44,7 @@ quad_t __syscall(quad_t, ...);
  * 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((void *)(long)__syscall((quad_t)SYS_mmap, addr, len, prot,
diff --git a/lib/libc/sys/pread.c b/lib/libc/sys/pread.c
index bd08f2749f2..7d214556d2f 100644
--- a/lib/libc/sys/pread.c
+++ b/lib/libc/sys/pread.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pread.c,v 1.5 2003/06/02 20:18:39 millert Exp $	*/
+/*	$OpenBSD: pread.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -30,7 +30,7 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: pread.c,v 1.5 2003/06/02 20:18:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: pread.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -42,11 +42,7 @@ static char rcsid[] = "$OpenBSD: pread.c,v 1.5 2003/06/02 20:18:39 millert Exp $
  * is not supplied by GCC 1.X but is supplied by GCC 2.X.
  */
 ssize_t
-pread(fd, buf, nbyte, offset)
-	int fd;
-	void *buf;
-	size_t nbyte;
-	off_t offset;
+pread(int fd, void *buf, size_t nbyte, off_t offset)
 {
 	extern off_t __syscall();
 	quad_t q;
diff --git a/lib/libc/sys/preadv.c b/lib/libc/sys/preadv.c
index f7e3b134628..baabe0db0b8 100644
--- a/lib/libc/sys/preadv.c
+++ b/lib/libc/sys/preadv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: preadv.c,v 1.5 2003/06/02 20:18:39 millert Exp $	*/
+/*	$OpenBSD: preadv.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -30,7 +30,7 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: preadv.c,v 1.5 2003/06/02 20:18:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: preadv.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -43,11 +43,7 @@ static char rcsid[] = "$OpenBSD: preadv.c,v 1.5 2003/06/02 20:18:39 millert Exp
  * 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)
 {
 	extern off_t __syscall();
 	quad_t q;
diff --git a/lib/libc/sys/ptrace.c b/lib/libc/sys/ptrace.c
index f0d02dd7ae5..7c6d83333e9 100644
--- a/lib/libc/sys/ptrace.c
+++ b/lib/libc/sys/ptrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ptrace.c,v 1.2 2002/02/16 21:27:24 millert Exp $	*/
+/*	$OpenBSD: ptrace.c,v 1.3 2003/06/11 21:03:10 deraadt Exp $	*/
 /* David Leonard <d@openbsd.org>, 1999. Public domain. */
 
 #include <sys/types.h>
@@ -8,11 +8,7 @@
 int _ptrace(int, pid_t, caddr_t, int);
 
 int
-ptrace(request, pid, addr, data)
-	int request;
-	pid_t pid;
-	caddr_t addr;
-	int data;
+ptrace(int request, pid_t pid, caddr_t addr, int data)
 {
 
 	/* ptrace(2) is documented to clear errno on success: */
diff --git a/lib/libc/sys/pwrite.c b/lib/libc/sys/pwrite.c
index e390c3cfad9..04a1c268083 100644
--- a/lib/libc/sys/pwrite.c
+++ b/lib/libc/sys/pwrite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwrite.c,v 1.5 2003/06/02 20:18:39 millert Exp $	 */
+/*	$OpenBSD: pwrite.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $	 */
 
 /*
  * Copyright (c) 1992, 1993
@@ -30,7 +30,7 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: pwrite.c,v 1.5 2003/06/02 20:18:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: pwrite.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -42,11 +42,7 @@ static char rcsid[] = "$OpenBSD: pwrite.c,v 1.5 2003/06/02 20:18:39 millert Exp
  * is not supplied by GCC 1.X but is supplied by GCC 2.X.
  */
 ssize_t
-pwrite(fd, buf, nbyte, offset)
-	int fd;
-	const void *buf;
-	size_t nbyte;
-	off_t offset;
+pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
 {
 	extern off_t __syscall();
 	quad_t q;
diff --git a/lib/libc/sys/pwritev.c b/lib/libc/sys/pwritev.c
index d5446e48a3c..0152c8912e5 100644
--- a/lib/libc/sys/pwritev.c
+++ b/lib/libc/sys/pwritev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwritev.c,v 1.5 2003/06/02 20:18:39 millert Exp $	*/
+/*	$OpenBSD: pwritev.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -30,7 +30,7 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: pwritev.c,v 1.5 2003/06/02 20:18:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: pwritev.c,v 1.6 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -43,11 +43,7 @@ static char rcsid[] = "$OpenBSD: pwritev.c,v 1.5 2003/06/02 20:18:39 millert Exp
  * 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)
 {
 	extern off_t __syscall();
 	quad_t q;
diff --git a/lib/libc/sys/timer_create.c b/lib/libc/sys/timer_create.c
index 9b5ca7d3f56..f588dbd670a 100644
--- a/lib/libc/sys/timer_create.c
+++ b/lib/libc/sys/timer_create.c
@@ -1,5 +1,5 @@
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_create.c,v 1.4 1998/02/07 20:50:54 tholo Exp $";
+static char rcsid[] = "$OpenBSD: timer_create.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <signal.h>
@@ -10,10 +10,7 @@ struct sigevent;
 
 /* ARGSUSED */
 int
-timer_create(clock_id, evp, timerid)
-	clockid_t clock_id;
-	struct sigevent *evp;
-	timer_t *timerid;
+timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid)
 {
 	errno = ENOSYS;
 	return -1;
diff --git a/lib/libc/sys/timer_delete.c b/lib/libc/sys/timer_delete.c
index cae43905868..6c45049e8b2 100644
--- a/lib/libc/sys/timer_delete.c
+++ b/lib/libc/sys/timer_delete.c
@@ -1,5 +1,5 @@
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_delete.c,v 1.3 1997/04/30 05:49:29 tholo Exp $";
+static char rcsid[] = "$OpenBSD: timer_delete.c,v 1.4 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <signal.h>
@@ -8,8 +8,7 @@ static char rcsid[] = "$OpenBSD: timer_delete.c,v 1.3 1997/04/30 05:49:29 tholo
 
 /* ARGSUSED */
 int
-timer_delete(timerid)
-	timer_t timerid;
+timer_delete(timer_t timerid)
 {
 	errno = ENOSYS;
 	return -1;
diff --git a/lib/libc/sys/timer_getoverrun.c b/lib/libc/sys/timer_getoverrun.c
index 9fc7b512be2..2b138ebe163 100644
--- a/lib/libc/sys/timer_getoverrun.c
+++ b/lib/libc/sys/timer_getoverrun.c
@@ -1,5 +1,5 @@
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_getoverrun.c,v 1.3 1997/04/30 05:49:29 tholo Exp $";
+static char rcsid[] = "$OpenBSD: timer_getoverrun.c,v 1.4 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <signal.h>
@@ -8,8 +8,7 @@ static char rcsid[] = "$OpenBSD: timer_getoverrun.c,v 1.3 1997/04/30 05:49:29 th
 
 /* ARGSUSED */
 int
-timer_getoverrun(timerid)
-	timer_t timerid;
+timer_getoverrun(timer_t timerid)
 {
 	errno = ENOSYS;
 	return -1;
diff --git a/lib/libc/sys/timer_gettime.c b/lib/libc/sys/timer_gettime.c
index acbfdc8cd75..c135299f659 100644
--- a/lib/libc/sys/timer_gettime.c
+++ b/lib/libc/sys/timer_gettime.c
@@ -1,5 +1,5 @@
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_gettime.c,v 1.4 1998/02/07 20:50:55 tholo Exp $";
+static char rcsid[] = "$OpenBSD: timer_gettime.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <signal.h>
@@ -10,9 +10,7 @@ struct itimerspec;
 
 /* ARGSUSED */
 int
-timer_gettime(timerid, value)
-	timer_t timerid;
-	struct itimerspec *value;
+timer_gettime(timer_t timerid, struct itimerspec *value)
 {
 	errno = ENOSYS;
 	return -1;
diff --git a/lib/libc/sys/timer_settime.c b/lib/libc/sys/timer_settime.c
index 3925b89d393..22fb6dd40ad 100644
--- a/lib/libc/sys/timer_settime.c
+++ b/lib/libc/sys/timer_settime.c
@@ -1,5 +1,5 @@
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: timer_settime.c,v 1.4 1998/02/07 20:50:55 tholo Exp $";
+static char rcsid[] = "$OpenBSD: timer_settime.c,v 1.5 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <signal.h>
@@ -10,11 +10,8 @@ struct itimerspec;
 
 /* ARGSUSED */
 int
-timer_settime(timerid, flags, value, ovalue)
-	timer_t timerid;
-	int flags;
-	const struct itimerspec *value;
-	struct itimerspec *ovalue;
+timer_settime(timer_t timerid, int flags, const struct itimerspec *value,
+    struct itimerspec *ovalue)
 {
 	errno = ENOSYS;
 	return -1;
diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c
index cbb104cb94b..c4a2f8d88d2 100644
--- a/lib/libc/sys/truncate.c
+++ b/lib/libc/sys/truncate.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(SYSLIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: truncate.c,v 1.9 2003/06/02 20:18:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: truncate.c,v 1.10 2003/06/11 21:03:10 deraadt Exp $";
 #endif /* SYSLIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -43,9 +43,7 @@ quad_t __syscall(quad_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(__syscall((quad_t)SYS_truncate, path, 0, length));