First round of __P removal in sys

29 files changed, 298 insertions, 298 deletions

diff --git a/sys/lib/libkern/__main.c b/sys/lib/libkern/__main.c
index 02b525d8133..34e17f9126f 100644
--- a/sys/lib/libkern/__main.c
+++ b/sys/lib/libkern/__main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: __main.c,v 1.2 1996/04/19 16:09:17 niklas Exp $	*/
+/*	$OpenBSD: __main.c,v 1.3 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: __main.c,v 1.4 1996/03/14 18:52:03 christos Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
 
 #include <sys/types.h>
 
-void __main __P((void));
+void __main(void);
 
 void
 __main()
diff --git a/sys/lib/libkern/arch/powerpc/__eabi.c b/sys/lib/libkern/arch/powerpc/__eabi.c
index 1554de818f3..813c700053b 100644
--- a/sys/lib/libkern/arch/powerpc/__eabi.c
+++ b/sys/lib/libkern/arch/powerpc/__eabi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: __eabi.c,v 1.3 2001/07/09 03:58:50 mickey Exp $	*/
+/*	$OpenBSD: __eabi.c,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: __main.c,v 1.3 1994/10/26 06:42:13 cgd Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-void __eabi __P((void));
+void __eabi(void);
 
 void
 __eabi()
diff --git a/sys/lib/libkern/libkern.h b/sys/lib/libkern/libkern.h
index b6b147b9dc5..763385762bf 100644
--- a/sys/lib/libkern/libkern.h
+++ b/sys/lib/libkern/libkern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libkern.h,v 1.16 2000/12/18 18:40:44 provos Exp $	*/
+/*	$OpenBSD: libkern.h,v 1.17 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: libkern.h,v 1.7 1996/03/14 18:52:08 christos Exp $	*/
 
 /*-
@@ -47,15 +47,15 @@
 #endif
 
 
-LIBKERN_INLINE int imax __P((int, int));
-LIBKERN_INLINE int imin __P((int, int));
-LIBKERN_INLINE u_int max __P((u_int, u_int));
-LIBKERN_INLINE u_int min __P((u_int, u_int));
-LIBKERN_INLINE long lmax __P((long, long));
-LIBKERN_INLINE long lmin __P((long, long));
-LIBKERN_INLINE u_long ulmax __P((u_long, u_long));
-LIBKERN_INLINE u_long ulmin __P((u_long, u_long));
-LIBKERN_INLINE int abs __P((int));
+LIBKERN_INLINE int imax(int, int);
+LIBKERN_INLINE int imin(int, int);
+LIBKERN_INLINE u_int max(u_int, u_int);
+LIBKERN_INLINE u_int min(u_int, u_int);
+LIBKERN_INLINE long lmax(long, long);
+LIBKERN_INLINE long lmin(long, long);
+LIBKERN_INLINE u_long ulmax(u_long, u_long);
+LIBKERN_INLINE u_long ulmin(u_long, u_long);
+LIBKERN_INLINE int abs(int);
 
 #ifdef LIBKERN_BODY
 LIBKERN_INLINE int
@@ -152,27 +152,27 @@ abs(j)
 #endif
 
 /* Prototypes for non-quad routines. */
-void	 __assert __P((const char *, const char *, int, const char *))
+void	 __assert(const char *, const char *, int, const char *)
 	    __attribute__ ((__noreturn__));
-int	 bcmp __P((const void *, const void *, size_t));
-int	 ffs __P((int));
-int	 locc __P((int, char *, u_int));
-void	*memchr __P((const void *, int, size_t));
-int	 memcmp __P((const void *, const void *, size_t));
-u_long	 random __P((void));
-void	 srandom __P((u_long));
-int	 scanc __P((u_int, const u_char *, const u_char *, int));
-int	 skpc __P((int, size_t, u_char *));
-size_t	 strlen __P((const char *));
-char	*strcat __P((char *, const char *));
-char	*strcpy __P((char *, const char *));
-char	*strncpy __P((char *, const char *, size_t));
-size_t	 strlcpy __P((char *, const char *, size_t));
-size_t	 strlcat __P((char *, const char *, size_t));
-int	 strcmp __P((const char *, const char *));
-int	 strncmp __P((const char *, const char *, size_t));
-int	 strncasecmp __P((const char *, const char *, size_t));
-int	 getsn __P((char *, int));
+int	 bcmp(const void *, const void *, size_t);
+int	 ffs(int);
+int	 locc(int, char *, u_int);
+void	*memchr(const void *, int, size_t);
+int	 memcmp(const void *, const void *, size_t);
+u_long	 random(void);
+void	 srandom(u_long);
+int	 scanc(u_int, const u_char *, const u_char *, int);
+int	 skpc(int, size_t, u_char *);
+size_t	 strlen(const char *);
+char	*strcat(char *, const char *);
+char	*strcpy(char *, const char *);
+char	*strncpy(char *, const char *, size_t);
+size_t	 strlcpy(char *, const char *, size_t);
+size_t	 strlcat(char *, const char *, size_t);
+int	 strcmp(const char *, const char *);
+int	 strncmp(const char *, const char *, size_t);
+int	 strncasecmp(const char *, const char *, size_t);
+int	 getsn(char *, int);
 
 extern u_int8_t const __bcd2bin[], __bin2bcd[];
 #define	bcd2bin(b)	(__bcd2bin[(b)&0xff])
diff --git a/sys/lib/libkern/md5.c b/sys/lib/libkern/md5.c
index 564c4a9895e..a332b1a836d 100644
--- a/sys/lib/libkern/md5.c
+++ b/sys/lib/libkern/md5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md5.c,v 1.7 2000/11/08 15:26:40 art Exp $	*/
+/*	$OpenBSD: md5.c,v 1.8 2002/03/14 01:27:07 millert Exp $	*/
 
 /*
  * The rest of the code is derived from MD5C.C by RSADSI. Minor cosmetic
@@ -64,14 +64,14 @@ documentation and/or software.
 #define S43 15
 #define S44 21
 
-static void MD5Transform __P ((UINT4 [4], unsigned char [64]));
+static void MD5Transform(UINT4 [4], unsigned char [64]);
 
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define Encode MD5_memcpy
 #define Decode MD5_memcpy
 #else
-static void Encode __P ((unsigned char *, UINT4 *, unsigned int));
-static void Decode __P ((UINT4 *, unsigned char *, unsigned int));
+static void Encode(unsigned char *, UINT4 *, unsigned int);
+static void Decode(UINT4 *, unsigned char *, unsigned int);
 #endif
 
 #ifdef HAVEMEMCOPY
@@ -83,8 +83,8 @@ static void Decode __P ((UINT4 *, unsigned char *, unsigned int));
 #define MD5_memcpy(_a,_b,_c) bcopy((_b),(_a),(_c))
 #define MD5_memset(_a,_b,_c) bzero((_a),(_c))
 #else
-static void MD5_memcpy __P ((POINTER, POINTER, unsigned int));
-static void MD5_memset __P ((POINTER, int, unsigned int));
+static void MD5_memcpy(POINTER, POINTER, unsigned int);
+static void MD5_memset(POINTER, int, unsigned int);
 #endif
 #endif
 static unsigned char PADDING[64] = {
diff --git a/sys/lib/libkern/muldi3.c b/sys/lib/libkern/muldi3.c
index b565adda04b..ea38cf75248 100644
--- a/sys/lib/libkern/muldi3.c
+++ b/sys/lib/libkern/muldi3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: muldi3.c,v 1.3 1998/06/27 00:32:26 mickey Exp $	*/
+/*	$OpenBSD: muldi3.c,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: muldi3.c,v 1.5 1995/10/07 09:26:33 mycroft Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)muldi3.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: muldi3.c,v 1.3 1998/06/27 00:32:26 mickey Exp $";
+static char rcsid[] = "$OpenBSD: muldi3.c,v 1.4 2002/03/14 01:27:07 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -105,7 +105,7 @@ static char rcsid[] = "$OpenBSD: muldi3.c,v 1.3 1998/06/27 00:32:26 mickey Exp $
  * of 2^n in either one will also vanish.  Only `low' need be computed
  * mod 2^2n, and only because of the final term above.
  */
-static quad_t __lmulq __P((u_long, u_long));
+static quad_t __lmulq(u_long, u_long);
 
 quad_t
 __muldi3(a, b)
diff --git a/sys/lib/libkern/qdivrem.c b/sys/lib/libkern/qdivrem.c
index cee94bc14c4..07cdd4b8f7a 100644
--- a/sys/lib/libkern/qdivrem.c
+++ b/sys/lib/libkern/qdivrem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qdivrem.c,v 1.3 1998/06/27 00:32:27 mickey Exp $	*/
+/*	$OpenBSD: qdivrem.c,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: qdivrem.c,v 1.5 1995/10/07 09:26:40 mycroft Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #ifdef notdef
 static char sccsid[] = "@(#)qdivrem.c	8.1 (Berkeley) 6/4/93";
 #endif
-static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.3 1998/06/27 00:32:27 mickey Exp $";
+static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.4 2002/03/14 01:27:07 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -64,7 +64,7 @@ typedef unsigned short digit;
 typedef u_long digit;
 #endif
 
-static void shl __P((digit *p, int len, int sh));
+static void shl(digit *p, int len, int sh);
 
 /*
  * __qdivrem(u, v, rem) returns u/v and, optionally, sets *rem to u%v.
diff --git a/sys/lib/libkern/quad.h b/sys/lib/libkern/quad.h
index 382eed45b86..5b4dfde04c0 100644
--- a/sys/lib/libkern/quad.h
+++ b/sys/lib/libkern/quad.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quad.h,v 1.5 1997/07/25 18:25:38 mickey Exp $	*/
+/*	$OpenBSD: quad.h,v 1.6 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: quad.h,v 1.7 1996/04/18 02:20:04 cgd Exp $	*/
 
 /*-
@@ -102,7 +102,7 @@ union uu {
 #define	LHALF(x)	((u_long)(x) & (((long)1 << HALF_BITS) - 1))
 #define	LHUP(x)		((u_long)(x) << HALF_BITS)
 
-extern u_quad_t __qdivrem __P((u_quad_t u, u_quad_t v, u_quad_t *rem));
+extern u_quad_t __qdivrem(u_quad_t u, u_quad_t v, u_quad_t *rem);
 
 /*
  * XXX
@@ -117,22 +117,22 @@ typedef u_quad_t	qshift_t;
 #endif
 
 __BEGIN_DECLS
-quad_t	__adddi3	__P((quad_t, quad_t));
-quad_t	__anddi3	__P((quad_t, quad_t));
-quad_t	__ashldi3	__P((quad_t, qshift_t));
-quad_t	__ashrdi3	__P((quad_t, qshift_t));
-int	__cmpdi2	__P((quad_t, quad_t));
-quad_t	__divdi3	__P((quad_t, quad_t));
-quad_t	__iordi3	__P((quad_t, quad_t));
-quad_t	__lshldi3	__P((quad_t, qshift_t));
-quad_t	__lshrdi3	__P((quad_t, qshift_t));
-quad_t	__moddi3	__P((quad_t, quad_t));
-quad_t	__muldi3	__P((quad_t, quad_t));
-quad_t	__negdi2	__P((quad_t));
-quad_t	__one_cmpldi2	__P((quad_t));
-quad_t	__subdi3	__P((quad_t, quad_t));
-int	__ucmpdi2	__P((u_quad_t, u_quad_t));
-u_quad_t __udivdi3	__P((u_quad_t, u_quad_t));
-u_quad_t __umoddi3	__P((u_quad_t, u_quad_t));
-quad_t	__xordi3	__P((quad_t, quad_t));
+quad_t	__adddi3(quad_t, quad_t);
+quad_t	__anddi3(quad_t, quad_t);
+quad_t	__ashldi3(quad_t, qshift_t);
+quad_t	__ashrdi3(quad_t, qshift_t);
+int	__cmpdi2(quad_t, quad_t);
+quad_t	__divdi3(quad_t, quad_t);
+quad_t	__iordi3(quad_t, quad_t);
+quad_t	__lshldi3(quad_t, qshift_t);
+quad_t	__lshrdi3(quad_t, qshift_t);
+quad_t	__moddi3(quad_t, quad_t);
+quad_t	__muldi3(quad_t, quad_t);
+quad_t	__negdi2(quad_t);
+quad_t	__one_cmpldi2(quad_t);
+quad_t	__subdi3(quad_t, quad_t);
+int	__ucmpdi2(u_quad_t, u_quad_t);
+u_quad_t __udivdi3(u_quad_t, u_quad_t);
+u_quad_t __umoddi3(u_quad_t, u_quad_t);
+quad_t	__xordi3(quad_t, quad_t);
 __END_DECLS
diff --git a/sys/lib/libsa/arp.c b/sys/lib/libsa/arp.c
index 4fb93c8cbd6..7196a50ea8a 100644
--- a/sys/lib/libsa/arp.c
+++ b/sys/lib/libsa/arp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arp.c,v 1.7 1999/01/11 05:12:25 millert Exp $	*/
+/*	$OpenBSD: arp.c,v 1.8 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: arp.c,v 1.15 1996/10/13 02:28:58 christos Exp $	*/
 
 /*
@@ -64,8 +64,8 @@ struct arp_list {
 int arp_num = 1;
 
 /* Local forwards */
-static	ssize_t arpsend __P((struct iodesc *, void *, size_t));
-static	ssize_t arprecv __P((struct iodesc *, void *, size_t, time_t));
+static	ssize_t arpsend(struct iodesc *, void *, size_t);
+static	ssize_t arprecv(struct iodesc *, void *, size_t, time_t);
 
 /* Broadcast an ARP packet, asking who has addr on interface d */
 u_char *
diff --git a/sys/lib/libsa/bootp.c b/sys/lib/libsa/bootp.c
index 2c5afb60f17..1de33af08b6 100644
--- a/sys/lib/libsa/bootp.c
+++ b/sys/lib/libsa/bootp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootp.c,v 1.8 1999/12/18 16:42:19 deraadt Exp $	*/
+/*	$OpenBSD: bootp.c,v 1.9 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: bootp.c,v 1.10 1996/10/13 02:28:59 christos Exp $	*/
 
 /*
@@ -58,10 +58,10 @@ static	char vm_rfc1048[4] = VM_RFC1048;
 static	char vm_cmu[4] = VM_CMU;
 
 /* Local forwards */
-static	ssize_t bootpsend __P((struct iodesc *, void *, size_t));
-static	ssize_t bootprecv __P((struct iodesc *, void *, size_t, time_t));
-static	void vend_cmu __P((u_char *));
-static	void vend_rfc1048 __P((u_char *, u_int));
+static	ssize_t bootpsend(struct iodesc *, void *, size_t);
+static	ssize_t bootprecv(struct iodesc *, void *, size_t, time_t);
+static	void vend_cmu(u_char *);
+static	void vend_rfc1048(u_char *, u_int);
 
 /* Fetch required bootp infomation */
 void
diff --git a/sys/lib/libsa/bootparam.c b/sys/lib/libsa/bootparam.c
index fa219a14014..10f7844ffc8 100644
--- a/sys/lib/libsa/bootparam.c
+++ b/sys/lib/libsa/bootparam.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootparam.c,v 1.8 1998/05/31 23:39:16 mickey Exp $	*/
+/*	$OpenBSD: bootparam.c,v 1.9 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: bootparam.c,v 1.10 1996/10/14 21:16:55 thorpej Exp $	*/
 
 /*
@@ -77,11 +77,11 @@ struct xdr_inaddr {
 	int32_t	addr[4];
 };
 
-int xdr_inaddr_encode __P((char **p, struct in_addr ia));
-int xdr_inaddr_decode __P((char **p, struct in_addr *ia));
+int xdr_inaddr_encode(char **p, struct in_addr ia);
+int xdr_inaddr_decode(char **p, struct in_addr *ia);
 
-int xdr_string_encode __P((char **p, char *str, int len));
-int xdr_string_decode __P((char **p, char *str, int *len_p));
+int xdr_string_encode(char **p, char *str, int len);
+int xdr_string_decode(char **p, char *str, int *len_p);
 
 
 /*
diff --git a/sys/lib/libsa/bootparam.h b/sys/lib/libsa/bootparam.h
index 3581194606a..41b052c701f 100644
--- a/sys/lib/libsa/bootparam.h
+++ b/sys/lib/libsa/bootparam.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: bootparam.h,v 1.3 1998/05/31 23:39:18 mickey Exp $	*/
+/*	$OpenBSD: bootparam.h,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
 
-int bp_whoami __P((int sock));
-int bp_getfile __P((int sock, char *key, struct in_addr *addrp, char *path));
+int bp_whoami(int sock);
+int bp_getfile(int sock, char *key, struct in_addr *addrp, char *path);
 
diff --git a/sys/lib/libsa/cd9660.h b/sys/lib/libsa/cd9660.h
index 94e9f2ed241..78ff6166ee1 100644
--- a/sys/lib/libsa/cd9660.h
+++ b/sys/lib/libsa/cd9660.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660.h,v 1.2 1997/02/16 14:39:39 mickey Exp $	*/
+/*	$OpenBSD: cd9660.h,v 1.3 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: cd9660.h,v 1.1 1996/09/30 16:01:20 ws Exp $	*/
 
 /*
@@ -32,12 +32,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-int	cd9660_open __P((char *path, struct open_file *f));
-int	cd9660_close __P((struct open_file *f));
-int	cd9660_read __P((struct open_file *f, void *buf,
-			 size_t size, size_t *resid));
-int	cd9660_write __P((struct open_file *f, void *buf,
-			  size_t size, size_t *resid));
-off_t	cd9660_seek __P((struct open_file *f, off_t offset, int where));
-int	cd9660_stat __P((struct open_file *f, struct stat *sb));
-int	cd9660_readdir __P((struct open_file *f, char *name));
+int	cd9660_open(char *path, struct open_file *f);
+int	cd9660_close(struct open_file *f);
+int	cd9660_read(struct open_file *f, void *buf,
+			 size_t size, size_t *resid);
+int	cd9660_write(struct open_file *f, void *buf,
+			  size_t size, size_t *resid);
+off_t	cd9660_seek(struct open_file *f, off_t offset, int where);
+int	cd9660_stat(struct open_file *f, struct stat *sb);
+int	cd9660_readdir(struct open_file *f, char *name);
diff --git a/sys/lib/libsa/exec.h b/sys/lib/libsa/exec.h
index 2b513c4cbf9..871b72f0973 100644
--- a/sys/lib/libsa/exec.h
+++ b/sys/lib/libsa/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.4 2000/05/30 21:59:30 mickey Exp $	*/
+/*	$OpenBSD: exec.h,v 1.5 2002/03/14 01:27:07 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -67,10 +67,10 @@ struct x_param;
 struct x_sw {
 	char name[MAX_EXEC_NAME];
 	/* returns file position to lseek to */
-	int (*probe) __P((int, union x_header *));
+	int (*probe)(int, union x_header *);
 	/* zero on success */
-	int (*load) __P((int, struct x_param *));
-	int (*ldsym) __P((int, struct x_param *));
+	int (*load)(int, struct x_param *);
+	int (*ldsym)(int, struct x_param *);
 };
 
 struct x_param {
@@ -82,18 +82,18 @@ struct x_param {
 };
 
 extern const struct x_sw execsw[];
-void machdep_exec __P((struct x_param *, int, void *));
+void machdep_exec(struct x_param *, int, void *);
 
-int aout_probe __P((int, union x_header *));
-int aout_load __P((int, struct x_param *));
-int aout_ldsym __P((int, struct x_param *));
+int aout_probe(int, union x_header *);
+int aout_load(int, struct x_param *);
+int aout_ldsym(int, struct x_param *);
 
-int elf_probe __P((int, union x_header *));
-int elf_load __P((int, struct x_param *));
-int elf_ldsym __P((int, struct x_param *));
+int elf_probe(int, union x_header *);
+int elf_load(int, struct x_param *);
+int elf_ldsym(int, struct x_param *);
 
-int ecoff_probe __P((int, union x_header *));
-int ecoff_load __P((int, struct x_param *));
-int ecoff_ldsym __P((int, struct x_param *));
+int ecoff_probe(int, union x_header *);
+int ecoff_load(int, struct x_param *);
+int ecoff_ldsym(int, struct x_param *);
 
 #endif /* _SA_EXEC_H_ */
diff --git a/sys/lib/libsa/exit.c b/sys/lib/libsa/exit.c
index 4b0e78a5fe7..7486a180968 100644
--- a/sys/lib/libsa/exit.c
+++ b/sys/lib/libsa/exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exit.c,v 1.4 1997/07/25 18:21:56 mickey Exp $	*/
+/*	$OpenBSD: exit.c,v 1.5 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: exit.c,v 1.11 1996/12/01 20:22:19 pk Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ panic(fmt /*, va_alist */)
 	char *fmt;
 #endif
 {
-    extern void closeall __P((void));
+    extern void closeall(void);
     va_list ap;
     static int paniced;
     
diff --git a/sys/lib/libsa/loadfile.c b/sys/lib/libsa/loadfile.c
index f04ee0ccd18..10d36bbbb54 100644
--- a/sys/lib/libsa/loadfile.c
+++ b/sys/lib/libsa/loadfile.c
@@ -1,5 +1,5 @@
 /* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile.c,v 1.1 2001/06/23 01:47:40 drahn Exp $ */
+/* $OpenBSD: loadfile.c,v 1.2 2002/03/14 01:27:07 millert Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -96,15 +96,15 @@
 
 #ifdef BOOT_ECOFF
 #include <sys/exec_ecoff.h>
-static int coff_exec __P((int, struct ecoff_exechdr *, u_long *, int));
+static int coff_exec(int, struct ecoff_exechdr *, u_long *, int);
 #endif
 #ifdef BOOT_ELF
 #include <sys/exec_elf.h>
-static int elf_exec __P((int, Elf_Ehdr *, u_long *, int));
+static int elf_exec(int, Elf_Ehdr *, u_long *, int);
 #endif
 #ifdef BOOT_AOUT
 #include <sys/exec_aout.h>
-static int aout_exec __P((int, struct exec *, u_long *, int));
+static int aout_exec(int, struct exec *, u_long *, int);
 #endif
 
 /*
diff --git a/sys/lib/libsa/loadfile.h b/sys/lib/libsa/loadfile.h
index e30fa578464..1ba94ff404c 100644
--- a/sys/lib/libsa/loadfile.h
+++ b/sys/lib/libsa/loadfile.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: loadfile.h,v 1.1 1999/04/28 09:08:50 christos Exp $	 */
-/*	$OpenBSD: loadfile.h,v 1.1 2001/06/23 01:47:40 drahn Exp $	 */
+/*	$OpenBSD: loadfile.h,v 1.2 2002/03/14 01:27:07 millert Exp $	 */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,6 +66,6 @@
 #define	COUNT_HDR	0x2000
 #define COUNT_ALL	0x3f00
 
-int loadfile __P((const char *, u_long *, int));
+int loadfile(const char *, u_long *, int);
 
 #include <machine/loadfile_machdep.h>
diff --git a/sys/lib/libsa/net.c b/sys/lib/libsa/net.c
index 706b0dacb63..35adb509fbd 100644
--- a/sys/lib/libsa/net.c
+++ b/sys/lib/libsa/net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net.c,v 1.10 1998/05/31 23:39:15 mickey Exp $	*/
+/*	$OpenBSD: net.c,v 1.11 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: net.c,v 1.14 1996/10/13 02:29:02 christos Exp $	*/
 
 /*
@@ -278,10 +278,10 @@ readudp(d, pkt, len, tleft)
 ssize_t
 sendrecv(d, sproc, sbuf, ssize, rproc, rbuf, rsize)
 	register struct iodesc *d;
-	register ssize_t (*sproc) __P((struct iodesc *, void *, size_t));
+	register ssize_t (*sproc)(struct iodesc *, void *, size_t);
 	register void *sbuf;
 	register size_t ssize;
-	register ssize_t (*rproc) __P((struct iodesc *, void *, size_t, time_t));
+	register ssize_t (*rproc)(struct iodesc *, void *, size_t, time_t);
 	register void *rbuf;
 	register size_t rsize;
 {
diff --git a/sys/lib/libsa/net.h b/sys/lib/libsa/net.h
index 7c71fa11ab7..f93b96a8417 100644
--- a/sys/lib/libsa/net.h
+++ b/sys/lib/libsa/net.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net.h,v 1.3 1996/09/23 14:18:58 mickey Exp $	*/
+/*	$OpenBSD: net.h,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: net.h,v 1.10 1995/10/20 00:46:30 cgd Exp $	*/
 
 /*
@@ -92,18 +92,18 @@ extern	int debug;			/* defined in the machdep sources */
 extern struct iodesc sockets[SOPEN_MAX];
 
 /* ARP/RevARP functions: */
-u_char	*arpwhohas __P((struct iodesc *, struct in_addr));
-void	arp_reply __P((struct iodesc *, void *));
-int	rarp_getipaddress __P((int));
+u_char	*arpwhohas(struct iodesc *, struct in_addr);
+void	arp_reply(struct iodesc *, void *);
+int	rarp_getipaddress(int);
 
 /* Link functions: */
-ssize_t sendether __P((struct iodesc *d, void *pkt, size_t len,
-			u_char *dea, int etype));
-ssize_t readether __P((struct iodesc *d, void *pkt, size_t len,
-			time_t tleft, u_int16_t *etype));
+ssize_t sendether(struct iodesc *d, void *pkt, size_t len,
+			u_char *dea, int etype);
+ssize_t readether(struct iodesc *d, void *pkt, size_t len,
+			time_t tleft, u_int16_t *etype);
 
-ssize_t	sendudp __P((struct iodesc *, void *, size_t));
-ssize_t	readudp __P((struct iodesc *, void *, size_t, time_t));
+ssize_t	sendudp(struct iodesc *, void *, size_t);
+ssize_t	readudp(struct iodesc *, void *, size_t, time_t);
 ssize_t	sendrecv __P((struct iodesc *,
 		      ssize_t (*)(struct iodesc *, void *, size_t),
 			void *, size_t,
@@ -111,11 +111,11 @@ ssize_t	sendrecv __P((struct iodesc *,
 			void *, size_t));
 
 /* Utilities: */
-char	*ether_sprintf __P((u_char *));
-int	in_cksum __P((void *, int));
-char	*inet_ntoa __P((struct in_addr));
-char	*intoa __P((n_long));		/* similar to inet_ntoa */
-n_long	inet_addr __P((char *));
+char	*ether_sprintf(u_char *);
+int	in_cksum(void *, int);
+char	*inet_ntoa(struct in_addr);
+char	*intoa(n_long);		/* similar to inet_ntoa */
+n_long	inet_addr(char *);
 
 /* Machine-dependent functions: */
-time_t	getsecs __P((void));
+time_t	getsecs(void);
diff --git a/sys/lib/libsa/netif.h b/sys/lib/libsa/netif.h
index eabc08de444..a9c87d47c36 100644
--- a/sys/lib/libsa/netif.h
+++ b/sys/lib/libsa/netif.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netif.h,v 1.3 1996/10/29 08:44:10 mickey Exp $	*/
+/*	$OpenBSD: netif.h,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: netif.h,v 1.4 1995/09/14 23:45:30 pk Exp $	*/
 
 #ifndef __SYS_LIBNETBOOT_NETIF_H
@@ -7,12 +7,12 @@
 
 struct netif_driver {
 	char	*netif_bname;
-	int	(*netif_match) __P((struct netif *, void *));
-	int	(*netif_probe) __P((struct netif *, void *));
-	void	(*netif_init) __P((struct iodesc *, void *));
-	int	(*netif_get) __P((struct iodesc *, void *, size_t, time_t));
-	int	(*netif_put) __P((struct iodesc *, void *, size_t));
-	void	(*netif_end) __P((struct netif *));
+	int	(*netif_match)(struct netif *, void *);
+	int	(*netif_probe)(struct netif *, void *);
+	void	(*netif_init)(struct iodesc *, void *);
+	int	(*netif_get)(struct iodesc *, void *, size_t, time_t);
+	int	(*netif_put)(struct iodesc *, void *, size_t);
+	void	(*netif_end)(struct netif *);
 	struct	netif_dif *netif_ifs;
 	int	netif_nifs;
 };
@@ -48,17 +48,17 @@ extern int			n_netif_drivers;
 
 extern int			netif_debug;
 
-void		netif_init __P((void));
-struct netif	*netif_select __P((void *));
-int		netif_probe __P((struct netif *, void *));
-void		netif_attach __P((struct netif *, struct iodesc *, void *));
-void		netif_detach __P((struct netif *));
-ssize_t		netif_get __P((struct iodesc *, void *, size_t, time_t));
-ssize_t		netif_put __P((struct iodesc *, void *, size_t));
+void		netif_init(void);
+struct netif	*netif_select(void *);
+int		netif_probe(struct netif *, void *);
+void		netif_attach(struct netif *, struct iodesc *, void *);
+void		netif_detach(struct netif *);
+ssize_t		netif_get(struct iodesc *, void *, size_t, time_t);
+ssize_t		netif_put(struct iodesc *, void *, size_t);
 
-int		netif_open __P((void *));
-int		netif_close __P((int));
+int		netif_open(void *);
+int		netif_close(int);
 
-struct iodesc	*socktodesc __P((int));
+struct iodesc	*socktodesc(int);
 	
 #endif /* __SYS_LIBNETBOOT_NETIF_H */
diff --git a/sys/lib/libsa/nfs.h b/sys/lib/libsa/nfs.h
index 53588045f24..06acd5fffed 100644
--- a/sys/lib/libsa/nfs.h
+++ b/sys/lib/libsa/nfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs.h,v 1.5 1996/12/08 15:15:53 niklas Exp $	*/
+/*	$OpenBSD: nfs.h,v 1.6 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: nfs.h,v 1.5 1996/07/10 18:32:33 cgd Exp $	*/
 
 /*-
@@ -34,13 +34,13 @@
  * SUCH DAMAGE.
  */
 
-int	nfs_open __P((char *path, struct open_file *f));
-int	nfs_close __P((struct open_file *f));
-int	nfs_read __P((struct open_file *f, void *buf,
-			size_t size, size_t *resid));
-int	nfs_write __P((struct open_file *f, void *buf,
-			size_t size, size_t *resid));
-off_t	nfs_seek __P((struct open_file *f, off_t offset, int where));
-int	nfs_stat __P((struct open_file *f, struct stat *sb));
-int	nfs_mount __P((int, struct in_addr, char *));
-int	nfs_readdir __P((struct open_file *f, char *name));
+int	nfs_open(char *path, struct open_file *f);
+int	nfs_close(struct open_file *f);
+int	nfs_read(struct open_file *f, void *buf,
+			size_t size, size_t *resid);
+int	nfs_write(struct open_file *f, void *buf,
+			size_t size, size_t *resid);
+off_t	nfs_seek(struct open_file *f, off_t offset, int where);
+int	nfs_stat(struct open_file *f, struct stat *sb);
+int	nfs_mount(int, struct in_addr, char *);
+int	nfs_readdir(struct open_file *f, char *name);
diff --git a/sys/lib/libsa/printf.c b/sys/lib/libsa/printf.c
index 3c9ab1aba8b..ce9a6a6070d 100644
--- a/sys/lib/libsa/printf.c
+++ b/sys/lib/libsa/printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printf.c,v 1.14 1999/08/16 09:21:38 downsj Exp $	*/
+/*	$OpenBSD: printf.c,v 1.15 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: printf.c,v 1.10 1996/11/30 04:19:21 gwr Exp $	*/
 
 /*-
@@ -73,7 +73,7 @@ static void kprintn __P((void (*)(int), u_long, int));
 static void kdoprnt __P((void (*)(int), const char *, va_list));
 
 #ifndef	STRIPPED
-static void sputchar __P((int));
+static void sputchar(int);
 static char *sbuf;
 
 static void
@@ -132,7 +132,7 @@ vprintf(const char *fmt, va_list ap)
 
 static void
 kdoprnt(put, fmt, ap)
-	void (*put)__P((int));
+	void (*put)(int);
 	const char *fmt;
 	va_list ap;
 {
@@ -226,7 +226,7 @@ reswitch:	switch (ch = *fmt++) {
 
 static void
 kprintn(put, ul, base)
-	void (*put)__P((int));
+	void (*put)(int);
 	unsigned long ul;
 	int base;
 {
diff --git a/sys/lib/libsa/rarp.c b/sys/lib/libsa/rarp.c
index 0f24ebbfbed..7113d2cb183 100644
--- a/sys/lib/libsa/rarp.c
+++ b/sys/lib/libsa/rarp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarp.c,v 1.6 1998/02/23 20:32:28 niklas Exp $	*/
+/*	$OpenBSD: rarp.c,v 1.7 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: rarp.c,v 1.13 1996/10/13 02:29:05 christos Exp $	*/
 
 /*
@@ -51,8 +51,8 @@
 #include "net.h"
 #include "netif.h"
 
-static ssize_t rarpsend __P((struct iodesc *, void *, size_t));
-static ssize_t rarprecv __P((struct iodesc *, void *, size_t, time_t));
+static ssize_t rarpsend(struct iodesc *, void *, size_t);
+static ssize_t rarprecv(struct iodesc *, void *, size_t, time_t);
 
 /*
  * Ethernet (Reverse) Address Resolution Protocol (see RFC 903, and 826).
diff --git a/sys/lib/libsa/rpc.c b/sys/lib/libsa/rpc.c
index 18af4b156d0..8fa05ae902c 100644
--- a/sys/lib/libsa/rpc.c
+++ b/sys/lib/libsa/rpc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc.c,v 1.10 1998/02/23 20:32:30 niklas Exp $	*/
+/*	$OpenBSD: rpc.c,v 1.11 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: rpc.c,v 1.16 1996/10/13 02:29:06 christos Exp $	*/
 
 /*
@@ -97,8 +97,8 @@ struct rpc_reply {
 };
 
 /* Local forwards */
-static	ssize_t recvrpc __P((struct iodesc *, void *, size_t, time_t));
-static	int rpc_getport __P((struct iodesc *, n_long, n_long));
+static	ssize_t recvrpc(struct iodesc *, void *, size_t, time_t);
+static	int rpc_getport(struct iodesc *, n_long, n_long);
 
 int rpc_xid;
 int rpc_port = 0x400;	/* predecrement */
diff --git a/sys/lib/libsa/rpc.h b/sys/lib/libsa/rpc.h
index 70f57aa43c9..e16d654d8a6 100644
--- a/sys/lib/libsa/rpc.h
+++ b/sys/lib/libsa/rpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc.h,v 1.3 1996/12/08 15:15:56 niklas Exp $	*/
+/*	$OpenBSD: rpc.h,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: rpc.h,v 1.8 1996/09/26 23:22:03 cgd Exp $	*/
 
 /*
@@ -50,11 +50,11 @@
 #define	PMAPPROC_CALLIT		5
 
 /* RPC functions: */
-ssize_t	rpc_call __P((struct iodesc *, n_long, n_long, n_long,
-		     void *, size_t, void *, size_t));
-void	rpc_fromaddr __P((void *, struct in_addr *, u_short *));
-int	rpc_pmap_getcache __P((struct in_addr, u_int, u_int));
-void	rpc_pmap_putcache __P((struct in_addr, u_int, u_int, int));
+ssize_t	rpc_call(struct iodesc *, n_long, n_long, n_long,
+		     void *, size_t, void *, size_t);
+void	rpc_fromaddr(void *, struct in_addr *, u_short *);
+int	rpc_pmap_getcache(struct in_addr, u_int, u_int);
+void	rpc_pmap_putcache(struct in_addr, u_int, u_int, int);
 
 extern int rpc_port;	/* decrement before bind */
 
diff --git a/sys/lib/libsa/saerrno.h b/sys/lib/libsa/saerrno.h
index ef1dfe6ce79..c861542a05f 100644
--- a/sys/lib/libsa/saerrno.h
+++ b/sys/lib/libsa/saerrno.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: saerrno.h,v 1.4 1996/10/29 08:00:58 mickey Exp $	*/
+/*	$OpenBSD: saerrno.h,v 1.5 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: saerrno.h,v 1.6 1995/09/18 21:19:45 pk Exp $	*/
 
 /*
@@ -55,4 +55,4 @@ extern int errno;
 #define	EHER	(ELAST+12)	/* hard error */
 #define	ESALAST	(ELAST+12)	/* */
 
-char	*strerror __P((int err));
+char	*strerror(int err);
diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h
index efe7921eb85..bcef6c26974 100644
--- a/sys/lib/libsa/stand.h
+++ b/sys/lib/libsa/stand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stand.h,v 1.36 2002/03/02 09:31:45 miod Exp $	*/
+/*	$OpenBSD: stand.h,v 1.37 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $	*/
 
 /*-
@@ -68,15 +68,15 @@ struct open_file;
  * independent way.
  */
 struct fs_ops {
-	int	(*open) __P((char *path, struct open_file *f));
-	int	(*close) __P((struct open_file *f));
-	int	(*read) __P((struct open_file *f, void *buf,
-			     size_t size, size_t *resid));
-	int	(*write) __P((struct open_file *f, void *buf,
-			     size_t size, size_t *resid));
-	off_t	(*seek) __P((struct open_file *f, off_t offset, int where));
-	int	(*stat) __P((struct open_file *f, struct stat *sb));
-	int	(*readdir) __P((struct open_file *f, char *));
+	int	(*open)(char *path, struct open_file *f);
+	int	(*close)(struct open_file *f);
+	int	(*read)(struct open_file *f, void *buf,
+			     size_t size, size_t *resid);
+	int	(*write)(struct open_file *f, void *buf,
+			     size_t size, size_t *resid);
+	off_t	(*seek)(struct open_file *f, off_t offset, int where);
+	int	(*stat)(struct open_file *f, struct stat *sb);
+	int	(*readdir)(struct open_file *f, char *);
 };
 
 extern struct fs_ops file_system[];
@@ -90,12 +90,12 @@ extern int nfsys;
 /* Device switch */
 struct devsw {
 	char	*dv_name;
-	int	(*dv_strategy) __P((void *devdata, int rw,
+	int	(*dv_strategy)(void *devdata, int rw,
 				    daddr_t blk, size_t size,
-				    void *buf, size_t *rsize));
-	int	(*dv_open) __P((struct open_file *f, ...));
-	int	(*dv_close) __P((struct open_file *f));
-	int	(*dv_ioctl) __P((struct open_file *f, u_long cmd, void *data));
+				    void *buf, size_t *rsize);
+	int	(*dv_open)(struct open_file *f, ...);
+	int	(*dv_close)(struct open_file *f);
+	int	(*dv_ioctl)(struct open_file *f, u_long cmd, void *data);
 };
 
 extern struct devsw devsw[];	/* device array */
@@ -135,82 +135,82 @@ extern struct open_file files[];
 	h = ((b) % ((nh) * (ns))) / (ns);	\
 	s = ((b) % ((nh) * (ns))) % (ns);
 
-void	*alloc __P((u_int));
-void	*alloca __P((size_t));
-void	free __P((void *, u_int));
+void	*alloc(u_int);
+void	*alloca(size_t);
+void	free(void *, u_int);
 struct	disklabel;
-char	*getdisklabel __P((const char *, struct disklabel *));
-u_int	dkcksum __P((struct disklabel *));
-
-void	printf __P((const char *, ...));
-void	sprintf __P((char *, const char *, ...));
-void	vprintf __P((const char *, _BSD_VA_LIST_));
-void	twiddle __P((void));
-void	gets __P((char *));
-__dead void	panic __P((const char *, ...)) __attribute__((noreturn));
-__dead void	_rtt __P((void)) __attribute__((noreturn));
+char	*getdisklabel(const char *, struct disklabel *);
+u_int	dkcksum(struct disklabel *);
+
+void	printf(const char *, ...);
+void	sprintf(char *, const char *, ...);
+void	vprintf(const char *, _BSD_VA_LIST_);
+void	twiddle(void);
+void	gets(char *);
+__dead void	panic(const char *, ...) __attribute__((noreturn));
+__dead void	_rtt(void) __attribute__((noreturn));
 #define	bzero(s,n)	((void)memset((s),0,(n)))
 #define bcmp(s1,s2,n)	(memcmp((s2),(s1),(n)))
 #define	bcopy(s1,s2,n)	((void)memcpy((s2),(s1),(n)))
-void	*memcpy __P((void *, const void *, size_t));
-int	memcmp __P((const void *, const void*, size_t));
-char	*strncpy __P((char *, const char *, size_t));
-char	*strcpy __P((char *, const char *));
-int	strncmp __P((const char *, const char *, size_t));
-int	strcmp __P((const char *, const char *));
-size_t	strlen __P((const char *));
-long	strtol __P((const char *, char **, int));
-char	*strchr __P((const char *, int));
-void	*memset __P((void *, int, size_t));
-void	exec __P((char *, void *, int));
-void	exit __P((void));
-int	open __P((const char *, int));
-int	close __P((int));
-void	closeall __P((void));
-ssize_t	read __P((int, void *, size_t));
-ssize_t	write __P((int, void *, size_t));
-int	stat __P((const char *path, struct stat *sb));
-int	fstat __P((int fd, struct stat *sb));
-int	opendir __P((char *));
-int	readdir __P((int, char *));
-void	closedir __P((int));
-int	nodev __P((void));
-int	noioctl __P((struct open_file *, u_long, void *));
-void	nullsys __P((void));
-
-int	null_open __P((char *path, struct open_file *f));
-int	null_close __P((struct open_file *f));
-ssize_t	null_read __P((struct open_file *f, void *buf,
-			size_t size, size_t *resid));
-ssize_t	null_write __P((struct open_file *f, void *buf,
-			size_t size, size_t *resid));
-off_t	null_seek __P((struct open_file *f, off_t offset, int where));
-int	null_stat __P((struct open_file *f, struct stat *sb));
-int	null_readdir __P((struct open_file *f, char *name));
-char	*ttyname __P((int)); /* match userland decl, but ignore !0 */
-dev_t	ttydev __P((char *));
-void	cninit __P((void));
-int	cnset __P((dev_t));
-void	cnputc __P((int));
-int	cngetc __P((void));
-int	cnischar __P((void));
-int	cnspeed __P((dev_t, int));
-u_int	sleep __P((u_int));
-void	usleep __P((u_int));
-char *ctime __P((const time_t *));
-
-void	putchar __P((int));    
-int	getchar __P((void));
+void	*memcpy(void *, const void *, size_t);
+int	memcmp(const void *, const void*, size_t);
+char	*strncpy(char *, const char *, size_t);
+char	*strcpy(char *, const char *);
+int	strncmp(const char *, const char *, size_t);
+int	strcmp(const char *, const char *);
+size_t	strlen(const char *);
+long	strtol(const char *, char **, int);
+char	*strchr(const char *, int);
+void	*memset(void *, int, size_t);
+void	exec(char *, void *, int);
+void	exit(void);
+int	open(const char *, int);
+int	close(int);
+void	closeall(void);
+ssize_t	read(int, void *, size_t);
+ssize_t	write(int, void *, size_t);
+int	stat(const char *path, struct stat *sb);
+int	fstat(int fd, struct stat *sb);
+int	opendir(char *);
+int	readdir(int, char *);
+void	closedir(int);
+int	nodev(void);
+int	noioctl(struct open_file *, u_long, void *);
+void	nullsys(void);
+
+int	null_open(char *path, struct open_file *f);
+int	null_close(struct open_file *f);
+ssize_t	null_read(struct open_file *f, void *buf,
+			size_t size, size_t *resid);
+ssize_t	null_write(struct open_file *f, void *buf,
+			size_t size, size_t *resid);
+off_t	null_seek(struct open_file *f, off_t offset, int where);
+int	null_stat(struct open_file *f, struct stat *sb);
+int	null_readdir(struct open_file *f, char *name);
+char	*ttyname(int); /* match userland decl, but ignore !0 */
+dev_t	ttydev(char *);
+void	cninit(void);
+int	cnset(dev_t);
+void	cnputc(int);
+int	cngetc(void);
+int	cnischar(void);
+int	cnspeed(dev_t, int);
+u_int	sleep(u_int);
+void	usleep(u_int);
+char *ctime(const time_t *);
+
+void	putchar(int);    
+int	getchar(void);
 
 #ifdef __INTERNAL_LIBSA_CREAD
-int	oopen __P((const char *, int));
-int	oclose __P((int));
-ssize_t	oread __P((int, void *, size_t));
-off_t	olseek __P((int, off_t, int));
+int	oopen(const char *, int);
+int	oclose(int);
+ssize_t	oread(int, void *, size_t);
+off_t	olseek(int, off_t, int);
 #endif
 
 /* Machine dependent functions */
-int	devopen __P((struct open_file *, const char *, char **));
-void	machdep_start __P((char *, int, char *, char *, char *));
-time_t	getsecs __P((void));
+int	devopen(struct open_file *, const char *, char **);
+void	machdep_start(char *, int, char *, char *, char *);
+time_t	getsecs(void);
 
diff --git a/sys/lib/libsa/ufs.c b/sys/lib/libsa/ufs.c
index 465c2d73ef5..9ac3a3092ca 100644
--- a/sys/lib/libsa/ufs.c
+++ b/sys/lib/libsa/ufs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs.c,v 1.12 1998/02/23 20:32:31 niklas Exp $	*/
+/*	$OpenBSD: ufs.c,v 1.13 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: ufs.c,v 1.16 1996/09/30 16:01:22 ws Exp $	*/
 
 /*-
@@ -97,12 +97,12 @@ struct file {
 	daddr_t		f_buf_blkno;	/* block number of data block */
 };
 
-static int	read_inode __P((ino_t, struct open_file *));
-static int	block_map __P((struct open_file *, daddr_t, daddr_t *));
-static int	buf_read_file __P((struct open_file *, char **, size_t *));
-static int	search_directory __P((char *, struct open_file *, ino_t *));
+static int	read_inode(ino_t, struct open_file *);
+static int	block_map(struct open_file *, daddr_t, daddr_t *);
+static int	buf_read_file(struct open_file *, char **, size_t *);
+static int	search_directory(char *, struct open_file *, ino_t *);
 #ifdef COMPAT_UFS
-static void	ffs_oldfscompat __P((struct fs *));
+static void	ffs_oldfscompat(struct fs *);
 #endif
 
 /*
diff --git a/sys/lib/libsa/ufs.h b/sys/lib/libsa/ufs.h
index d3e40e98ac8..411183eb159 100644
--- a/sys/lib/libsa/ufs.h
+++ b/sys/lib/libsa/ufs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs.h,v 1.4 1996/10/29 08:08:51 mickey Exp $	*/
+/*	$OpenBSD: ufs.h,v 1.5 2002/03/14 01:27:07 millert Exp $	*/
 /*	$NetBSD: ufs.h,v 1.5 1995/10/20 01:35:25 cgd Exp $	*/
 
 /*-
@@ -36,13 +36,13 @@
  *	@(#)ufs.h	8.1 (Berkeley) 6/11/93
  */
 
-int	ufs_open __P((char *path, struct open_file *f));
-int	ufs_close __P((struct open_file *f));
-int	ufs_read __P((struct open_file *f, void *buf,
-		size_t size, size_t *resid));
-int	ufs_write __P((struct open_file *f, void *buf,
-		size_t size, size_t *resid));
-off_t	ufs_seek __P((struct open_file *f, off_t offset, int where));
-int	ufs_stat __P((struct open_file *f, struct stat *sb));
-int	ufs_readdir __P((struct open_file *f, char *name));
+int	ufs_open(char *path, struct open_file *f);
+int	ufs_close(struct open_file *f);
+int	ufs_read(struct open_file *f, void *buf,
+		size_t size, size_t *resid);
+int	ufs_write(struct open_file *f, void *buf,
+		size_t size, size_t *resid);
+off_t	ufs_seek(struct open_file *f, off_t offset, int where);
+int	ufs_stat(struct open_file *f, struct stat *sb);
+int	ufs_readdir(struct open_file *f, char *name);
 
diff --git a/sys/lib/libsa/unixdev.h b/sys/lib/libsa/unixdev.h
index a113ae63854..126cccd336b 100644
--- a/sys/lib/libsa/unixdev.h
+++ b/sys/lib/libsa/unixdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unixdev.h,v 1.3 1998/05/25 18:37:31 mickey Exp $	*/
+/*	$OpenBSD: unixdev.h,v 1.4 2002/03/14 01:27:07 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -34,24 +34,24 @@
 
 
 /* unixdev.c */
-int unixstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-int unixopen __P((struct open_file *, ...));
-int unixclose __P((struct open_file *));
-int unixioctl __P((struct open_file *, u_long, void *));
+int unixstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int unixopen(struct open_file *, ...);
+int unixclose(struct open_file *);
+int unixioctl(struct open_file *, u_long, void *);
 
-void unix_probe __P((struct consdev *));
-void unix_init __P((struct consdev *));
-int unix_getc __P((dev_t));
-void unix_putc __P((dev_t, int));
-int unix_ischar __P((dev_t));
+void unix_probe(struct consdev *);
+void unix_init(struct consdev *);
+int unix_getc(dev_t);
+void unix_putc(dev_t, int);
+int unix_ischar(dev_t);
 
 /* unixsys.S */
-int uopen __P((const char *, int, ...));
-int uread __P((int, void *, size_t));
-int uwrite __P((int, void *, size_t));
-int uioctl __P((int, u_long, char *));
-int uclose __P((int));
-off_t ulseek __P((int, off_t, int));
-void uexit __P((int)) __attribute__((noreturn));
-int syscall __P((int, ...));
-int __syscall __P((quad_t, ...));
+int uopen(const char *, int, ...);
+int uread(int, void *, size_t);
+int uwrite(int, void *, size_t);
+int uioctl(int, u_long, char *);
+int uclose(int);
+off_t ulseek(int, off_t, int);
+void uexit(int) __attribute__((noreturn));
+int syscall(int, ...);
+int __syscall(quad_t, ...);