Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

author: millert <millert@openbsd.org> 2002-02-16 21:27:05 +0000
committer: millert <millert@openbsd.org> 2002-02-16 21:27:05 +0000
commit: c72b5b24e14c03dd8b22104fbae0d3921fa2aa37 (patch)
tree: 1ac67aab11df5f96856c0e3015d691db7dc9e811 /lib/libc
parent: default to rsa keyfile path for non key generation operations where (diff)
download: wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.tar.xz
wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.zip
110 files changed, 648 insertions, 648 deletions
diff --git a/lib/libc/arch/m88k/gen/modf.c b/lib/libc/arch/m88k/gen/modf.c
index 08eaff90473..f896fe392ed 100644
--- a/lib/libc/arch/m88k/gen/modf.c
+++ b/lib/libc/arch/m88k/gen/modf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: modf.c,v 1.2 2000/03/01 17:31:20 todd Exp $	*/
+/*	$OpenBSD: modf.c,v 1.3 2002/02/16 21:27:21 millert Exp $	*/
 /* @(#)s_modf.c 5.1 93/09/24 */
 /*
  * ====================================================
@@ -12,7 +12,7 @@
  */
 
 #if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: modf.c,v 1.2 2000/03/01 17:31:20 todd Exp $";
+static char rcsid[] = "$OpenBSD: modf.c,v 1.3 2002/02/16 21:27:21 millert Exp $";
 #endif
 
 /*
@@ -181,76 +181,76 @@ do {								\
 } while (0)
 
 /* ieee style elementary functions */
-extern double __ieee754_sqrt __P((double));			
-extern double __ieee754_acos __P((double));			
-extern double __ieee754_acosh __P((double));			
-extern double __ieee754_log __P((double));			
-extern double __ieee754_atanh __P((double));			
-extern double __ieee754_asin __P((double));			
-extern double __ieee754_atan2 __P((double,double));			
-extern double __ieee754_exp __P((double));
-extern double __ieee754_cosh __P((double));
-extern double __ieee754_fmod __P((double,double));
-extern double __ieee754_pow __P((double,double));
-extern double __ieee754_lgamma_r __P((double,int *));
-extern double __ieee754_gamma_r __P((double,int *));
-extern double __ieee754_lgamma __P((double));
-extern double __ieee754_gamma __P((double));
-extern double __ieee754_log10 __P((double));
-extern double __ieee754_sinh __P((double));
-extern double __ieee754_hypot __P((double,double));
-extern double __ieee754_j0 __P((double));
-extern double __ieee754_j1 __P((double));
-extern double __ieee754_y0 __P((double));
-extern double __ieee754_y1 __P((double));
-extern double __ieee754_jn __P((int,double));
-extern double __ieee754_yn __P((int,double));
-extern double __ieee754_remainder __P((double,double));
-extern int    __ieee754_rem_pio2 __P((double,double*));
-extern double __ieee754_scalb __P((double,double));
+extern double __ieee754_sqrt(double);			
+extern double __ieee754_acos(double);			
+extern double __ieee754_acosh(double);			
+extern double __ieee754_log(double);			
+extern double __ieee754_atanh(double);			
+extern double __ieee754_asin(double);			
+extern double __ieee754_atan2(double,double);			
+extern double __ieee754_exp(double);
+extern double __ieee754_cosh(double);
+extern double __ieee754_fmod(double,double);
+extern double __ieee754_pow(double,double);
+extern double __ieee754_lgamma_r(double,int *);
+extern double __ieee754_gamma_r(double,int *);
+extern double __ieee754_lgamma(double);
+extern double __ieee754_gamma(double);
+extern double __ieee754_log10(double);
+extern double __ieee754_sinh(double);
+extern double __ieee754_hypot(double,double);
+extern double __ieee754_j0(double);
+extern double __ieee754_j1(double);
+extern double __ieee754_y0(double);
+extern double __ieee754_y1(double);
+extern double __ieee754_jn(int,double);
+extern double __ieee754_yn(int,double);
+extern double __ieee754_remainder(double,double);
+extern int    __ieee754_rem_pio2(double,double*);
+extern double __ieee754_scalb(double,double);
 
 /* fdlibm kernel function */
-extern double __kernel_standard __P((double,double,int));	
-extern double __kernel_sin __P((double,double,int));
-extern double __kernel_cos __P((double,double));
-extern double __kernel_tan __P((double,double,int));
-extern int    __kernel_rem_pio2 __P((double*,double*,int,int,int,const int*));
+extern double __kernel_standard(double,double,int);	
+extern double __kernel_sin(double,double,int);
+extern double __kernel_cos(double,double);
+extern double __kernel_tan(double,double,int);
+extern int    __kernel_rem_pio2(double*,double*,int,int,int,const int*);
 
 
 /* ieee style elementary float functions */
-extern float __ieee754_sqrtf __P((float));			
-extern float __ieee754_acosf __P((float));			
-extern float __ieee754_acoshf __P((float));			
-extern float __ieee754_logf __P((float));			
-extern float __ieee754_atanhf __P((float));			
-extern float __ieee754_asinf __P((float));			
-extern float __ieee754_atan2f __P((float,float));			
-extern float __ieee754_expf __P((float));
-extern float __ieee754_coshf __P((float));
-extern float __ieee754_fmodf __P((float,float));
-extern float __ieee754_powf __P((float,float));
-extern float __ieee754_lgammaf_r __P((float,int *));
-extern float __ieee754_gammaf_r __P((float,int *));
-extern float __ieee754_lgammaf __P((float));
-extern float __ieee754_gammaf __P((float));
-extern float __ieee754_log10f __P((float));
-extern float __ieee754_sinhf __P((float));
-extern float __ieee754_hypotf __P((float,float));
-extern float __ieee754_j0f __P((float));
-extern float __ieee754_j1f __P((float));
-extern float __ieee754_y0f __P((float));
-extern float __ieee754_y1f __P((float));
-extern float __ieee754_jnf __P((int,float));
-extern float __ieee754_ynf __P((int,float));
-extern float __ieee754_remainderf __P((float,float));
-extern int   __ieee754_rem_pio2f __P((float,float*));
-extern float __ieee754_scalbf __P((float,float));
+extern float __ieee754_sqrtf(float);			
+extern float __ieee754_acosf(float);			
+extern float __ieee754_acoshf(float);			
+extern float __ieee754_logf(float);			
+extern float __ieee754_atanhf(float);			
+extern float __ieee754_asinf(float);			
+extern float __ieee754_atan2f(float,float);			
+extern float __ieee754_expf(float);
+extern float __ieee754_coshf(float);
+extern float __ieee754_fmodf(float,float);
+extern float __ieee754_powf(float,float);
+extern float __ieee754_lgammaf_r(float,int *);
+extern float __ieee754_gammaf_r(float,int *);
+extern float __ieee754_lgammaf(float);
+extern float __ieee754_gammaf(float);
+extern float __ieee754_log10f(float);
+extern float __ieee754_sinhf(float);
+extern float __ieee754_hypotf(float,float);
+extern float __ieee754_j0f(float);
+extern float __ieee754_j1f(float);
+extern float __ieee754_y0f(float);
+extern float __ieee754_y1f(float);
+extern float __ieee754_jnf(int,float);
+extern float __ieee754_ynf(int,float);
+extern float __ieee754_remainderf(float,float);
+extern int   __ieee754_rem_pio2f(float,float*);
+extern float __ieee754_scalbf(float,float);
 
 /* float versions of fdlibm kernel functions */
-extern float __kernel_sinf __P((float,float,int));
-extern float __kernel_cosf __P((float,float));
-extern float __kernel_tanf __P((float,float,int));
-extern int   __kernel_rem_pio2f __P((float*,float*,int,int,int,const int*));
+extern float __kernel_sinf(float,float,int);
+extern float __kernel_cosf(float,float);
+extern float __kernel_tanf(float,float,int);
+extern int   __kernel_rem_pio2f(float*,float*,int,int,int,const int*);
 
 #endif /* _MATH_PRIVATE_H_ */
 #ifdef __STDC__
diff --git a/lib/libc/arch/powerpc/gen/modf.c b/lib/libc/arch/powerpc/gen/modf.c
index 9e9765e7253..73cf1bc85b8 100644
--- a/lib/libc/arch/powerpc/gen/modf.c
+++ b/lib/libc/arch/powerpc/gen/modf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: modf.c,v 1.4 2000/03/01 17:31:23 todd Exp $	*/
+/*	$OpenBSD: modf.c,v 1.5 2002/02/16 21:27:21 millert Exp $	*/
 /* @(#)s_modf.c 5.1 93/09/24 */
 /*
  * ====================================================
@@ -12,7 +12,7 @@
  */
 
 #if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: modf.c,v 1.4 2000/03/01 17:31:23 todd Exp $";
+static char rcsid[] = "$OpenBSD: modf.c,v 1.5 2002/02/16 21:27:21 millert Exp $";
 #endif
 
 /*
@@ -181,76 +181,76 @@ do {								\
 } while (0)
 
 /* ieee style elementary functions */
-extern double __ieee754_sqrt __P((double));			
-extern double __ieee754_acos __P((double));			
-extern double __ieee754_acosh __P((double));			
-extern double __ieee754_log __P((double));			
-extern double __ieee754_atanh __P((double));			
-extern double __ieee754_asin __P((double));			
-extern double __ieee754_atan2 __P((double,double));			
-extern double __ieee754_exp __P((double));
-extern double __ieee754_cosh __P((double));
-extern double __ieee754_fmod __P((double,double));
-extern double __ieee754_pow __P((double,double));
-extern double __ieee754_lgamma_r __P((double,int *));
-extern double __ieee754_gamma_r __P((double,int *));
-extern double __ieee754_lgamma __P((double));
-extern double __ieee754_gamma __P((double));
-extern double __ieee754_log10 __P((double));
-extern double __ieee754_sinh __P((double));
-extern double __ieee754_hypot __P((double,double));
-extern double __ieee754_j0 __P((double));
-extern double __ieee754_j1 __P((double));
-extern double __ieee754_y0 __P((double));
-extern double __ieee754_y1 __P((double));
-extern double __ieee754_jn __P((int,double));
-extern double __ieee754_yn __P((int,double));
-extern double __ieee754_remainder __P((double,double));
-extern int    __ieee754_rem_pio2 __P((double,double*));
-extern double __ieee754_scalb __P((double,double));
+extern double __ieee754_sqrt(double);			
+extern double __ieee754_acos(double);			
+extern double __ieee754_acosh(double);			
+extern double __ieee754_log(double);			
+extern double __ieee754_atanh(double);			
+extern double __ieee754_asin(double);			
+extern double __ieee754_atan2(double,double);			
+extern double __ieee754_exp(double);
+extern double __ieee754_cosh(double);
+extern double __ieee754_fmod(double,double);
+extern double __ieee754_pow(double,double);
+extern double __ieee754_lgamma_r(double,int *);
+extern double __ieee754_gamma_r(double,int *);
+extern double __ieee754_lgamma(double);
+extern double __ieee754_gamma(double);
+extern double __ieee754_log10(double);
+extern double __ieee754_sinh(double);
+extern double __ieee754_hypot(double,double);
+extern double __ieee754_j0(double);
+extern double __ieee754_j1(double);
+extern double __ieee754_y0(double);
+extern double __ieee754_y1(double);
+extern double __ieee754_jn(int,double);
+extern double __ieee754_yn(int,double);
+extern double __ieee754_remainder(double,double);
+extern int    __ieee754_rem_pio2(double,double*);
+extern double __ieee754_scalb(double,double);
 
 /* fdlibm kernel function */
-extern double __kernel_standard __P((double,double,int));	
-extern double __kernel_sin __P((double,double,int));
-extern double __kernel_cos __P((double,double));
-extern double __kernel_tan __P((double,double,int));
-extern int    __kernel_rem_pio2 __P((double*,double*,int,int,int,const int*));
+extern double __kernel_standard(double,double,int);	
+extern double __kernel_sin(double,double,int);
+extern double __kernel_cos(double,double);
+extern double __kernel_tan(double,double,int);
+extern int    __kernel_rem_pio2(double*,double*,int,int,int,const int*);
 
 
 /* ieee style elementary float functions */
-extern float __ieee754_sqrtf __P((float));			
-extern float __ieee754_acosf __P((float));			
-extern float __ieee754_acoshf __P((float));			
-extern float __ieee754_logf __P((float));			
-extern float __ieee754_atanhf __P((float));			
-extern float __ieee754_asinf __P((float));			
-extern float __ieee754_atan2f __P((float,float));			
-extern float __ieee754_expf __P((float));
-extern float __ieee754_coshf __P((float));
-extern float __ieee754_fmodf __P((float,float));
-extern float __ieee754_powf __P((float,float));
-extern float __ieee754_lgammaf_r __P((float,int *));
-extern float __ieee754_gammaf_r __P((float,int *));
-extern float __ieee754_lgammaf __P((float));
-extern float __ieee754_gammaf __P((float));
-extern float __ieee754_log10f __P((float));
-extern float __ieee754_sinhf __P((float));
-extern float __ieee754_hypotf __P((float,float));
-extern float __ieee754_j0f __P((float));
-extern float __ieee754_j1f __P((float));
-extern float __ieee754_y0f __P((float));
-extern float __ieee754_y1f __P((float));
-extern float __ieee754_jnf __P((int,float));
-extern float __ieee754_ynf __P((int,float));
-extern float __ieee754_remainderf __P((float,float));
-extern int   __ieee754_rem_pio2f __P((float,float*));
-extern float __ieee754_scalbf __P((float,float));
+extern float __ieee754_sqrtf(float);			
+extern float __ieee754_acosf(float);			
+extern float __ieee754_acoshf(float);			
+extern float __ieee754_logf(float);			
+extern float __ieee754_atanhf(float);			
+extern float __ieee754_asinf(float);			
+extern float __ieee754_atan2f(float,float);			
+extern float __ieee754_expf(float);
+extern float __ieee754_coshf(float);
+extern float __ieee754_fmodf(float,float);
+extern float __ieee754_powf(float,float);
+extern float __ieee754_lgammaf_r(float,int *);
+extern float __ieee754_gammaf_r(float,int *);
+extern float __ieee754_lgammaf(float);
+extern float __ieee754_gammaf(float);
+extern float __ieee754_log10f(float);
+extern float __ieee754_sinhf(float);
+extern float __ieee754_hypotf(float,float);
+extern float __ieee754_j0f(float);
+extern float __ieee754_j1f(float);
+extern float __ieee754_y0f(float);
+extern float __ieee754_y1f(float);
+extern float __ieee754_jnf(int,float);
+extern float __ieee754_ynf(int,float);
+extern float __ieee754_remainderf(float,float);
+extern int   __ieee754_rem_pio2f(float,float*);
+extern float __ieee754_scalbf(float,float);
 
 /* float versions of fdlibm kernel functions */
-extern float __kernel_sinf __P((float,float,int));
-extern float __kernel_cosf __P((float,float));
-extern float __kernel_tanf __P((float,float,int));
-extern int   __kernel_rem_pio2f __P((float*,float*,int,int,int,const int*));
+extern float __kernel_sinf(float,float,int);
+extern float __kernel_cosf(float,float);
+extern float __kernel_tanf(float,float,int);
+extern int   __kernel_rem_pio2f(float*,float*,int,int,int,const int*);
 
 #endif /* _MATH_PRIVATE_H_ */
 #ifdef __STDC__
diff --git a/lib/libc/compat-43/setregid.c b/lib/libc/compat-43/setregid.c
index 66ffe347b1d..ee25b1ac0b3 100644
--- a/lib/libc/compat-43/setregid.c
+++ b/lib/libc/compat-43/setregid.c
@@ -32,13 +32,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setregid.c,v 1.3 1997/01/19 22:32:14 graichen Exp $";
+static char *rcsid = "$OpenBSD: setregid.c,v 1.4 2002/02/16 21:27:21 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <unistd.h>
 
-extern int __setregid __P((gid_t, gid_t));
+extern int __setregid(gid_t, gid_t);
 
 #ifndef NO_WARN_REFERENCES
 __warn_references(setregid, "warning: this program uses setregid(), which is deprecated.");
diff --git a/lib/libc/compat-43/setreuid.c b/lib/libc/compat-43/setreuid.c
index 5cd28bb6406..7b48b2b0d15 100644
--- a/lib/libc/compat-43/setreuid.c
+++ b/lib/libc/compat-43/setreuid.c
@@ -32,13 +32,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setreuid.c,v 1.4 1997/01/20 07:46:51 graichen Exp $";
+static char *rcsid = "$OpenBSD: setreuid.c,v 1.5 2002/02/16 21:27:21 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <unistd.h>
 
-extern int __setreuid __P((uid_t, uid_t));
+extern int __setreuid(uid_t, uid_t);
 
 __warn_references(setreuid, "warning: this program uses setreuid(), which is deprecated.");
 
diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c
index 0cd59fd4be5..20540d0affa 100644
--- a/lib/libc/compat-43/setrgid.c
+++ b/lib/libc/compat-43/setrgid.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setrgid.c,v 1.6 1997/01/20 07:46:52 graichen Exp $";
+static char *rcsid = "$OpenBSD: setrgid.c,v 1.7 2002/02/16 21:27:21 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -40,7 +40,7 @@ static char *rcsid = "$OpenBSD: setrgid.c,v 1.6 1997/01/20 07:46:52 graichen Exp
 
 __warn_references(setrgid, "warning: this program uses setrgid(), which is deprecated.");
 
-extern int __setregid __P((gid_t, gid_t));
+extern int __setregid(gid_t, gid_t);
 
 int
 #ifdef __STDC__
diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c
index 615e03ef8a7..b4b85cf7267 100644
--- a/lib/libc/compat-43/setruid.c
+++ b/lib/libc/compat-43/setruid.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: setruid.c,v 1.6 1997/01/20 07:46:52 graichen Exp $";
+static char *rcsid = "$OpenBSD: setruid.c,v 1.7 2002/02/16 21:27:21 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -40,7 +40,7 @@ static char *rcsid = "$OpenBSD: setruid.c,v 1.6 1997/01/20 07:46:52 graichen Exp
 
 __warn_references(setruid, "warning: this program uses setruid(), which is deprecated.");
 
-extern int __setreuid __P((uid_t, uid_t));
+extern int __setreuid(uid_t, uid_t);
 
 int
 #ifdef __STDC__
diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c
index be049baa74c..f3ea849f006 100644
--- a/lib/libc/crypt/bcrypt.c
+++ b/lib/libc/crypt/bcrypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcrypt.c,v 1.14 2001/01/04 21:45:30 todd Exp $	*/
+/*	$OpenBSD: bcrypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $	*/
 
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -66,11 +66,11 @@
 #define BCRYPT_BLOCKS 6		/* Ciphertext blocks */
 #define BCRYPT_MINROUNDS 16	/* we have log2(rounds) in salt */
 
-char   *bcrypt_gensalt __P((u_int8_t));
+char   *bcrypt_gensalt(u_int8_t);
 
-static void encode_salt __P((char *, u_int8_t *, u_int16_t, u_int8_t));
-static void encode_base64 __P((u_int8_t *, u_int8_t *, u_int16_t));
-static void decode_base64 __P((u_int8_t *, u_int16_t, u_int8_t *));
+static void encode_salt(char *, u_int8_t *, u_int16_t, u_int8_t);
+static void encode_base64(u_int8_t *, u_int8_t *, u_int16_t);
+static void decode_base64(u_int8_t *, u_int16_t, u_int8_t *);
 
 static char    encrypted[_PASSWORD_LEN];
 static char    gsalt[BCRYPT_MAXSALT * 4 / 3 + 1];
diff --git a/lib/libc/crypt/crypt.c b/lib/libc/crypt/crypt.c
index d1a342c1787..6a0b6243fe6 100644
--- a/lib/libc/crypt/crypt.c
+++ b/lib/libc/crypt/crypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $	*/
+/*	$OpenBSD: crypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $	*/
 
 /*
  * FreeSec: libcrypt
@@ -52,7 +52,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $";
+static char rcsid[] = "$OpenBSD: crypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -594,8 +594,8 @@ crypt(key, setting)
 	u_int32_t	count, salt, l, r0, r1, keybuf[2];
 	u_char		*p, *q;
 	static u_char	output[21];
-	extern char	*md5crypt __P((const char *, const char *));
-	extern char	*bcrypt __P((const char *, const char *));
+	extern char	*md5crypt(const char *, const char *);
+	extern char	*bcrypt(const char *, const char *);
 
 	if (setting[0] == '$') {
 		switch (setting[1]) {
diff --git a/lib/libc/crypt/md5crypt.c b/lib/libc/crypt/md5crypt.c
index 7ec60f38e0c..56ab66fbb59 100644
--- a/lib/libc/crypt/md5crypt.c
+++ b/lib/libc/crypt/md5crypt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $	*/
+/*	$OpenBSD: md5crypt.c,v 1.10 2002/02/16 21:27:22 millert Exp $	*/
 
 /*
  * ----------------------------------------------------------------------------
@@ -13,7 +13,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.10 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <unistd.h>
@@ -25,7 +25,7 @@ static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey E
 static unsigned char itoa64[] =		/* 0 ... 63 => ascii - 64 */
 	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
-static void to64 __P((char *, u_int32_t, int));
+static void to64(char *, u_int32_t, int);
 
 static void
 to64(s, v, n)
diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
index 492155b0efc..f56e235a9f5 100644
--- a/lib/libc/db/btree/bt_close.c
+++ b/lib/libc/db/btree/bt_close.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_close.c,v 1.4 1999/02/15 05:11:22 millert Exp $	*/
+/*	$OpenBSD: bt_close.c,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)bt_close.c	8.7 (Berkeley) 8/17/94";
 #else
-static char rcsid[] = "$OpenBSD: bt_close.c,v 1.4 1999/02/15 05:11:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: bt_close.c,v 1.5 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: bt_close.c,v 1.4 1999/02/15 05:11:22 millert Ex
 #include <db.h>
 #include "btree.h"
 
-static int bt_meta __P((BTREE *));
+static int bt_meta(BTREE *);
 
 /*
  * BT_CLOSE -- Close a btree.
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
index 7272a69278e..064495e224e 100644
--- a/lib/libc/db/btree/bt_conv.c
+++ b/lib/libc/db/btree/bt_conv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_conv.c,v 1.4 1999/02/15 05:11:22 millert Exp $	*/
+/*	$OpenBSD: bt_conv.c,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
 #else
-static char rcsid[] = "$OpenBSD: bt_conv.c,v 1.4 1999/02/15 05:11:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: bt_conv.c,v 1.5 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: bt_conv.c,v 1.4 1999/02/15 05:11:22 millert Exp
 #include <db.h>
 #include "btree.h"
 
-static void mswap __P((PAGE *));
+static void mswap(PAGE *);
 
 /*
  * __BT_BPGIN, __BT_BPGOUT --
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
index a000bdba5e0..1c70309bb50 100644
--- a/lib/libc/db/btree/bt_delete.c
+++ b/lib/libc/db/btree/bt_delete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_delete.c,v 1.5 1999/02/15 05:11:22 millert Exp $	*/
+/*	$OpenBSD: bt_delete.c,v 1.6 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)bt_delete.c	8.13 (Berkeley) 7/28/94";
 #else
-static char rcsid[] = "$OpenBSD: bt_delete.c,v 1.5 1999/02/15 05:11:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: bt_delete.c,v 1.6 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,11 +53,11 @@ static char rcsid[] = "$OpenBSD: bt_delete.c,v 1.5 1999/02/15 05:11:22 millert E
 #include <db.h>
 #include "btree.h"
 
-static int __bt_bdelete __P((BTREE *, const DBT *));
-static int __bt_curdel __P((BTREE *, const DBT *, PAGE *, u_int));
-static int __bt_pdelete __P((BTREE *, PAGE *));
-static int __bt_relink __P((BTREE *, PAGE *));
-static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *));
+static int __bt_bdelete(BTREE *, const DBT *);
+static int __bt_curdel(BTREE *, const DBT *, PAGE *, u_int);
+static int __bt_pdelete(BTREE *, PAGE *);
+static int __bt_relink(BTREE *, PAGE *);
+static int __bt_stkacq(BTREE *, PAGE **, CURSOR *);
 
 /*
  * __bt_delete
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
index 1ab8d163e03..fd888c395f7 100644
--- a/lib/libc/db/btree/bt_open.c
+++ b/lib/libc/db/btree/bt_open.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_open.c,v 1.7 2000/10/03 18:16:48 mickey Exp $	*/
+/*	$OpenBSD: bt_open.c,v 1.8 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)bt_open.c	8.11 (Berkeley) 11/2/95";
 #else
-static char rcsid[] = "$OpenBSD: bt_open.c,v 1.7 2000/10/03 18:16:48 mickey Exp $";
+static char rcsid[] = "$OpenBSD: bt_open.c,v 1.8 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -72,9 +72,9 @@ static char rcsid[] = "$OpenBSD: bt_open.c,v 1.7 2000/10/03 18:16:48 mickey Exp
 #define	MINPSIZE	128
 #endif
 
-static int byteorder __P((void));
-static int nroot __P((BTREE *));
-static int tmp __P((void));
+static int byteorder(void);
+static int nroot(BTREE *);
+static int tmp(void);
 
 /*
  * __BT_OPEN -- Open a btree.
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
index 91535e1fa0d..59f6cef4cc5 100644
--- a/lib/libc/db/btree/bt_put.c
+++ b/lib/libc/db/btree/bt_put.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_put.c,v 1.6 1999/02/15 05:11:23 millert Exp $	*/
+/*	$OpenBSD: bt_put.c,v 1.7 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)bt_put.c   8.8 (Berkeley) 7/26/94";
 #else
-static char rcsid[] = "$OpenBSD: bt_put.c,v 1.6 1999/02/15 05:11:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: bt_put.c,v 1.7 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: bt_put.c,v 1.6 1999/02/15 05:11:23 millert Exp
 #include <db.h>
 #include "btree.h"
 
-static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *));
+static EPG *bt_fast(BTREE *, const DBT *, const DBT *, int *);
 
 /*
  * __BT_PUT -- Add a btree item to the tree.
diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c
index b1d6ee75294..d93b12080af 100644
--- a/lib/libc/db/btree/bt_search.c
+++ b/lib/libc/db/btree/bt_search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_search.c,v 1.4 1999/02/15 05:11:23 millert Exp $	*/
+/*	$OpenBSD: bt_search.c,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)bt_search.c	8.8 (Berkeley) 7/31/94";
 #else
-static char rcsid[] = "$OpenBSD: bt_search.c,v 1.4 1999/02/15 05:11:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: bt_search.c,v 1.5 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -51,8 +51,8 @@ static char rcsid[] = "$OpenBSD: bt_search.c,v 1.4 1999/02/15 05:11:23 millert E
 #include <db.h>
 #include "btree.h"
 
-static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *));
-static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *));
+static int __bt_snext(BTREE *, PAGE *, const DBT *, int *);
+static int __bt_sprev(BTREE *, PAGE *, const DBT *, int *);
 
 /*
  * __bt_search --
diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c
index e26c8606cb4..b871df4e1fe 100644
--- a/lib/libc/db/btree/bt_seq.c
+++ b/lib/libc/db/btree/bt_seq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_seq.c,v 1.5 2001/09/16 13:08:55 art Exp $	*/
+/*	$OpenBSD: bt_seq.c,v 1.6 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)bt_seq.c	8.7 (Berkeley) 7/20/94";
 #else
-static char rcsid[] = "$OpenBSD: bt_seq.c,v 1.5 2001/09/16 13:08:55 art Exp $";
+static char rcsid[] = "$OpenBSD: bt_seq.c,v 1.6 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -54,9 +54,9 @@ static char rcsid[] = "$OpenBSD: bt_seq.c,v 1.5 2001/09/16 13:08:55 art Exp $";
 #include <db.h>
 #include "btree.h"
 
-static int __bt_first __P((BTREE *, const DBT *, EPG *, int *));
-static int __bt_seqadv __P((BTREE *, EPG *, int));
-static int __bt_seqset __P((BTREE *, EPG *, DBT *, int));
+static int __bt_first(BTREE *, const DBT *, EPG *, int *);
+static int __bt_seqadv(BTREE *, EPG *, int);
+static int __bt_seqset(BTREE *, EPG *, DBT *, int);
 
 /*
  * Sequential scan support.
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
index 727d04d335a..b0b0cb3aea0 100644
--- a/lib/libc/db/btree/bt_split.c
+++ b/lib/libc/db/btree/bt_split.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bt_split.c,v 1.7 2002/02/01 18:10:39 millert Exp $	*/
+/*	$OpenBSD: bt_split.c,v 1.8 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -38,7 +38,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
-static char rcsid[] = "$OpenBSD: bt_split.c,v 1.7 2002/02/01 18:10:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: bt_split.c,v 1.8 2002/02/16 21:27:22 millert Exp $";
 #else
 static char sccsid[] = "@(#)bt_split.c	8.10 (Berkeley) 1/9/95";
 #endif
@@ -54,16 +54,16 @@ static char sccsid[] = "@(#)bt_split.c	8.10 (Berkeley) 1/9/95";
 #include <db.h>
 #include "btree.h"
 
-static int	 bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *));
+static int	 bt_broot(BTREE *, PAGE *, PAGE *, PAGE *);
 static PAGE	*bt_page
-		    __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t));
-static int	 bt_preserve __P((BTREE *, pgno_t));
+(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
+static int	 bt_preserve(BTREE *, pgno_t);
 static PAGE	*bt_psplit
-		    __P((BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t));
+(BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t);
 static PAGE	*bt_root
-		    __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t));
-static int	 bt_rroot __P((BTREE *, PAGE *, PAGE *, PAGE *));
-static recno_t	 rec_total __P((PAGE *));
+(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
+static int	 bt_rroot(BTREE *, PAGE *, PAGE *, PAGE *);
+static recno_t	 rec_total(PAGE *);
 
 #ifdef STATISTICS
 u_long	bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved;
diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h
index 5baeea5d9ea..6ee9f5b4352 100644
--- a/lib/libc/db/btree/btree.h
+++ b/lib/libc/db/btree/btree.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: btree.h,v 1.4 1999/02/15 05:11:23 millert Exp $	*/
+/*	$OpenBSD: btree.h,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -337,11 +337,11 @@ typedef struct _btree {
 	EPGNO	  bt_last;		/* last insert */
 
 					/* B: key comparison function */
-	int	(*bt_cmp) __P((const DBT *, const DBT *));
+	int	(*bt_cmp)(const DBT *, const DBT *);
 					/* B: prefix comparison function */
-	size_t	(*bt_pfx) __P((const DBT *, const DBT *));
+	size_t	(*bt_pfx)(const DBT *, const DBT *);
 					/* R: recno input function */
-	int	(*bt_irec) __P((struct _btree *, recno_t));
+	int	(*bt_irec)(struct _btree *, recno_t);
 
 	FILE	 *bt_rfp;		/* R: record FILE pointer */
 	int	  bt_rfd;		/* R: record file descriptor */
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
index 2abb91dabc7..e985a9aa0ba 100644
--- a/lib/libc/db/btree/extern.h
+++ b/lib/libc/db/btree/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.4 1999/02/15 05:11:23 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -35,38 +35,38 @@
  *	@(#)extern.h	8.10 (Berkeley) 7/20/94
  */
 
-int	 __bt_close __P((DB *));
-int	 __bt_cmp __P((BTREE *, const DBT *, EPG *));
-int	 __bt_crsrdel __P((BTREE *, EPGNO *));
-int	 __bt_defcmp __P((const DBT *, const DBT *));
-size_t	 __bt_defpfx __P((const DBT *, const DBT *));
-int	 __bt_delete __P((const DB *, const DBT *, u_int));
-int	 __bt_dleaf __P((BTREE *, const DBT *, PAGE *, u_int));
-int	 __bt_fd __P((const DB *));
-int	 __bt_free __P((BTREE *, PAGE *));
-int	 __bt_get __P((const DB *, const DBT *, DBT *, u_int));
-PAGE	*__bt_new __P((BTREE *, pgno_t *));
-void	 __bt_pgin __P((void *, pgno_t, void *));
-void	 __bt_pgout __P((void *, pgno_t, void *));
-int	 __bt_push __P((BTREE *, pgno_t, int));
-int	 __bt_put __P((const DB *dbp, DBT *, const DBT *, u_int));
-int	 __bt_ret __P((BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int));
-EPG	*__bt_search __P((BTREE *, const DBT *, int *));
-int	 __bt_seq __P((const DB *, DBT *, DBT *, u_int));
-void	 __bt_setcur __P((BTREE *, pgno_t, u_int));
+int	 __bt_close(DB *);
+int	 __bt_cmp(BTREE *, const DBT *, EPG *);
+int	 __bt_crsrdel(BTREE *, EPGNO *);
+int	 __bt_defcmp(const DBT *, const DBT *);
+size_t	 __bt_defpfx(const DBT *, const DBT *);
+int	 __bt_delete(const DB *, const DBT *, u_int);
+int	 __bt_dleaf(BTREE *, const DBT *, PAGE *, u_int);
+int	 __bt_fd(const DB *);
+int	 __bt_free(BTREE *, PAGE *);
+int	 __bt_get(const DB *, const DBT *, DBT *, u_int);
+PAGE	*__bt_new(BTREE *, pgno_t *);
+void	 __bt_pgin(void *, pgno_t, void *);
+void	 __bt_pgout(void *, pgno_t, void *);
+int	 __bt_push(BTREE *, pgno_t, int);
+int	 __bt_put(const DB *dbp, DBT *, const DBT *, u_int);
+int	 __bt_ret(BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int);
+EPG	*__bt_search(BTREE *, const DBT *, int *);
+int	 __bt_seq(const DB *, DBT *, DBT *, u_int);
+void	 __bt_setcur(BTREE *, pgno_t, u_int);
 int	 __bt_split __P((BTREE *, PAGE *,
 	    const DBT *, const DBT *, int, size_t, u_int32_t));
-int	 __bt_sync __P((const DB *, u_int));
+int	 __bt_sync(const DB *, u_int);
 
-int	 __ovfl_delete __P((BTREE *, void *));
-int	 __ovfl_get __P((BTREE *, void *, size_t *, void **, size_t *));
-int	 __ovfl_put __P((BTREE *, const DBT *, pgno_t *));
+int	 __ovfl_delete(BTREE *, void *);
+int	 __ovfl_get(BTREE *, void *, size_t *, void **, size_t *);
+int	 __ovfl_put(BTREE *, const DBT *, pgno_t *);
 
 #ifdef DEBUG
-void	 __bt_dnpage __P((DB *, pgno_t));
-void	 __bt_dpage __P((PAGE *));
-void	 __bt_dump __P((DB *));
+void	 __bt_dnpage(DB *, pgno_t);
+void	 __bt_dpage(PAGE *);
+void	 __bt_dump(DB *);
 #endif
 #ifdef STATISTICS
-void	 __bt_stat __P((DB *));
+void	 __bt_stat(DB *);
 #endif
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
index eae7a00deb3..03ef3964fde 100644
--- a/lib/libc/db/hash/extern.h
+++ b/lib/libc/db/hash/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.4 1999/02/15 05:11:23 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -35,32 +35,32 @@
  *	@(#)extern.h    8.4 (Berkeley) 6/16/94
  */
 
-BUFHEAD	*__add_ovflpage __P((HTAB *, BUFHEAD *));
-int	 __addel __P((HTAB *, BUFHEAD *, const DBT *, const DBT *));
-int	 __big_delete __P((HTAB *, BUFHEAD *));
-int	 __big_insert __P((HTAB *, BUFHEAD *, const DBT *, const DBT *));
-int	 __big_keydata __P((HTAB *, BUFHEAD *, DBT *, DBT *, int));
-int	 __big_return __P((HTAB *, BUFHEAD *, int, DBT *, int));
+BUFHEAD	*__add_ovflpage(HTAB *, BUFHEAD *);
+int	 __addel(HTAB *, BUFHEAD *, const DBT *, const DBT *);
+int	 __big_delete(HTAB *, BUFHEAD *);
+int	 __big_insert(HTAB *, BUFHEAD *, const DBT *, const DBT *);
+int	 __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int);
+int	 __big_return(HTAB *, BUFHEAD *, int, DBT *, int);
 int	 __big_split __P((HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
 		int, u_int32_t, SPLIT_RETURN *));
-int	 __buf_free __P((HTAB *, int, int));
-void	 __buf_init __P((HTAB *, int));
-u_int32_t	 __call_hash __P((HTAB *, char *, int));
-int	 __delpair __P((HTAB *, BUFHEAD *, int));
-int	 __expand_table __P((HTAB *));
-int	 __find_bigpair __P((HTAB *, BUFHEAD *, int, char *, int));
-u_int16_t	 __find_last_page __P((HTAB *, BUFHEAD **));
-void	 __free_ovflpage __P((HTAB *, BUFHEAD *));
-BUFHEAD	*__get_buf __P((HTAB *, u_int32_t, BUFHEAD *, int));
-int	 __get_page __P((HTAB *, char *, u_int32_t, int, int, int));
-int	 __ibitmap __P((HTAB *, int, int, int));
-u_int32_t	 __log2 __P((u_int32_t));
-int	 __put_page __P((HTAB *, char *, u_int32_t, int, int));
-void	 __reclaim_buf __P((HTAB *, BUFHEAD *));
-int	 __split_page __P((HTAB *, u_int32_t, u_int32_t));
+int	 __buf_free(HTAB *, int, int);
+void	 __buf_init(HTAB *, int);
+u_int32_t	 __call_hash(HTAB *, char *, int);
+int	 __delpair(HTAB *, BUFHEAD *, int);
+int	 __expand_table(HTAB *);
+int	 __find_bigpair(HTAB *, BUFHEAD *, int, char *, int);
+u_int16_t	 __find_last_page(HTAB *, BUFHEAD **);
+void	 __free_ovflpage(HTAB *, BUFHEAD *);
+BUFHEAD	*__get_buf(HTAB *, u_int32_t, BUFHEAD *, int);
+int	 __get_page(HTAB *, char *, u_int32_t, int, int, int);
+int	 __ibitmap(HTAB *, int, int, int);
+u_int32_t	 __log2(u_int32_t);
+int	 __put_page(HTAB *, char *, u_int32_t, int, int);
+void	 __reclaim_buf(HTAB *, BUFHEAD *);
+int	 __split_page(HTAB *, u_int32_t, u_int32_t);
 
 /* Default hash routine. */
-extern u_int32_t (*__default_hash) __P((const void *, size_t));
+extern u_int32_t (*__default_hash)(const void *, size_t);
 
 #ifdef HASH_STATISTICS
 extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index 88c07a0fef4..4f0399bbf10 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.c,v 1.11 2002/01/31 03:51:21 millert Exp $	*/
+/*	$OpenBSD: hash.c,v 1.12 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
 #else
-static char rcsid[] = "$OpenBSD: hash.c,v 1.11 2002/01/31 03:51:21 millert Exp $";
+static char rcsid[] = "$OpenBSD: hash.c,v 1.12 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -62,23 +62,23 @@ static char rcsid[] = "$OpenBSD: hash.c,v 1.11 2002/01/31 03:51:21 millert Exp $
 #include "page.h"
 #include "extern.h"
 
-static int   alloc_segs __P((HTAB *, int));
-static int   flush_meta __P((HTAB *));
-static int   hash_access __P((HTAB *, ACTION, DBT *, DBT *));
-static int   hash_close __P((DB *));
-static int   hash_delete __P((const DB *, const DBT *, u_int32_t));
-static int   hash_fd __P((const DB *));
-static int   hash_get __P((const DB *, const DBT *, DBT *, u_int32_t));
-static int   hash_put __P((const DB *, DBT *, const DBT *, u_int32_t));
-static void *hash_realloc __P((SEGMENT **, int, int));
-static int   hash_seq __P((const DB *, DBT *, DBT *, u_int32_t));
-static int   hash_sync __P((const DB *, u_int32_t));
-static int   hdestroy __P((HTAB *));
-static HTAB *init_hash __P((HTAB *, const char *, HASHINFO *));
-static int   init_htab __P((HTAB *, int));
+static int   alloc_segs(HTAB *, int);
+static int   flush_meta(HTAB *);
+static int   hash_access(HTAB *, ACTION, DBT *, DBT *);
+static int   hash_close(DB *);
+static int   hash_delete(const DB *, const DBT *, u_int32_t);
+static int   hash_fd(const DB *);
+static int   hash_get(const DB *, const DBT *, DBT *, u_int32_t);
+static int   hash_put(const DB *, DBT *, const DBT *, u_int32_t);
+static void *hash_realloc(SEGMENT **, int, int);
+static int   hash_seq(const DB *, DBT *, DBT *, u_int32_t);
+static int   hash_sync(const DB *, u_int32_t);
+static int   hdestroy(HTAB *);
+static HTAB *init_hash(HTAB *, const char *, HASHINFO *);
+static int   init_htab(HTAB *, int);
 #if BYTE_ORDER == LITTLE_ENDIAN
-static void  swap_header __P((HTAB *));
-static void  swap_header_copy __P((HASHHDR *, HASHHDR *));
+static void  swap_header(HTAB *);
+static void  swap_header_copy(HASHHDR *, HASHHDR *);
 #endif
 
 /* Fast arithmetic, relying on powers of 2, */
diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h
index bd96da9e137..dfda2af4d99 100644
--- a/lib/libc/db/hash/hash.h
+++ b/lib/libc/db/hash/hash.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.h,v 1.5 2001/01/04 21:45:30 todd Exp $	*/
+/*	$OpenBSD: hash.h,v 1.6 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -97,7 +97,7 @@ typedef struct htab	 {		/* Memory resident data structure */
 	int		exsegs;		/* Number of extra allocated 
 					 * segments */
 	u_int32_t			/* Hash function */
-	    (*hash)__P((const void *, size_t));
+	    (*hash)(const void *, size_t);
 	int		flags;		/* Flag values */
 	int		fp;		/* File pointer */
 	char		*tmp_buf;	/* Temporary Buffer for BIG data */
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
index 6859d0dec55..c7cf9760e80 100644
--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_bigkey.c,v 1.8 2002/02/01 18:15:24 millert Exp $	*/
+/*	$OpenBSD: hash_bigkey.c,v 1.9 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
 #else
-static char rcsid[] = "$OpenBSD: hash_bigkey.c,v 1.8 2002/02/01 18:15:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: hash_bigkey.c,v 1.9 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -78,8 +78,8 @@ static char rcsid[] = "$OpenBSD: hash_bigkey.c,v 1.8 2002/02/01 18:15:24 millert
 #include "page.h"
 #include "extern.h"
 
-static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int));
-static int collect_data __P((HTAB *, BUFHEAD *, int, int));
+static int collect_key(HTAB *, BUFHEAD *, int, DBT *, int);
+static int collect_data(HTAB *, BUFHEAD *, int, int);
 
 /*
  * Big_insert
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
index 45dfbaaca49..5e6fcbadb9e 100644
--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_buf.c,v 1.8 2000/10/03 18:16:48 mickey Exp $	*/
+/*	$OpenBSD: hash_buf.c,v 1.9 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
 #else
-static char rcsid[] = "$OpenBSD: hash_buf.c,v 1.8 2000/10/03 18:16:48 mickey Exp $";
+static char rcsid[] = "$OpenBSD: hash_buf.c,v 1.9 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -77,7 +77,7 @@ static char rcsid[] = "$OpenBSD: hash_buf.c,v 1.8 2000/10/03 18:16:48 mickey Exp
 #include "page.h"
 #include "extern.h"
 
-static BUFHEAD *newbuf __P((HTAB *, u_int32_t, BUFHEAD *));
+static BUFHEAD *newbuf(HTAB *, u_int32_t, BUFHEAD *);
 
 /* Unlink B from its place in the lru */
 #define BUF_REMOVE(B) { \
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
index b24fc5eb466..2b054569e86 100644
--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_func.c,v 1.5 1999/02/15 05:11:24 millert Exp $	*/
+/*	$OpenBSD: hash_func.c,v 1.6 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)hash_func.c	8.4 (Berkeley) 11/7/95";
 #else
-static char rcsid[] = "$OpenBSD: hash_func.c,v 1.5 1999/02/15 05:11:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: hash_func.c,v 1.6 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -52,14 +52,14 @@ static char rcsid[] = "$OpenBSD: hash_func.c,v 1.5 1999/02/15 05:11:24 millert E
 #include "extern.h"
 
 #ifdef notdef
-static u_int32_t hash1 __P((const void *, size_t));
-static u_int32_t hash2 __P((const void *, size_t));
-static u_int32_t hash3 __P((const void *, size_t));
+static u_int32_t hash1(const void *, size_t);
+static u_int32_t hash2(const void *, size_t);
+static u_int32_t hash3(const void *, size_t);
 #endif
-static u_int32_t hash4 __P((const void *, size_t));
+static u_int32_t hash4(const void *, size_t);
 
 /* Default hash function. */
-u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4;
+u_int32_t (*__default_hash)(const void *, size_t) = hash4;
 
 #ifdef notdef
 /*
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
index 7a01277657e..ebdd14651e0 100644
--- a/lib/libc/db/hash/hash_page.c
+++ b/lib/libc/db/hash/hash_page.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash_page.c,v 1.10 2002/02/01 18:18:08 millert Exp $	*/
+/*	$OpenBSD: hash_page.c,v 1.11 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
 #else
-static char rcsid[] = "$OpenBSD: hash_page.c,v 1.10 2002/02/01 18:18:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: hash_page.c,v 1.11 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -79,14 +79,14 @@ static char rcsid[] = "$OpenBSD: hash_page.c,v 1.10 2002/02/01 18:18:08 millert
 #include "page.h"
 #include "extern.h"
 
-static u_int32_t	*fetch_bitmap __P((HTAB *, int));
-static u_int32_t	 first_free __P((u_int32_t));
-static int	 open_temp __P((HTAB *));
-static u_int16_t	 overflow_page __P((HTAB *));
-static void	 putpair __P((char *, const DBT *, const DBT *));
-static void	 squeeze_key __P((u_int16_t *, const DBT *, const DBT *));
+static u_int32_t	*fetch_bitmap(HTAB *, int);
+static u_int32_t	 first_free(u_int32_t);
+static int	 open_temp(HTAB *);
+static u_int16_t	 overflow_page(HTAB *);
+static void	 putpair(char *, const DBT *, const DBT *);
+static void	 squeeze_key(u_int16_t *, const DBT *, const DBT *);
 static int	 ugly_split
-		    __P((HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int));
+(HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int);
 
 #define	PAGE_INIT(P) { \
 	((u_int16_t *)(P))[0] = 0; \
diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
index 73e9274b440..e6f3dad6ac9 100644
--- a/lib/libc/db/hash/ndbm.c
+++ b/lib/libc/db/hash/ndbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndbm.c,v 1.12 2000/08/01 21:26:10 millert Exp $	*/
+/*	$OpenBSD: ndbm.c,v 1.13 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)dbm.c	8.6 (Berkeley) 11/7/95";
 #else
-static char rcsid[] = "$OpenBSD: ndbm.c,v 1.12 2000/08/01 21:26:10 millert Exp $";
+static char rcsid[] = "$OpenBSD: ndbm.c,v 1.13 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -62,7 +62,7 @@ static char rcsid[] = "$OpenBSD: ndbm.c,v 1.12 2000/08/01 21:26:10 millert Exp $
  */
 static DBM *__cur_db;
 
-static DBM *_dbm_open __P((const char *, const char *, int, int));
+static DBM *_dbm_open(const char *, const char *, int, int);
 
 /*
  * Returns:
diff --git a/lib/libc/db/hash/search.h b/lib/libc/db/hash/search.h
index 956094166b4..1f336685405 100644
--- a/lib/libc/db/hash/search.h
+++ b/lib/libc/db/hash/search.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.h,v 1.4 1999/02/15 05:11:24 millert Exp $	*/
+/*	$OpenBSD: search.h,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -48,6 +48,6 @@ typedef enum {
 	FIND, ENTER
 } ACTION;
 
-int	 hcreate __P((unsigned int));
-void	 hdestroy __P((void));
-ENTRY	*hsearch __P((ENTRY, ACTION));
+int	 hcreate(unsigned int);
+void	 hdestroy(void);
+ENTRY	*hsearch(ENTRY, ACTION);
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
index 89cab031741..edcd9395e25 100644
--- a/lib/libc/db/mpool/mpool.c
+++ b/lib/libc/db/mpool/mpool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpool.c,v 1.8 2002/02/01 18:13:33 millert Exp $	*/
+/*	$OpenBSD: mpool.c,v 1.9 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)mpool.c	8.7 (Berkeley) 11/2/95";
 #else
-static char rcsid[] = "$OpenBSD: mpool.c,v 1.8 2002/02/01 18:13:33 millert Exp $";
+static char rcsid[] = "$OpenBSD: mpool.c,v 1.9 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -56,9 +56,9 @@ static char rcsid[] = "$OpenBSD: mpool.c,v 1.8 2002/02/01 18:13:33 millert Exp $
 #define	__MPOOLINTERFACE_PRIVATE
 #include <mpool.h>
 
-static BKT *mpool_bkt __P((MPOOL *));
-static BKT *mpool_look __P((MPOOL *, pgno_t));
-static int  mpool_write __P((MPOOL *, BKT *));
+static BKT *mpool_bkt(MPOOL *);
+static BKT *mpool_look(MPOOL *, pgno_t);
+static int  mpool_write(MPOOL *, BKT *);
 
 /*
  * mpool_open --
@@ -108,8 +108,8 @@ mpool_open(key, fd, pagesize, maxcache)
 void
 mpool_filter(mp, pgin, pgout, pgcookie)
 	MPOOL *mp;
-	void (*pgin) __P((void *, pgno_t, void *));
-	void (*pgout) __P((void *, pgno_t, void *));
+	void (*pgin)(void *, pgno_t, void *);
+	void (*pgout)(void *, pgno_t, void *);
 	void *pgcookie;
 {
 	mp->pgin = pgin;
diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h
index 8860878e2bd..0e50b7a5edb 100644
--- a/lib/libc/db/recno/extern.h
+++ b/lib/libc/db/recno/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.4 1999/02/15 05:11:25 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,20 +37,20 @@
 
 #include "../btree/extern.h"
 
-int	 __rec_close __P((DB *));
-int	 __rec_delete __P((const DB *, const DBT *, u_int));
-int	 __rec_dleaf __P((BTREE *, PAGE *, u_int32_t));
-int	 __rec_fd __P((const DB *));
-int	 __rec_fmap __P((BTREE *, recno_t));
-int	 __rec_fout __P((BTREE *));
-int	 __rec_fpipe __P((BTREE *, recno_t));
-int	 __rec_get __P((const DB *, const DBT *, DBT *, u_int));
-int	 __rec_iput __P((BTREE *, recno_t, const DBT *, u_int));
-int	 __rec_put __P((const DB *dbp, DBT *, const DBT *, u_int));
-int	 __rec_ret __P((BTREE *, EPG *, recno_t, DBT *, DBT *));
-EPG	*__rec_search __P((BTREE *, recno_t, enum SRCHOP));
-int	 __rec_seq __P((const DB *, DBT *, DBT *, u_int));
-int	 __rec_sync __P((const DB *, u_int));
-int	 __rec_vmap __P((BTREE *, recno_t));
-int	 __rec_vout __P((BTREE *));
-int	 __rec_vpipe __P((BTREE *, recno_t));
+int	 __rec_close(DB *);
+int	 __rec_delete(const DB *, const DBT *, u_int);
+int	 __rec_dleaf(BTREE *, PAGE *, u_int32_t);
+int	 __rec_fd(const DB *);
+int	 __rec_fmap(BTREE *, recno_t);
+int	 __rec_fout(BTREE *);
+int	 __rec_fpipe(BTREE *, recno_t);
+int	 __rec_get(const DB *, const DBT *, DBT *, u_int);
+int	 __rec_iput(BTREE *, recno_t, const DBT *, u_int);
+int	 __rec_put(const DB *dbp, DBT *, const DBT *, u_int);
+int	 __rec_ret(BTREE *, EPG *, recno_t, DBT *, DBT *);
+EPG	*__rec_search(BTREE *, recno_t, enum SRCHOP);
+int	 __rec_seq(const DB *, DBT *, DBT *, u_int);
+int	 __rec_sync(const DB *, u_int);
+int	 __rec_vmap(BTREE *, recno_t);
+int	 __rec_vout(BTREE *);
+int	 __rec_vpipe(BTREE *, recno_t);
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
index a331b5e427f..d20d433844b 100644
--- a/lib/libc/db/recno/rec_delete.c
+++ b/lib/libc/db/recno/rec_delete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rec_delete.c,v 1.4 1999/02/15 05:11:25 millert Exp $	*/
+/*	$OpenBSD: rec_delete.c,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)rec_delete.c	8.7 (Berkeley) 7/14/94";
 #else
-static char rcsid[] = "$OpenBSD: rec_delete.c,v 1.4 1999/02/15 05:11:25 millert Exp $";
+static char rcsid[] = "$OpenBSD: rec_delete.c,v 1.5 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: rec_delete.c,v 1.4 1999/02/15 05:11:25 millert
 #include <db.h>
 #include "recno.h"
 
-static int rec_rdelete __P((BTREE *, recno_t));
+static int rec_rdelete(BTREE *, recno_t);
 
 /*
  * __REC_DELETE -- Delete the item(s) referenced by a key.
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
index 4ceabf90cf5..f6c8fce726c 100644
--- a/lib/libc/gen/disklabel.c
+++ b/lib/libc/gen/disklabel.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: disklabel.c,v 1.5 2000/07/19 15:25:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: disklabel.c,v 1.6 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: disklabel.c,v 1.5 2000/07/19 15:25:13 deraadt E
 #include <string.h>
 #include <unistd.h>
 
-static int	gettype __P((char *, char **));
+static int	gettype(char *, char **);
 
 struct disklabel *
 getdiskbyname(name)
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
index 3424488af79..53bf7965a37 100644
--- a/lib/libc/gen/fnmatch.c
+++ b/lib/libc/gen/fnmatch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $	*/
+/*	$OpenBSD: fnmatch.c,v 1.8 2002/02/16 21:27:22 millert Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
 #else
-static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.8 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp
 #define	RANGE_NOMATCH	0
 #define	RANGE_ERROR	(-1)
 
-static int rangematch __P((const char *, char, int, char **));
+static int rangematch(const char *, char, int, char **);
 
 int
 fnmatch(pattern, string, flags)
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
index 4ed7d62cfb5..431018414fb 100644
--- a/lib/libc/gen/fstab.c
+++ b/lib/libc/gen/fstab.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fstab.c,v 1.9 2001/06/27 00:58:54 lebel Exp $";
+static char rcsid[] = "$OpenBSD: fstab.c,v 1.10 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -50,8 +50,8 @@ static char rcsid[] = "$OpenBSD: fstab.c,v 1.9 2001/06/27 00:58:54 lebel Exp $";
 static FILE *_fs_fp;
 static struct fstab _fs_fstab;
 
-static void error __P((int));
-static int fstabscan __P((void));
+static void error(int);
+static int fstabscan(void);
 
 static int
 fstabscan()
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 60409450cfd..90828ba3b19 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fts.c,v 1.29 2001/08/27 21:42:06 millert Exp $	*/
+/*	$OpenBSD: fts.c,v 1.30 2002/02/16 21:27:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #else
-static char rcsid[] = "$OpenBSD: fts.c,v 1.29 2001/08/27 21:42:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: fts.c,v 1.30 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -52,16 +52,16 @@ static char rcsid[] = "$OpenBSD: fts.c,v 1.29 2001/08/27 21:42:06 millert Exp $"
 #include <string.h>
 #include <unistd.h>
 
-static FTSENT	*fts_alloc __P((FTS *, char *, size_t));
-static FTSENT	*fts_build __P((FTS *, int));
-static void	 fts_lfree __P((FTSENT *));
-static void	 fts_load __P((FTS *, FTSENT *));
-static size_t	 fts_maxarglen __P((char * const *));
-static void	 fts_padjust __P((FTS *, FTSENT *));
-static int	 fts_palloc __P((FTS *, size_t));
-static FTSENT	*fts_sort __P((FTS *, FTSENT *, int));
-static u_short	 fts_stat __P((FTS *, FTSENT *, int));
-static int	 fts_safe_changedir __P((FTS *, FTSENT *, int, char *));
+static FTSENT	*fts_alloc(FTS *, char *, size_t);
+static FTSENT	*fts_build(FTS *, int);
+static void	 fts_lfree(FTSENT *);
+static void	 fts_load(FTS *, FTSENT *);
+static size_t	 fts_maxarglen(char * const *);
+static void	 fts_padjust(FTS *, FTSENT *);
+static int	 fts_palloc(FTS *, size_t);
+static FTSENT	*fts_sort(FTS *, FTSENT *, int);
+static u_short	 fts_stat(FTS *, FTSENT *, int);
+static int	 fts_safe_changedir(FTS *, FTSENT *, int, char *);
 
 #define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
 
@@ -80,7 +80,7 @@ FTS *
 fts_open(argv, options, compar)
 	char * const *argv;
 	int options;
-	int (*compar) __P((const FTSENT **, const FTSENT **));
+	int (*compar)(const FTSENT **, const FTSENT **);
 {
 	FTS *sp;
 	FTSENT *p, *root;
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
index e4339cebe04..c7ad4b37f79 100644
--- a/lib/libc/gen/getcap.c
+++ b/lib/libc/gen/getcap.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: getcap.c,v 1.19 2001/09/22 18:36:40 millert Exp $";
+static const char rcsid[] = "$OpenBSD: getcap.c,v 1.20 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -64,9 +64,9 @@ static size_t	 topreclen;	/* toprec length */
 static char	*toprec;	/* Additional record specified by cgetset() */
 static int	 gottoprec;	/* Flag indicating retrieval of toprecord */
 
-static int	cdbget __P((DB *, char **, const char *));
-static int 	getent __P((char **, u_int *, char **, int, const char *, int, char *));
-static int	nfcmp __P((const char *, char *));
+static int	cdbget(DB *, char **, const char *);
+static int 	getent(char **, u_int *, char **, int, const char *, int, char *);
+static int	nfcmp(const char *, char *);
 
 static int	usedb = 1;
 
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
index 0b2e1b3e8cc..28c5024b5e8 100644
--- a/lib/libc/gen/getgrent.c
+++ b/lib/libc/gen/getgrent.c
@@ -33,7 +33,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getgrent.c,v 1.14 2001/09/11 04:52:50 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: getgrent.c,v 1.15 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -67,9 +67,9 @@ _THREAD_PRIVATE_MUTEX(gr);
 static FILE *_gr_fp;
 static struct group _gr_group;
 static int _gr_stayopen;
-static int grscan __P((int, gid_t, const char *, struct group *, struct group_storage *));
-static int start_gr __P((void));
-static void endgrent_basic __P((void));
+static int grscan(int, gid_t, const char *, struct group *, struct group_storage *);
+static int start_gr(void);
+static void endgrent_basic(void);
 
 static struct group *getgrnam_gs(const char *, struct group *,
 	struct group_storage *);
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
index e8094863ec3..ae9e11bc0cf 100644
--- a/lib/libc/gen/getlogin.c
+++ b/lib/libc/gen/getlogin.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getlogin.c,v 1.6 2002/01/23 21:02:41 fgsch Exp $";
+static char rcsid[] = "$OpenBSD: getlogin.c,v 1.7 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -48,8 +48,8 @@ _THREAD_PRIVATE_MUTEX(logname);
 static int  logname_valid = 0;
 static char logname[MAXLOGNAME + 1];
 
-int	_getlogin __P((char *, size_t));
-int	_setlogin __P((const char *));
+int	_getlogin(char *, size_t);
+int	_setlogin(const char *);
 
 char *
 getlogin()
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index 8af519a8fc9..a4976fc0b05 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetgrent.c,v 1.10 2000/12/09 23:04:16 deraadt Exp $	*/
+/*	$OpenBSD: getnetgrent.c,v 1.11 2002/02/16 21:27:22 millert Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.10 2000/12/09 23:04:16 deraadt Exp $";
+static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.11 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -68,10 +68,10 @@ struct stringlist {
 	size_t		  sl_cur;
 };
 
-static int		getstring __P((char **, int, char **));
-static struct netgroup	*getnetgroup __P((char **));
-static int		 lookup __P((const char *, char *, char **, int));
-static void		 addgroup __P((char *, struct stringlist *, char *));
+static int		getstring(char **, int, char **);
+static struct netgroup	*getnetgroup(char **);
+static int		 lookup(const char *, char *, char **, int);
+static void		 addgroup(char *, struct stringlist *, char *);
 static int		 in_check __P((const char *, const char *,
 				       const char *, struct netgroup *));
 static int		 in_find __P((char *, struct stringlist *,
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
index baf37a57a86..aa071665213 100644
--- a/lib/libc/gen/getpwent.c
+++ b/lib/libc/gen/getpwent.c
@@ -33,7 +33,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getpwent.c,v 1.22 2001/07/10 16:46:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: getpwent.c,v 1.23 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -61,8 +61,8 @@ static DB *_pw_db;			/* password database */
 static int _pw_keynum;			/* key counter */
 static int _pw_stayopen;		/* keep fd's open */
 static int _pw_flags;			/* password flags */
-static int __hashpw __P((DBT *));
-static int __initdb __P((void));
+static int __hashpw(DBT *);
+static int __initdb(void);
 
 #ifdef YP
 enum _ypmode { YPMODE_NONE, YPMODE_FULL, YPMODE_USER, YPMODE_NETGRP };
@@ -76,13 +76,13 @@ static char	__ypline[1024];
 static long	__yppbuf[1024 / sizeof(long)];
 static int	__yp_override_passwd = 0;
 
-static int __has_yppw __P((void));
-static int __has_ypmaster __P((void));
+static int __has_yppw(void);
+static int __has_ypmaster(void);
 
-static int __ypexclude_add __P((const char *));
-static int __ypexclude_is __P((const char *));
-static void __ypexclude_free __P((void));
-static void __ypproto_set __P((void));
+static int __ypexclude_add(const char *);
+static int __ypexclude_is(const char *);
+static void __ypexclude_free(void);
+static void __ypproto_set(void);
 
 /* macro for deciding which YP maps to use. */
 #define PASSWD_BYNAME \
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
index 6638849d460..27a397d1cd9 100644
--- a/lib/libc/gen/getttyent.c
+++ b/lib/libc/gen/getttyent.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getttyent.c,v 1.4 1997/07/09 00:28:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: getttyent.c,v 1.5 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <ttyent.h>
@@ -43,8 +43,8 @@ static char rcsid[] = "$OpenBSD: getttyent.c,v 1.4 1997/07/09 00:28:22 millert E
 static char zapchar;
 static FILE *tf;
 
-static char *skip __P((char *));
-static char *value __P((char *));
+static char *skip(char *);
+static char *value(char *);
 
 struct ttyent *
 getttynam(tty)
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
index b3fe0ed0b57..d987a7da9a8 100644
--- a/lib/libc/gen/getusershell.c
+++ b/lib/libc/gen/getusershell.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: getusershell.c,v 1.2 1996/08/19 08:24:15 tholo Exp $";
+static char rcsid[] = "$OpenBSD: getusershell.c,v 1.3 2002/02/16 21:27:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: getusershell.c,v 1.2 1996/08/19 08:24:15 tholo
 
 static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
 static char **curshell, **shells, *strings;
-static char **initshells __P((void));
+static char **initshells(void);
 
 /*
  * Get a list of shells from _PATH_SHELLS, if it exists.
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 83d3754cda8..3048ee8318f 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
 #else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.16 2001/04/05 18:36:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.17 2002/02/16 21:27:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -130,32 +130,32 @@ typedef char Char;
 #define	ismeta(c)	(((c)&M_QUOTE) != 0)
 
 
-static int	 compare __P((const void *, const void *));
-static int	 g_Ctoc __P((const Char *, char *, u_int));
-static int	 g_lstat __P((Char *, struct stat *, glob_t *));
-static DIR	*g_opendir __P((Char *, glob_t *));
-static Char	*g_strchr __P((Char *, int));
-static int	 g_stat __P((Char *, struct stat *, glob_t *));
-static int	 glob0 __P((const Char *, glob_t *));
-static int	 glob1 __P((Char *, Char *, glob_t *, size_t *));
+static int	 compare(const void *, const void *);
+static int	 g_Ctoc(const Char *, char *, u_int);
+static int	 g_lstat(Char *, struct stat *, glob_t *);
+static DIR	*g_opendir(Char *, glob_t *);
+static Char	*g_strchr(Char *, int);
+static int	 g_stat(Char *, struct stat *, glob_t *);
+static int	 glob0(const Char *, glob_t *);
+static int	 glob1(Char *, Char *, glob_t *, size_t *);
 static int	 glob2 __P((Char *, Char *, Char *, Char *, Char *, Char *,
 		    glob_t *, size_t *));
 static int	 glob3 __P((Char *, Char *, Char *, Char *, Char *, Char *,
 		    Char *, Char *, glob_t *, size_t *));
-static int	 globextend __P((const Char *, glob_t *, size_t *));
+static int	 globextend(const Char *, glob_t *, size_t *);
 static const Char *
-		 globtilde __P((const Char *, Char *, size_t, glob_t *));
-static int	 globexp1 __P((const Char *, glob_t *));
-static int	 globexp2 __P((const Char *, const Char *, glob_t *, int *));
-static int	 match __P((Char *, Char *, Char *));
+		 globtilde(const Char *, Char *, size_t, glob_t *);
+static int	 globexp1(const Char *, glob_t *);
+static int	 globexp2(const Char *, const Char *, glob_t *, int *);
+static int	 match(Char *, Char *, Char *);
 #ifdef DEBUG
-static void	 qprintf __P((const char *, Char *));
+static void	 qprintf(const char *, Char *);
 #endif
 
 int
 glob(pattern, flags, errfunc, pglob)
 	const char *pattern;
-	int flags, (*errfunc) __P((const char *, int));
+	int flags, (*errfunc)(const char *, int);
 	glob_t *pglob;
 {
 	const u_char *patnext;
diff --git a/lib/libc/gen/login_cap.c b/lib/libc/gen/login_cap.c
index d4da2b573cc..4ac866e3102 100644
--- a/lib/libc/gen/login_cap.c
+++ b/lib/libc/gen/login_cap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_cap.c,v 1.9 2002/01/29 08:08:57 mpech Exp $	*/
+/*	$OpenBSD: login_cap.c,v 1.10 2002/02/16 21:27:23 millert Exp $	*/
 
 /*-
  * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -53,10 +53,10 @@
 
 
 static	char *_authtypes[] = { LOGIN_DEFSTYLE, 0 };
-static	int setuserpath __P((login_cap_t *, char *));
-static	u_quad_t multiply __P((u_quad_t, u_quad_t));
-static	u_quad_t strtolimit __P((char *, char **, int));
-static	u_quad_t strtosize __P((char *, char **, int));
+static	int setuserpath(login_cap_t *, char *);
+static	u_quad_t multiply(u_quad_t, u_quad_t);
+static	u_quad_t strtolimit(char *, char **, int);
+static	u_quad_t strtosize(char *, char **, int);
 
 login_cap_t *
 login_getclass(class)
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index bad454b25c6..f0d8b992ea2 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.40 2001/07/09 06:57:43 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: nlist.c,v 1.41 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -485,7 +485,7 @@ elf_done:
 
 
 static struct nlist_handlers {
-	int	(*fn) __P((int fd, struct nlist *list));
+	int	(*fn)(int fd, struct nlist *list);
 } nlist_fn[] = {
 #ifdef _NLIST_DO_AOUT
 	{ __aout_fdnlist },
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
index c248a4a3251..75a87161b48 100644
--- a/lib/libc/gen/psignal.c
+++ b/lib/libc/gen/psignal.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: psignal.c,v 1.3 1999/09/16 19:06:00 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: psignal.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: psignal.c,v 1.3 1999/09/16 19:06:00 deraadt Exp
 #include <unistd.h>
 #include <limits.h>
 
-extern char *__strsignal __P((int , char *));
+extern char *__strsignal(int , char *);
 
 void
 psignal(sig, s)
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index b863e719078..9f3d3d2e7d0 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -32,13 +32,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rewinddir.c,v 1.3 1997/07/09 00:28:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: rewinddir.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <dirent.h>
 
-void __seekdir __P((DIR *, long));
+void __seekdir(DIR *, long);
 
 void
 rewinddir(dirp)
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
index d4c2281a438..10ab99dd52c 100644
--- a/lib/libc/gen/scandir.c
+++ b/lib/libc/gen/scandir.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: scandir.c,v 1.4 1998/08/14 21:39:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: scandir.c,v 1.5 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -63,8 +63,8 @@ int
 scandir(dirname, namelist, select, dcomp)
 	const char *dirname;
 	struct dirent ***namelist;
-	int (*select) __P((struct dirent *));
-	int (*dcomp) __P((const void *, const void *));
+	int (*select)(struct dirent *);
+	int (*dcomp)(const void *, const void *);
 {
 	register struct dirent *d, *p, **names;
 	register size_t nitems;
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
index a2049ee8a9d..cead0047897 100644
--- a/lib/libc/gen/seekdir.c
+++ b/lib/libc/gen/seekdir.c
@@ -32,13 +32,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: seekdir.c,v 1.3 1997/09/22 05:09:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: seekdir.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <dirent.h>
 
-void __seekdir __P((DIR *, long));
+void __seekdir(DIR *, long);
 
 /*
  * Seek to an entry in a directory.
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index c33521496f7..228a046560d 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setmode.c,v 1.9 1998/11/18 23:28:34 deraadt Exp $	*/
+/*	$OpenBSD: setmode.c,v 1.10 2002/02/16 21:27:23 millert Exp $	*/
 /*	$NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
 #else
-static char rcsid[] = "$OpenBSD: setmode.c,v 1.9 1998/11/18 23:28:34 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: setmode.c,v 1.10 2002/02/16 21:27:23 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -73,10 +73,10 @@ typedef struct bitcmd {
 #define	CMD2_OBITS	0x08
 #define	CMD2_UBITS	0x10
 
-static BITCMD	*addcmd __P((BITCMD *, int, int, int, u_int));
-static void	 compress_mode __P((BITCMD *));
+static BITCMD	*addcmd(BITCMD *, int, int, int, u_int);
+static void	 compress_mode(BITCMD *);
 #ifdef SETMODE_DEBUG
-static void	 dumpmode __P((BITCMD *));
+static void	 dumpmode(BITCMD *);
 #endif
 
 /*
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
index 02fbf85befa..fc59f586613 100644
--- a/lib/libc/gen/sysctl.c
+++ b/lib/libc/gen/sysctl.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sysctl.c,v 1.3 1997/08/24 21:25:46 millert Exp $";
+static char rcsid[] = "$OpenBSD: sysctl.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -45,7 +45,7 @@ static char rcsid[] = "$OpenBSD: sysctl.c,v 1.3 1997/08/24 21:25:46 millert Exp
 #include <string.h>
 #include <unistd.h>
 
-int __sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
+int __sysctl(int *, u_int, void *, size_t *, void *, size_t);
 
 int
 sysctl(name, namelen, oldp, oldlenp, newp, newlen)
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 3ad279804fa..cb646e29785 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: syslog.c,v 1.13 2001/10/31 14:24:11 fgsch Exp $";
+static char rcsid[] = "$OpenBSD: syslog.c,v 1.14 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -60,10 +60,10 @@ static struct syslog_data sdata = SYSLOG_DATA_INIT;
 
 extern char	*__progname;		/* Program name, from crt0. */
 
-static void	disconnectlog __P((void)); /* disconnect from syslogd */
-static void	connectlog __P((void));	/* (re)connect to syslogd */
-static void	disconnectlog_r __P((struct syslog_data *)); 
-static void	connectlog_r __P((struct syslog_data *)); 
+static void	disconnectlog(void);	/* disconnect from syslogd */
+static void	connectlog(void);	/* (re)connect to syslogd */
+static void	disconnectlog_r(struct syslog_data *); 
+static void	connectlog_r(struct syslog_data *); 
 
 /*
  * syslog, vsyslog --
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
index 0a1a9208585..5d0fb5759a4 100644
--- a/lib/libc/gen/ttyname.c
+++ b/lib/libc/gen/ttyname.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ttyname.c,v 1.7 2000/01/06 08:24:16 d Exp $";
+static char rcsid[] = "$OpenBSD: ttyname.c,v 1.8 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -49,8 +49,8 @@ static char rcsid[] = "$OpenBSD: ttyname.c,v 1.7 2000/01/06 08:24:16 d Exp $";
 #include "thread_private.h"
 
 static char buf[TTY_NAME_MAX];
-static int oldttyname __P((int, struct stat *, char *, size_t));
-static int __ttyname_r_basic __P((int, char *, size_t));
+static int oldttyname(int, struct stat *, char *, size_t);
+static int __ttyname_r_basic(int, char *, size_t);
 
 int
 ttyname_r(int fd, char *buf, size_t buflen)
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
index 850d5caa82f..fa828c054fe 100644
--- a/lib/libc/gmon/gmon.c
+++ b/lib/libc/gmon/gmon.c
@@ -32,7 +32,7 @@
  */
 
 #if !defined(lint) && defined(LIBC_SCCS)
-static char rcsid[] = "$OpenBSD: gmon.c,v 1.11 1998/07/15 18:59:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: gmon.c,v 1.12 2002/02/16 21:27:23 millert Exp $";
 #endif
 
 #include <sys/param.h>
@@ -57,8 +57,8 @@ static int	s_scale;
 
 #define ERR(s) write(STDERR_FILENO, s, sizeof(s))
 
-void	moncontrol __P((int));
-static int hertz __P((void));
+void	moncontrol(int);
+static int hertz(void);
 
 void
 monstartup(lowpc, highpc)
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
index 88b6e516875..1b9193af017 100644
--- a/lib/libc/gmon/mcount.c
+++ b/lib/libc/gmon/mcount.c
@@ -32,7 +32,7 @@
  */
 
 #if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS)
-static char rcsid[] = "$OpenBSD: mcount.c,v 1.6 1997/07/23 21:11:27 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: mcount.c,v 1.7 2002/02/16 21:27:23 millert Exp $";
 #endif
 
 #include <sys/param.h>
@@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: mcount.c,v 1.6 1997/07/23 21:11:27 kstailey Exp
  * both frompcindex and frompc.  Any reasonable, modern compiler will
  * perform this optimization.
  */
-_MCOUNT_DECL __P((u_long frompc, u_long selfpc));
+_MCOUNT_DECL(u_long frompc, u_long selfpc);
 _MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
 	register u_long frompc, selfpc;
 {
diff --git a/lib/libc/include/thread_private.h b/lib/libc/include/thread_private.h
index 723bed5f518..8cf06a86c41 100644
--- a/lib/libc/include/thread_private.h
+++ b/lib/libc/include/thread_private.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: thread_private.h,v 1.10 2001/09/04 22:17:45 fgsch Exp $ */
+/* $OpenBSD: thread_private.h,v 1.11 2002/02/16 21:27:23 millert Exp $ */
 
 #ifndef _THREAD_PRIVATE_H_
 #define _THREAD_PRIVATE_H_
@@ -55,7 +55,7 @@ extern int __isthreaded;
 
 struct _thread_private_key_struct {
 	pthread_once_t		once;
-	void			(*cleanfn)__P((void *));
+	void			(*cleanfn)(void *);
 	pthread_key_t		key;
 };
 
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
index 42363d5c4e2..b26d4892f1a 100644
--- a/lib/libc/locale/setlocale.c
+++ b/lib/libc/locale/setlocale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setlocale.c,v 1.7 2001/06/27 00:58:54 lebel Exp $	*/
+/*	$OpenBSD: setlocale.c,v 1.8 2002/02/16 21:27:23 millert Exp $	*/
 /*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: setlocale.c,v 1.7 2001/06/27 00:58:54 lebel Exp $";
+static char rcsid[] = "$OpenBSD: setlocale.c,v 1.8 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/localedef.h>
@@ -82,8 +82,8 @@ static char new_categories[_LC_LAST][32];
 static char current_locale_string[_LC_LAST * 33];
 static char *PathLocale;
 
-static char	*currentlocale __P((void));
-static char	*loadlocale __P((int));
+static char	*currentlocale(void);
+static char	*loadlocale(int);
 
 char *
 setlocale(category, locale)
diff --git a/lib/libc/md/md4c.c b/lib/libc/md/md4c.c
index 63131d8ed79..bcfe702b421 100644
--- a/lib/libc/md/md4c.c
+++ b/lib/libc/md/md4c.c
@@ -22,7 +22,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: md4c.c,v 1.12 2000/03/28 17:35:09 millert Exp $";
+static char rcsid[] = "$OpenBSD: md4c.c,v 1.13 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <string.h>
@@ -51,8 +51,8 @@ typedef unsigned char *POINTER;
 #define Encode memcpy
 #define Decode memcpy
 #else /* BIG_ENDIAN */
-static void Encode __P ((void *, const void *, size_t));
-static void Decode __P ((void *, const void *, size_t));
+static void Encode(void *, const void *, size_t);
+static void Decode(void *, const void *, size_t);
 #endif /* LITTLE_ENDIAN */
 
 static unsigned char PADDING[64] = {
diff --git a/lib/libc/md/md5c.c b/lib/libc/md/md5c.c
index d4c57966b38..a14c42d153c 100644
--- a/lib/libc/md/md5c.c
+++ b/lib/libc/md/md5c.c
@@ -23,7 +23,7 @@ documentation and/or software.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: md5c.c,v 1.12 2000/03/28 17:35:09 millert Exp $";
+static char rcsid[] = "$OpenBSD: md5c.c,v 1.13 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <string.h>
@@ -56,8 +56,8 @@ typedef unsigned char *POINTER;
 #define Encode memcpy
 #define Decode memcpy
 #else /* BIG_ENDIAN */
-static void Encode __P((void *, const void *, size_t));
-static void Decode __P((void *, const void *, size_t));
+static void Encode(void *, const void *, size_t);
+static void Decode(void *, const void *, size_t);
 #endif /* LITTLE_ENDIAN */
 
 static unsigned char PADDING[64] = {
diff --git a/lib/libc/net/ethers.c b/lib/libc/net/ethers.c
index 2c8328a9ba0..e7781438c1f 100644
--- a/lib/libc/net/ethers.c
+++ b/lib/libc/net/ethers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ethers.c,v 1.12 2001/06/27 00:58:54 lebel Exp $	*/
+/*	$OpenBSD: ethers.c,v 1.13 2002/02/16 21:27:23 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -34,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ethers.c,v 1.12 2001/06/27 00:58:54 lebel Exp $";
+static char rcsid[] = "$OpenBSD: ethers.c,v 1.13 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -57,7 +57,7 @@ static char rcsid[] = "$OpenBSD: ethers.c,v 1.12 2001/06/27 00:58:54 lebel Exp $
 #define _PATH_ETHERS	"/etc/ethers"
 #endif
 
-static char * _ether_aton __P((char *, struct ether_addr *));
+static char * _ether_aton(char *, struct ether_addr *);
 
 char *
 ether_ntoa(e)
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 5b36626ceb0..72183d260ba 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getaddrinfo.c,v 1.31 2002/01/02 23:00:10 deraadt Exp $	*/
+/*	$OpenBSD: getaddrinfo.c,v 1.32 2002/02/16 21:27:23 millert Exp $	*/
 /*	$KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $	*/
 
 /*
@@ -199,7 +199,7 @@ struct res_target {
 	int n;			/* result length */
 };
 
-static int str_isnumber __P((const char *));
+static int str_isnumber(const char *);
 static int explore_fqdn __P((const struct addrinfo *, const char *,
 	const char *, struct addrinfo **));
 static int explore_null __P((const struct addrinfo *,
@@ -212,32 +212,32 @@ static int get_canonname __P((const struct addrinfo *,
 	struct addrinfo *, const char *));
 static struct addrinfo *get_ai __P((const struct addrinfo *,
 	const struct afd *, const char *));
-static int get_portmatch __P((const struct addrinfo *, const char *));
-static int get_port __P((struct addrinfo *, const char *, int));
-static const struct afd *find_afd __P((int));
+static int get_portmatch(const struct addrinfo *, const char *);
+static int get_port(struct addrinfo *, const char *, int);
+static const struct afd *find_afd(int);
 #if 0
-static int addrconfig __P((const struct addrinfo *));
+static int addrconfig(const struct addrinfo *);
 #endif
 #ifdef INET6
-static int ip6_str2scopeid __P((char *, struct sockaddr_in6 *));
+static int ip6_str2scopeid(char *, struct sockaddr_in6 *);
 #endif
 
-static void _sethtent __P((void));
-static void _endhtent __P((void));
-static struct addrinfo * _gethtent __P((const char *, const struct addrinfo *));
+static void _sethtent(void);
+static void _endhtent(void);
+static struct addrinfo * _gethtent(const char *, const struct addrinfo *);
 static struct addrinfo *_files_getaddrinfo __P((const char *,
 	const struct addrinfo *));
 
 #ifdef YP
-static struct addrinfo *_yphostent __P((char *, const struct addrinfo *));
+static struct addrinfo *_yphostent(char *, const struct addrinfo *);
 static struct addrinfo *_yp_getaddrinfo __P((const char *,
 	const struct addrinfo *));
 #endif
 
 static struct addrinfo *getanswer __P((const querybuf *, int, const char *, int,
 	const struct addrinfo *));
-static int res_queryN __P((const char *, struct res_target *));
-static int res_searchN __P((const char *, struct res_target *));
+static int res_queryN(const char *, struct res_target *);
+static int res_searchN(const char *, struct res_target *);
 static int res_querydomainN __P((const char *, const char *,
 	struct res_target *));
 static struct addrinfo *_dns_getaddrinfo __P((const char *,
@@ -1037,7 +1037,7 @@ getanswer(answer, anslen, qname, qtype, pai)
 	int type, class, buflen, ancount, qdcount;
 	int haveanswer, had_error;
 	char tbuf[MAXDNAME];
-	int (*name_ok) __P((const char *));
+	int (*name_ok)(const char *);
 	char hostbuf[8*1024];
 
 	memset(&sentinel, 0, sizeof(sentinel));
@@ -1509,9 +1509,9 @@ _yp_getaddrinfo(name, pai)
 
 /* resolver logic */
 
-extern const char *__hostalias __P((const char *));
+extern const char *__hostalias(const char *);
 extern int h_errno;
-extern int res_opt __P((int, u_char *, int, int));
+extern int res_opt(int, u_char *, int, int);
 
 /*
  * Formulate a normal query, send, and await answer.
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index d7d6c621cf0..d4e3c5e6f00 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -52,7 +52,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.43 2001/06/27 00:58:55 lebel Exp $";
+static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.44 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -98,14 +98,14 @@ static union {
 static FILE *hostf = NULL;
 static int stayopen = 0;
 
-static void map_v4v6_address __P((const char *src, char *dst));
-static void map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len));
+static void map_v4v6_address(const char *src, char *dst);
+static void map_v4v6_hostent(struct hostent *hp, char **bp, int *len);
 
 #ifdef RESOLVSORT
-static void addrsort __P((char **, int));
+static void addrsort(char **, int);
 #endif
 
-int _hokchar __P((const char *));
+int _hokchar(const char *);
 
 static const char AskedForGot[] =
 			  "gethostby*.getanswer: asked for \"%s\", got \"%s\"";
@@ -175,7 +175,7 @@ getanswer(answer, anslen, qname, qtype)
 	int toobig = 0;
 	char tbuf[MAXDNAME];
 	const char *tname;
-	int (*name_ok) __P((const char *));
+	int (*name_ok)(const char *);
 
 	tname = qname;
 	host.h_name = NULL;
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index 0ae09ca30f6..c19603f2d17 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnameinfo.c,v 1.21 2001/11/15 04:56:15 itojun Exp $	*/
+/*	$OpenBSD: getnameinfo.c,v 1.22 2002/02/16 21:27:23 millert Exp $	*/
 /*	$KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $	*/
 
 /*
@@ -83,7 +83,7 @@ struct sockinet {
 #ifdef INET6
 static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
 				 size_t, int));
-static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int));
+static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
 #endif
 
 int
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index f755cd9b149..834ddf11ae2 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetnamadr.c,v 1.14 2001/06/27 00:58:55 lebel Exp $	*/
+/*	$OpenBSD: getnetnamadr.c,v 1.15 2002/02/16 21:27:23 millert Exp $	*/
 
 /*
  * Copyright (c) 1997, Jason Downs.  All rights reserved.
@@ -77,7 +77,7 @@ static char sccsid[] = "@(#)getnetbyaddr.c	8.1 (Berkeley) 6/4/93";
 static char sccsid_[] = "from getnetnamadr.c	1.4 (Coimbra) 93/06/03";
 static char rcsid[] = "$From: getnetnamadr.c,v 8.7 1996/08/05 08:31:35 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.14 2001/06/27 00:58:55 lebel Exp $";
+static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.15 2002/02/16 21:27:23 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -97,10 +97,10 @@ static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.14 2001/06/27 00:58:55 lebel
 
 extern int h_errno;
 
-struct netent *_getnetbyaddr __P((in_addr_t net, int type));
-struct netent *_getnetbyname __P((const char *name));
+struct netent *_getnetbyaddr(in_addr_t net, int type);
+struct netent *_getnetbyname(const char *name);
 
-int _hokchar __P((const char *));
+int _hokchar(const char *);
 
 #define BYADDR 0
 #define BYNAME 1
diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c
index 64d0d137680..00b8f6b22e6 100644
--- a/lib/libc/net/inet_ntop.c
+++ b/lib/libc/net/inet_ntop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $	*/
+/*	$OpenBSD: inet_ntop.c,v 1.2 2002/02/16 21:27:23 millert Exp $	*/
 
 /* Copyright (c) 1996 by Internet Software Consortium.
  *
@@ -20,7 +20,7 @@
 #if 0
 static char rcsid[] = "$From: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $";
+static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.2 2002/02/16 21:27:23 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -39,8 +39,8 @@ static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Ex
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
-static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
+static const char *inet_ntop4(const u_char *src, char *dst, size_t size);
+static const char *inet_ntop6(const u_char *src, char *dst, size_t size);
 
 /* char *
  * inet_ntop(af, src, dst, size)
diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c
index 0cb13baa31e..b04ef05c317 100644
--- a/lib/libc/net/inet_pton.c
+++ b/lib/libc/net/inet_pton.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_pton.c,v 1.3 1999/12/08 09:31:15 itojun Exp $	*/
+/*	$OpenBSD: inet_pton.c,v 1.4 2002/02/16 21:27:23 millert Exp $	*/
 
 /* Copyright (c) 1996 by Internet Software Consortium.
  *
@@ -20,7 +20,7 @@
 #if 0
 static char rcsid[] = "$From: inet_pton.c,v 8.7 1996/08/05 08:31:35 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.3 1999/12/08 09:31:15 itojun Exp $";
+static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -38,8 +38,8 @@ static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.3 1999/12/08 09:31:15 itojun Ex
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static int	inet_pton4 __P((const char *src, u_char *dst));
-static int	inet_pton6 __P((const char *src, u_char *dst));
+static int	inet_pton4(const char *src, u_char *dst);
+static int	inet_pton6(const char *src, u_char *dst);
 
 /* int
  * inet_pton(af, src, dst)
diff --git a/lib/libc/net/ns_addr.c b/lib/libc/net/ns_addr.c
index 7dcc988afeb..0d1b45858f8 100644
--- a/lib/libc/net/ns_addr.c
+++ b/lib/libc/net/ns_addr.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.6 2001/06/27 00:58:55 lebel Exp $";
+static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.7 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -45,8 +45,8 @@ static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.6 2001/06/27 00:58:55 lebel Exp $
 
 static struct ns_addr addr, zero_addr;
 
-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 *, u_int8_t *, int);
+static void cvtbase(long, int, int[], int, u_int8_t[], int);
 
 struct ns_addr 
 ns_addr(name)
diff --git a/lib/libc/net/ns_ntoa.c b/lib/libc/net/ns_ntoa.c
index c33f7109669..130ccd388bf 100644
--- a/lib/libc/net/ns_ntoa.c
+++ b/lib/libc/net/ns_ntoa.c
@@ -32,14 +32,14 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.7 1997/08/24 21:25:48 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.8 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <netns/ns.h>
 #include <stdio.h>
 
-static char *spectHex __P((char *));
+static char *spectHex(char *);
 
 char *
 ns_ntoa(addr)
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index a9fdc1b1d04..95d481a7f64 100644
--- a/lib/libc/net/rcmd.c
+++ b/lib/libc/net/rcmd.c
@@ -34,7 +34,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rcmd.c,v 1.39 2001/09/04 23:35:58 millert Exp $";
+static char *rcsid = "$OpenBSD: rcmd.c,v 1.40 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -57,11 +57,11 @@ static char *rcsid = "$OpenBSD: rcmd.c,v 1.39 2001/09/04 23:35:58 millert Exp $"
 #include <stdlib.h>
 #include <netgroup.h>
 
-int	__ivaliduser __P((FILE *, in_addr_t, const char *, const char *));
+int	__ivaliduser(FILE *, in_addr_t, const char *, const char *);
 int	__ivaliduser_sa __P((FILE *, struct sockaddr *, socklen_t,
 		const char *, const char *));
-static int __icheckhost __P((struct sockaddr *, socklen_t, const char *));
-static char *__gethostloop __P((struct sockaddr *, socklen_t));
+static int __icheckhost(struct sockaddr *, socklen_t, const char *);
+static char *__gethostloop(struct sockaddr *, socklen_t);
 
 int
 rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c
index c74e0339bad..121606ac489 100644
--- a/lib/libc/net/res_init.c
+++ b/lib/libc/net/res_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_init.c,v 1.24 2001/09/14 23:49:29 itojun Exp $	*/
+/*	$OpenBSD: res_init.c,v 1.25 2002/02/16 21:27:23 millert Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1989, 1993
@@ -64,7 +64,7 @@
 static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
 static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_init.c,v 1.24 2001/09/14 23:49:29 itojun Exp $";
+static char rcsid[] = "$OpenBSD: res_init.c,v 1.25 2002/02/16 21:27:23 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -109,12 +109,12 @@ static char rcsid[] = "$OpenBSD: res_init.c,v 1.24 2001/09/14 23:49:29 itojun Ex
  *   property.
  */
 
-static void res_setoptions __P((char *, char *));
+static void res_setoptions(char *, char *);
 
 #ifdef RESOLVSORT
 static const char sort_mask[] = "/&";
 #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask __P((struct in_addr));
+static u_int32_t net_mask(struct in_addr);
 #endif
 
 /*
diff --git a/lib/libc/net/res_query.c b/lib/libc/net/res_query.c
index 3cf79283027..24c07491a9a 100644
--- a/lib/libc/net/res_query.c
+++ b/lib/libc/net/res_query.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_query.c,v 1.16 2001/07/31 22:02:18 jakob Exp $	*/
+/*	$OpenBSD: res_query.c,v 1.17 2002/02/16 21:27:23 millert Exp $	*/
 
 /*
  * ++Copyright++ 1988, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_query.c,v 8.9 1996/09/22 00:13:28 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_query.c,v 1.16 2001/07/31 22:02:18 jakob Exp $";
+static char rcsid[] = "$OpenBSD: res_query.c,v 1.17 2002/02/16 21:27:23 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -85,9 +85,9 @@ static char rcsid[] = "$OpenBSD: res_query.c,v 1.16 2001/07/31 22:02:18 jakob Ex
 #define MAXPACKET	1024
 #endif
 
-const char *hostalias __P((const char *));
+const char *hostalias(const char *);
 int h_errno;
-extern int res_opt __P((int, u_char *, int, int));
+extern int res_opt(int, u_char *, int, int);
 
 /*
  * Formulate a normal query, send, and await answer.
diff --git a/lib/libc/net/res_random.c b/lib/libc/net/res_random.c
index a11241246d1..6a6a142e96b 100644
--- a/lib/libc/net/res_random.c
+++ b/lib/libc/net/res_random.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: res_random.c,v 1.9 2001/01/04 21:45:31 todd Exp $ */
+/* $OpenBSD: res_random.c,v 1.10 2002/02/16 21:27:23 millert Exp $ */
 
 /*
  * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@@ -92,8 +92,8 @@ static long ru_reseed;
 static u_int32_t tmp;                /* Storage for unused random */
 static struct timeval tv;
 
-static u_int16_t pmod __P((u_int16_t, u_int16_t, u_int16_t));
-static void res_initid __P((void));
+static u_int16_t pmod(u_int16_t, u_int16_t, u_int16_t);
+static void res_initid(void);
 
 /*
  * Do a fast modular exponation, returned value will be in the range
diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c
index ab50559de6e..81bf23ba9ff 100644
--- a/lib/libc/net/res_send.c
+++ b/lib/libc/net/res_send.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_send.c,v 1.10 2001/09/14 23:49:29 itojun Exp $	*/
+/*	$OpenBSD: res_send.c,v 1.11 2002/02/16 21:27:23 millert Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1989, 1993
@@ -64,7 +64,7 @@
 static char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_send.c,v 8.12 1996/10/08 04:51:06 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_send.c,v 1.10 2001/09/14 23:49:29 itojun Exp $";
+static char rcsid[] = "$OpenBSD: res_send.c,v 1.11 2002/02/16 21:27:23 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -126,8 +126,8 @@ static int af = 0;		/* address family of socket */
 		} else {}
 static char abuf[NI_MAXHOST];
 static char pbuf[NI_MAXSERV];
-static void Aerror __P((FILE *, char *, int, struct sockaddr *));
-static void Perror __P((FILE *, char *, int));
+static void Aerror(FILE *, char *, int, struct sockaddr *);
+static void Perror(FILE *, char *, int);
 
     static void
     Aerror(file, string, error, address)
@@ -186,7 +186,7 @@ res_send_setrhook(hook)
 }
 
 #ifdef INET6
-static struct sockaddr * get_nsaddr __P((size_t));
+static struct sockaddr * get_nsaddr(size_t);
 
 /*
  * pick appropriate nsaddr_list for use.  see res_init() for initialization.
diff --git a/lib/libc/nls/_catclose.c b/lib/libc/nls/_catclose.c
index d5c8aa258c8..4fab66e00b1 100644
--- a/lib/libc/nls/_catclose.c
+++ b/lib/libc/nls/_catclose.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _catclose.c,v 1.2 1996/08/19 08:30:01 tholo Exp $";
+static char rcsid[] = "$OpenBSD: _catclose.c,v 1.3 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
@@ -15,7 +15,7 @@ __indr_reference(_catclose,catclose);
 
 #include <nl_types.h>
 
-extern int _catclose __P((nl_catd));
+extern int _catclose(nl_catd);
 
 int
 catclose(catd)
diff --git a/lib/libc/nls/_catgets.c b/lib/libc/nls/_catgets.c
index 13e8d56d00b..c9bd9a5a347 100644
--- a/lib/libc/nls/_catgets.c
+++ b/lib/libc/nls/_catgets.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _catgets.c,v 1.2 1996/08/19 08:30:02 tholo Exp $";
+static char rcsid[] = "$OpenBSD: _catgets.c,v 1.3 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
@@ -15,7 +15,7 @@ __indr_reference(_catgets,catgets);
 
 #include <nl_types.h>
 
-extern char * _catgets __P((nl_catd, int, int, const char *));
+extern char * _catgets(nl_catd, int, int, const char *);
 
 char *
 catgets(catd, set_id, msg_id, s)
diff --git a/lib/libc/nls/_catopen.c b/lib/libc/nls/_catopen.c
index c146156edf7..a9dc798ddce 100644
--- a/lib/libc/nls/_catopen.c
+++ b/lib/libc/nls/_catopen.c
@@ -4,7 +4,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: _catopen.c,v 1.3 1996/09/15 09:31:21 tholo Exp $";
+static char rcsid[] = "$OpenBSD: _catopen.c,v 1.4 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/cdefs.h>
@@ -15,7 +15,7 @@ __indr_reference(_catopen,catopen);
 
 #include <nl_types.h>
 
-extern nl_catd _catopen __P((const char *, int));
+extern nl_catd _catopen(const char *, int);
 
 nl_catd
 catopen(name, oflag)
diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c
index 4b41b44e57a..53b1cec706b 100644
--- a/lib/libc/nls/catopen.c
+++ b/lib/libc/nls/catopen.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: catopen.c,v 1.9 2001/05/11 15:30:14 art Exp $";
+static char rcsid[] = "$OpenBSD: catopen.c,v 1.10 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #define _NLS_PRIVATE
@@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: catopen.c,v 1.9 2001/05/11 15:30:14 art Exp $";
 #define NLS_DEFAULT_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L"
 #define NLS_DEFAULT_LANG "C"
 
-static nl_catd load_msgcat __P((const char *));
+static nl_catd load_msgcat(const char *);
 
 /* ARGSUSED */
 nl_catd
diff --git a/lib/libc/ohash/ohash_do.c b/lib/libc/ohash/ohash_do.c
index efc3e9b2570..159b5999e74 100644
--- a/lib/libc/ohash/ohash_do.c
+++ b/lib/libc/ohash/ohash_do.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohash_do.c,v 1.2 2001/03/02 15:47:53 espie Exp $ */
+/* $OpenBSD: ohash_do.c,v 1.3 2002/02/16 21:27:23 millert Exp $ */
 /* ex:ts=8 sw=4: 
  */
 
@@ -31,7 +31,7 @@
 
 #include "ohash_int.h"
 
-static void ohash_resize __P((struct ohash *));
+static void ohash_resize(struct ohash *);
 
 static void 
 ohash_resize(h)
diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c
index 033a08d260e..2429e1331a7 100644
--- a/lib/libc/quad/qdivrem.c
+++ b/lib/libc/quad/qdivrem.c
@@ -36,7 +36,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.2 1996/08/19 08:30:42 tholo Exp $";
+static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.3 2002/02/16 21:27:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -58,7 +58,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/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
index cb42001bd9b..7f8740fd17c 100644
--- a/lib/libc/quad/quad.h
+++ b/lib/libc/quad/quad.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$OpenBSD: quad.h,v 1.2 1996/08/19 08:30:44 tholo Exp $
+ *	$OpenBSD: quad.h,v 1.3 2002/02/16 21:27:23 millert Exp $
  */
 
 /*
@@ -95,7 +95,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
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
index a815669ed66..d5f0d2f3e84 100644
--- a/lib/libc/regex/engine.c
+++ b/lib/libc/regex/engine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: engine.c,v 1.4 1997/04/28 20:44:57 millert Exp $	*/
+/*	$OpenBSD: engine.c,v 1.5 2002/02/16 21:27:24 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
@@ -40,7 +40,7 @@
  */
 
 #if defined(SNAMES) && defined(LIBC_SCCS) && !defined(lint)
-static char enginercsid[] = "$OpenBSD: engine.c,v 1.4 1997/04/28 20:44:57 millert Exp $";
+static char enginercsid[] = "$OpenBSD: engine.c,v 1.5 2002/02/16 21:27:24 millert Exp $";
 #endif /* SNAMES and LIBC_SCCS and not lint */
 
 /*
@@ -96,12 +96,12 @@ extern "C" {
 #endif
 
 /* === engine.c === */
-static int matcher __P((struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags));
-static char *dissect __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static char *backref __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev));
-static char *fast __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static char *slow __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst));
-static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft));
+static int matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
+static char *dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static char *backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
+static char *fast(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static char *slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
+static states step(struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft);
 #define	BOL	(OUT+1)
 #define	EOL	(BOL+1)
 #define	BOLEOL	(BOL+2)
@@ -112,13 +112,13 @@ static states step __P((struct re_guts *g, sopno start, sopno stop, states bef,
 #define	NONCHAR(c)	((c) > CHAR_MAX)
 #define	NNONCHAR	(CODEMAX-CHAR_MAX)
 #ifdef REDEBUG
-static void print __P((struct match *m, char *caption, states st, int ch, FILE *d));
+static void print(struct match *m, char *caption, states st, int ch, FILE *d);
 #endif
 #ifdef REDEBUG
-static void at __P((struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst));
+static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
 #endif
 #ifdef REDEBUG
-static char *pchar __P((int ch));
+static char *pchar(int ch);
 #endif
 
 #ifdef __cplusplus
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index c614b0be2aa..10224be9240 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 #else
-static char rcsid[] = "$OpenBSD: regcomp.c,v 1.7 2001/11/01 23:27:28 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: regcomp.c,v 1.8 2002/02/16 21:27:24 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -83,43 +83,43 @@ extern "C" {
 #endif
 
 /* === regcomp.c === */
-static void p_ere __P((struct parse *p, int stop));
-static void p_ere_exp __P((struct parse *p));
-static void p_str __P((struct parse *p));
-static void p_bre __P((struct parse *p, int end1, int end2));
-static int p_simp_re __P((struct parse *p, int starordinary));
-static int p_count __P((struct parse *p));
-static void p_bracket __P((struct parse *p));
-static void p_b_term __P((struct parse *p, cset *cs));
-static void p_b_cclass __P((struct parse *p, cset *cs));
-static void p_b_eclass __P((struct parse *p, cset *cs));
-static char p_b_symbol __P((struct parse *p));
-static char p_b_coll_elem __P((struct parse *p, int endc));
-static char othercase __P((int ch));
-static void bothcases __P((struct parse *p, int ch));
-static void ordinary __P((struct parse *p, int ch));
-static void nonnewline __P((struct parse *p));
-static void repeat __P((struct parse *p, sopno start, int from, int to));
-static int seterr __P((struct parse *p, int e));
-static cset *allocset __P((struct parse *p));
-static void freeset __P((struct parse *p, cset *cs));
-static int freezeset __P((struct parse *p, cset *cs));
-static int firstch __P((struct parse *p, cset *cs));
-static int nch __P((struct parse *p, cset *cs));
-static void mcadd __P((struct parse *p, cset *cs, char *cp));
-static void mcinvert __P((struct parse *p, cset *cs));
-static void mccase __P((struct parse *p, cset *cs));
-static int isinsets __P((struct re_guts *g, int c));
-static int samesets __P((struct re_guts *g, int c1, int c2));
-static void categorize __P((struct parse *p, struct re_guts *g));
-static sopno dupl __P((struct parse *p, sopno start, sopno finish));
-static void doemit __P((struct parse *p, sop op, size_t opnd));
-static void doinsert __P((struct parse *p, sop op, size_t opnd, sopno pos));
-static void dofwd __P((struct parse *p, sopno pos, sop value));
-static void enlarge __P((struct parse *p, sopno size));
-static void stripsnug __P((struct parse *p, struct re_guts *g));
-static void findmust __P((struct parse *p, struct re_guts *g));
-static sopno pluscount __P((struct parse *p, struct re_guts *g));
+static void p_ere(struct parse *p, int stop);
+static void p_ere_exp(struct parse *p);
+static void p_str(struct parse *p);
+static void p_bre(struct parse *p, int end1, int end2);
+static int p_simp_re(struct parse *p, int starordinary);
+static int p_count(struct parse *p);
+static void p_bracket(struct parse *p);
+static void p_b_term(struct parse *p, cset *cs);
+static void p_b_cclass(struct parse *p, cset *cs);
+static void p_b_eclass(struct parse *p, cset *cs);
+static char p_b_symbol(struct parse *p);
+static char p_b_coll_elem(struct parse *p, int endc);
+static char othercase(int ch);
+static void bothcases(struct parse *p, int ch);
+static void ordinary(struct parse *p, int ch);
+static void nonnewline(struct parse *p);
+static void repeat(struct parse *p, sopno start, int from, int to);
+static int seterr(struct parse *p, int e);
+static cset *allocset(struct parse *p);
+static void freeset(struct parse *p, cset *cs);
+static int freezeset(struct parse *p, cset *cs);
+static int firstch(struct parse *p, cset *cs);
+static int nch(struct parse *p, cset *cs);
+static void mcadd(struct parse *p, cset *cs, char *cp);
+static void mcinvert(struct parse *p, cset *cs);
+static void mccase(struct parse *p, cset *cs);
+static int isinsets(struct re_guts *g, int c);
+static int samesets(struct re_guts *g, int c1, int c2);
+static void categorize(struct parse *p, struct re_guts *g);
+static sopno dupl(struct parse *p, sopno start, sopno finish);
+static void doemit(struct parse *p, sop op, size_t opnd);
+static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
+static void dofwd(struct parse *p, sopno pos, sop value);
+static void enlarge(struct parse *p, sopno size);
+static void stripsnug(struct parse *p, struct re_guts *g);
+static void findmust(struct parse *p, struct re_guts *g);
+static sopno pluscount(struct parse *p, struct re_guts *g);
 
 #ifdef __cplusplus
 }
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index a5c26f60122..da328c41f25 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 #else
-static char rcsid[] = "$OpenBSD: regerror.c,v 1.6 2001/06/27 00:58:55 lebel Exp $";
+static char rcsid[] = "$OpenBSD: regerror.c,v 1.7 2002/02/16 21:27:24 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -61,7 +61,7 @@ extern "C" {
 #endif
 
 /* === regerror.c === */
-static char *regatoi __P((const regex_t *preg, char *localbuf));
+static char *regatoi(const regex_t *preg, char *localbuf);
 
 #ifdef __cplusplus
 }
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index a4e28364391..05f5ee848e6 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint) 
-static char *rcsid = "$OpenBSD: svc.c,v 1.14 2001/09/15 13:51:01 deraadt Exp $";
+static char *rcsid = "$OpenBSD: svc.c,v 1.15 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -416,7 +416,7 @@ svc_getreq(rdfds)
 	svc_getreqset(&readfds);
 }
 
-void	svc_getreqset2 __P((fd_set *, int));
+void	svc_getreqset2(fd_set *, int);
 
 void
 svc_getreqset(readfds)
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index 600c7f03c88..754605c0117 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc_run.c,v 1.11 1999/11/23 22:37:28 deraadt Exp $";
+static char *rcsid = "$OpenBSD: svc_run.c,v 1.12 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -45,7 +45,7 @@ static char *rcsid = "$OpenBSD: svc_run.c,v 1.11 1999/11/23 22:37:28 deraadt Exp
 extern int __svc_fdsetsize;
 extern fd_set *__svc_fdset;
 
-void svc_getreqset2 __P((fd_set *, int));
+void svc_getreqset2(fd_set *, int);
 
 void
 svc_run()
diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c
index 50dbc879a77..bf456045543 100644
--- a/lib/libc/rpc/svc_udp.c
+++ b/lib/libc/rpc/svc_udp.c
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: svc_udp.c,v 1.10 2001/09/15 13:51:01 deraadt Exp $";
+static char *rcsid = "$OpenBSD: svc_udp.c,v 1.11 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -57,8 +57,8 @@ static bool_t		svcudp_getargs(SVCXPRT *, xdrproc_t, caddr_t);
 static bool_t		svcudp_reply(SVCXPRT *, struct rpc_msg *);
 static bool_t		svcudp_freeargs(SVCXPRT *, xdrproc_t, caddr_t);
 static void		svcudp_destroy(SVCXPRT *);
-static void		cache_set __P((SVCXPRT *, u_long));
-static int		cache_get __P((SVCXPRT *, struct rpc_msg *, char **, u_long *));
+static void		cache_set(SVCXPRT *, u_long);
+static int		cache_get(SVCXPRT *, struct rpc_msg *, char **, u_long *);
 
 static struct xp_ops svcudp_op = {
 	svcudp_recv,
diff --git a/lib/libc/rpc/xdr_rec.c b/lib/libc/rpc/xdr_rec.c
index d77bdca7254..347cc5c7100 100644
--- a/lib/libc/rpc/xdr_rec.c
+++ b/lib/libc/rpc/xdr_rec.c
@@ -27,7 +27,7 @@
  * Mountain View, California  94043
  */
 #if defined(LIBC_SCCS) && !defined(lint) 
-static char *rcsid = "$OpenBSD: xdr_rec.c,v 1.8 2001/09/15 13:51:01 deraadt Exp $";
+static char *rcsid = "$OpenBSD: xdr_rec.c,v 1.9 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -95,7 +95,7 @@ typedef struct rec_strm {
 	/*
 	 * out-goung bits
 	 */
-	int (*writeit) __P((caddr_t, caddr_t, int));
+	int (*writeit)(caddr_t, caddr_t, int);
 	caddr_t out_base;	/* output buffer (points to frag header) */
 	caddr_t out_finger;	/* next output position */
 	caddr_t out_boundry;	/* data cannot up to this address */
@@ -104,7 +104,7 @@ typedef struct rec_strm {
 	/*
 	 * in-coming bits
 	 */
-	int (*readit) __P((caddr_t, caddr_t, int));
+	int (*readit)(caddr_t, caddr_t, int);
 	u_long in_size;	/* fixed size of the input buffer */
 	caddr_t in_base;
 	caddr_t in_finger;	/* location of next byte to be had */
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
index 8063c6a0d9b..3a2881d9767 100644
--- a/lib/libc/stdio/fseek.c
+++ b/lib/libc/stdio/fseek.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fseek.c,v 1.3 2000/02/21 22:11:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: fseek.c,v 1.4 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -58,7 +58,7 @@ fseeko(fp, offset, whence)
 	off_t offset;
 	int whence;
 {
-	register fpos_t (*seekfn) __P((void *, fpos_t, int));
+	register fpos_t (*seekfn)(void *, fpos_t, int);
 	fpos_t target, curoff;
 	size_t n;
 	struct stat st;
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 53af82defae..8efe61030ef 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.h,v 1.2 1996/08/19 08:32:54 tholo Exp $	*/
+/*	$OpenBSD: local.h,v 1.3 2002/02/16 21:27:24 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -41,21 +41,21 @@
  * in particular, macros and private variables.
  */
 
-int	__sflush __P((FILE *));
-FILE	*__sfp __P((void));
-int	__srefill __P((FILE *));
-int	__sread __P((void *, char *, int));
-int	__swrite __P((void *, char const *, int));
-fpos_t	__sseek __P((void *, fpos_t, int));
-int	__sclose __P((void *));
-void	__sinit __P((void));
-void	_cleanup __P((void));
-void	(*__cleanup) __P((void));
-void	__smakebuf __P((FILE *));
-int	__swhatbuf __P((FILE *, size_t *, int *));
+int	__sflush(FILE *);
+FILE	*__sfp(void);
+int	__srefill(FILE *);
+int	__sread(void *, char *, int);
+int	__swrite(void *, char const *, int);
+fpos_t	__sseek(void *, fpos_t, int);
+int	__sclose(void *);
+void	__sinit(void);
+void	_cleanup(void);
+void	(*__cleanup)(void);
+void	__smakebuf(FILE *);
+int	__swhatbuf(FILE *, size_t *, int *);
 int	_fwalk __P((int (*)(FILE *)));
-int	__swsetup __P((FILE *));
-int	__sflags __P((const char *, int *));
+int	__swsetup(FILE *);
+int	__sflags(const char *, int *);
 
 extern int __sdidinit;
 
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
index 875c3ca2298..477328d268e 100644
--- a/lib/libc/stdio/mktemp.c
+++ b/lib/libc/stdio/mktemp.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: mktemp.c,v 1.14 2002/01/02 20:18:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mktemp.c,v 1.15 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -44,7 +44,7 @@ static char rcsid[] = "$OpenBSD: mktemp.c,v 1.14 2002/01/02 20:18:32 deraadt Exp
 #include <ctype.h>
 #include <unistd.h>
 
-static int _gettemp __P((char *, int *, int, int));
+static int _gettemp(char *, int *, int, int);
 
 int
 mkstemps(path, slen)
@@ -72,7 +72,7 @@ mkdtemp(path)
 	return(_gettemp(path, (int *)NULL, 1, 0) ? path : (char *)NULL);
 }
 
-char *_mktemp __P((char *));
+char *_mktemp(char *);
 
 char *
 _mktemp(path)
diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c
index 2eceac1511b..5c683d982ac 100644
--- a/lib/libc/stdio/perror.c
+++ b/lib/libc/stdio/perror.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: perror.c,v 1.3 1998/09/10 06:44:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: perror.c,v 1.4 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: perror.c,v 1.3 1998/09/10 06:44:53 deraadt Exp
  * internal function __strerror().
  */
 
-extern char *__strerror __P((int , char *));
+extern char *__strerror(int , char *);
 
 void
 perror(s)
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
index 80af80f790b..3721eaf89cc 100644
--- a/lib/libc/stdio/tempnam.c
+++ b/lib/libc/stdio/tempnam.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tempnam.c,v 1.10 2001/07/09 06:57:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tempnam.c,v 1.11 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: tempnam.c,v 1.10 2001/07/09 06:57:44 deraadt Ex
 __warn_references(tempnam,
     "warning: tempnam() possibly used unsafely; consider using mkstemp()");
 
-extern char *_mktemp __P((char *));
+extern char *_mktemp(char *);
 
 char *
 tempnam(dir, pfx)
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
index d209e3c1c42..be841cce470 100644
--- a/lib/libc/stdio/tmpnam.c
+++ b/lib/libc/stdio/tmpnam.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.6 1997/04/03 05:31:38 millert Exp $";
+static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.7 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.6 1997/04/03 05:31:38 millert Exp
 __warn_references(tmpnam,
     "warning: tmpnam() possibly used unsafely; consider using mkstemp()");
 
-extern char *_mktemp __P((char *));
+extern char *_mktemp(char *);
 
 char *
 tmpnam(s)
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
index fa60aafac09..3e728d53096 100644
--- a/lib/libc/stdio/ungetc.c
+++ b/lib/libc/stdio/ungetc.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: ungetc.c,v 1.3 2001/07/09 06:57:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ungetc.c,v 1.4 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
@@ -43,7 +43,7 @@ static char rcsid[] = "$OpenBSD: ungetc.c,v 1.3 2001/07/09 06:57:45 deraadt Exp
 #include <string.h>
 #include "local.h"
 
-static int __submore __P((FILE *));
+static int __submore(FILE *);
 /*
  * Expand the ungetc buffer `in place'.  That is, adjust fp->_p when
  * the buffer moves, so that it points the same distance from the end,
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index e97114d2213..086547819ea 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: vfprintf.c,v 1.14 2001/12/05 10:20:06 deraadt Exp $";
+static char *rcsid = "$OpenBSD: vfprintf.c,v 1.15 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -130,8 +130,8 @@ __sbprintf(fp, fmt, ap)
 #define	BUF		(MAXEXP+MAXFRACT+1)	/* + decimal point */
 #define	DEFPREC		6
 
-static char *cvt __P((double, int, int, char *, int *, int, int *));
-static int exponent __P((char *, int, int));
+static char *cvt(double, int, int, char *, int *, int, int *);
+static int exponent(char *, int, int);
 
 #else /* no FLOATING_POINT */
 #define	BUF		40
@@ -1094,7 +1094,7 @@ __grow_type_table(typetable, tablesize)
  
 #ifdef FLOATING_POINT
 
-extern char *__dtoa __P((double, int, int, int *, int *, char **));
+extern char *__dtoa(double, int, int, int *, int *, char **);
 
 static char *
 cvt(value, ndigits, flags, sign, decpt, ch, length)
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
index eeef9bffc66..1903202b6c2 100644
--- a/lib/libc/stdlib/bsearch.c
+++ b/lib/libc/stdlib/bsearch.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: bsearch.c,v 1.2 1996/08/19 08:33:26 tholo Exp $";
+static char *rcsid = "$OpenBSD: bsearch.c,v 1.3 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
@@ -59,7 +59,7 @@ bsearch(key, base0, nmemb, size, compar)
 	const void *base0;
 	size_t nmemb;
 	register size_t size;
-	register int (*compar) __P((const void *, const void *));
+	register int (*compar)(const void *, const void *);
 {
 	register const char *base = base0;
 	register int lim, cmp;
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
index e3e4392e055..2770e5b977c 100644
--- a/lib/libc/stdlib/heapsort.c
+++ b/lib/libc/stdlib/heapsort.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: heapsort.c,v 1.2 1996/08/19 08:33:32 tholo Exp $";
+static char *rcsid = "$OpenBSD: heapsort.c,v 1.3 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -141,7 +141,7 @@ int
 heapsort(vbase, nmemb, size, compar)
 	void *vbase;
 	size_t nmemb, size;
-	int (*compar) __P((const void *, const void *));
+	int (*compar)(const void *, const void *);
 {
 	register int cnt, i, j, l;
 	register char tmp, *tmp1, *tmp2;
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 6fae6fe5651..bca7bb7c4e1 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -8,7 +8,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: malloc.c,v 1.46 2002/01/23 20:42:24 fgsch Exp $";
+static char rcsid[] = "$OpenBSD: malloc.c,v 1.47 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -88,7 +88,7 @@ static char rcsid[] = "$OpenBSD: malloc.c,v 1.46 2002/01/23 20:42:24 fgsch Exp $
     * we use the unwrapped syscall _thread_sys_write()
     */
 #  define write _thread_sys_write
-   ssize_t write __P((int, const void *, size_t));
+   ssize_t write(int, const void *, size_t);
 #   undef malloc
 #   undef realloc
 #   undef free
@@ -243,7 +243,7 @@ static int malloc_utrace;
 
 struct ut { void *p; size_t s; void *r; };
 
-void utrace __P((struct ut *, int));
+void utrace(struct ut *, int);
 
 #define UTRACE(a, b, c) \
 	if (malloc_utrace) \
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index 0a1015ad9dd..345eb2fd8ba 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: merge.c,v 1.3 1996/09/15 09:31:50 tholo Exp $";
+static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -99,7 +99,7 @@ mergesort(base, nmemb, size, cmp)
 	void *base;
 	size_t nmemb;
 	register size_t size;
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp)(const void *, const void *);
 {
 	register int i, sense;
 	int big, iflag;
@@ -257,7 +257,7 @@ COPY:	    			b = t;
 void
 setup(list1, list2, n, size, cmp)
 	size_t n, size;
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp)(const void *, const void *);
 	u_char *list1, *list2;
 {
 	int i, length, size2, tmp, sense;
@@ -332,7 +332,7 @@ static void
 insertionsort(a, n, size, cmp)
 	u_char *a;
 	size_t n, size;
-	int (*cmp) __P((const void *, const void *));
+	int (*cmp)(const void *, const void *);
 {
 	u_char *ai, *s, *t, *u, tmp;
 	int i;
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index 1c3020b5958..d16ed7b0bd7 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -32,14 +32,14 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: qsort.c,v 1.5 1997/06/20 11:19:38 deraadt Exp $";
+static char *rcsid = "$OpenBSD: qsort.c,v 1.6 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <stdlib.h>
 
 static __inline char	*med3 __P((char *, char *, char *, int (*)()));
-static __inline void	 swapfunc __P((char *, char *, int, int));
+static __inline void	 swapfunc(char *, char *, int, int);
 
 #define min(a, b)	(a) < (b) ? a : b
 
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
index 41ed9624663..40d7c0789f6 100644
--- a/lib/libc/stdlib/radixsort.c
+++ b/lib/libc/stdlib/radixsort.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: radixsort.c,v 1.3 1996/08/19 08:33:44 tholo Exp $";
+static char *rcsid = "$OpenBSD: radixsort.c,v 1.4 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -61,8 +61,8 @@ typedef struct {
 } stack;
 
 static __inline void simplesort
-	    __P((const u_char **, int, int, const u_char *, u_int));
-static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int));
+(const u_char **, int, int, const u_char *, u_int);
+static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
 static void r_sort_b __P((const u_char **,
 	    const u_char **, int, int, const u_char *, u_int));
 
diff --git a/lib/libc/stdlib/rand48.h b/lib/libc/stdlib/rand48.h
index e7cb3e03330..afa49f65f3c 100644
--- a/lib/libc/stdlib/rand48.h
+++ b/lib/libc/stdlib/rand48.h
@@ -10,7 +10,7 @@
  * of any kind. I shall in no event be liable for anything that happens
  * to anyone/anything when using this software.
  *
- *	$OpenBSD: rand48.h,v 1.2 1996/08/19 08:33:45 tholo Exp $
+ *	$OpenBSD: rand48.h,v 1.3 2002/02/16 21:27:24 millert Exp $
  */
 
 #ifndef _RAND48_H_
@@ -19,7 +19,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-void		__dorand48 __P((unsigned short[3]));
+void		__dorand48(unsigned short[3]);
 
 #define	RAND48_SEED_0	(0x330e)
 #define	RAND48_SEED_1	(0xabcd)
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
index 9e5bd4b0f25..5c3b8c17f57 100644
--- a/lib/libc/stdlib/tfind.c
+++ b/lib/libc/stdlib/tfind.c
@@ -22,7 +22,7 @@ void *
 tfind(vkey, vrootp, compar)
 	const void	*vkey;		/* key to be found */
 	void		*const *vrootp;	/* address of the tree root */
-	int		(*compar) __P((const void *, const void *));
+	int		(*compar)(const void *, const void *);
 {
     char *key = (char *)vkey;
     node **rootp = (node **)vrootp;
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index 562ace1845b..0ad5866172a 100644
--- a/lib/libc/stdlib/tsearch.c
+++ b/lib/libc/stdlib/tsearch.c
@@ -23,7 +23,7 @@ void *
 tsearch(vkey, vrootp, compar)
 	const void 	*vkey;		/* key to be located */
 	void		**vrootp;	/* address of tree root */
-	int		(*compar) __P((const void *, const void *));
+	int		(*compar)(const void *, const void *);
 {
     register node *q;
     char *key = (char *)vkey;
@@ -54,7 +54,7 @@ void *
 tdelete(vkey, vrootp, compar)
 	const void	*vkey;		/* key to be deleted */
 	void		**vrootp;	/* address of the root of tree */
-	int		(*compar) __P((const void *, const void *));
+	int		(*compar)(const void *, const void *);
 {
     node **rootp = (node **)vrootp;
     char *key = (char *)vkey;
@@ -117,7 +117,7 @@ trecurse(root, action, level)
 void
 twalk(vroot, action)
 	const void	*vroot;		/* Root of the tree to be walked */
-	void		(*action) __P((const void *, VISIT, int));
+	void		(*action)(const void *, VISIT, int);
 {
     node *root = (node *)vroot;
 
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
index 0e2690c3dd4..b884a67df39 100644
--- a/lib/libc/string/strerror.c
+++ b/lib/libc/string/strerror.c
@@ -32,7 +32,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strerror.c,v 1.2 1996/08/19 08:34:17 tholo Exp $";
+static char *rcsid = "$OpenBSD: strerror.c,v 1.3 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <string.h>
@@ -44,7 +44,7 @@ static char *rcsid = "$OpenBSD: strerror.c,v 1.2 1996/08/19 08:34:17 tholo Exp $
  * internal function __strerror().
  */
 
-extern char *__strerror __P((int, char *));
+extern char *__strerror(int, char *);
 
 char *
 strerror(num)
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
index cf03af5963e..90118f70f94 100644
--- a/lib/libc/string/strsignal.c
+++ b/lib/libc/string/strsignal.c
@@ -32,13 +32,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strsignal.c,v 1.2 1996/08/19 08:34:25 tholo Exp $";
+static char *rcsid = "$OpenBSD: strsignal.c,v 1.3 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <string.h>
 #include <limits.h>
 
-extern char *__strsignal __P((int, char *));
+extern char *__strsignal(int, char *);
 
 char *
 strsignal(sig)
diff --git a/lib/libc/sys/ptrace.c b/lib/libc/sys/ptrace.c
index 5e95a94941c..f0d02dd7ae5 100644
--- a/lib/libc/sys/ptrace.c
+++ b/lib/libc/sys/ptrace.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ptrace.c,v 1.1 1999/02/01 08:13:01 d Exp $	*/
+/*	$OpenBSD: ptrace.c,v 1.2 2002/02/16 21:27:24 millert Exp $	*/
 /* David Leonard <d@openbsd.org>, 1999. Public domain. */
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <sys/errno.h>
 
-int _ptrace __P((int, pid_t, caddr_t, int));
+int _ptrace(int, pid_t, caddr_t, int);
 
 int
 ptrace(request, pid, addr, data)
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 584332ac478..45e60a6928d 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sigaction.2,v 1.30 2002/01/07 16:16:32 millert Exp $
+.\"	$OpenBSD: sigaction.2,v 1.31 2002/02/16 21:27:24 millert Exp $
 .\"	$NetBSD: sigaction.2,v 1.7 1995/10/12 15:41:16 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -46,8 +46,8 @@
 
 struct sigaction {
 	union {		/* signal handler */
-		void	(*__sa_handler) __P((int));
-		void	(*__sa_sigaction) __P((int, siginfo_t *, void *));
+		void	(*__sa_handler)(int);
+		void	(*__sa_sigaction)(int, siginfo_t *, void *);
 	} __sigaction_u;
 	sigset_t sa_mask;          /* signal mask to apply */
 	int	 sa_flags;         /* see signal options below */
diff --git a/lib/libc/time/strptime.c b/lib/libc/time/strptime.c
index b4e5d31ec74..5b56e23e953 100644
--- a/lib/libc/time/strptime.c
+++ b/lib/libc/time/strptime.c
@@ -36,7 +36,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: strptime.c,v 1.7 2001/08/23 16:32:19 espie Exp $";
+static char rcsid[] = "$OpenBSD: strptime.c,v 1.8 2002/02/16 21:27:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/localedef.h>
@@ -57,8 +57,8 @@ static char rcsid[] = "$OpenBSD: strptime.c,v 1.7 2001/08/23 16:32:19 espie Exp
 #define	_LEGAL_ALT(x)		{ if (alt_format & ~(x)) return (0); }
 
 
-static	int _conv_num __P((const char **, int *, int, int));
-static	char *_strptime __P((const char *, const char *, struct tm *, int));
+static	int _conv_num(const char **, int *, int, int);
+static	char *_strptime(const char *, const char *, struct tm *, int);
 
 
 char *
diff --git a/lib/libc/yp/ypinternal.h b/lib/libc/yp/ypinternal.h
index 8e89ed28935..eb842d71935 100644
--- a/lib/libc/yp/ypinternal.h
+++ b/lib/libc/yp/ypinternal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypinternal.h,v 1.2 1996/09/15 09:32:00 tholo Exp $	 */
+/*	$OpenBSD: ypinternal.h,v 1.3 2002/02/16 21:27:25 millert Exp $	 */
 
 /*
  * Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
@@ -49,15 +49,15 @@ struct dom_binding {
 #define BINDINGDIR	"/var/yp/binding"
 #define YPBINDLOCK	"/var/run/ypbind.lock"
 
-int (*ypresp_allfn) __P((u_long, char *, int, char *, int, void *));
+int (*ypresp_allfn)(u_long, char *, int, char *, int, void *);
 void *ypresp_data;
 
 extern struct dom_binding *_ypbindlist;
 extern char _yp_domain[MAXHOSTNAMELEN];
 extern int _yplib_timeout;
 
-void _yp_unbind __P((struct dom_binding *));
-int _yp_check __P((char **));
+void _yp_unbind(struct dom_binding *);
+int _yp_check(char **);
 
 #ifdef YPMATCHCACHE
author	millert <millert@openbsd.org>	2002-02-16 21:27:05 +0000
committer	millert <millert@openbsd.org>	2002-02-16 21:27:05 +0000
commit	c72b5b24e14c03dd8b22104fbae0d3921fa2aa37 (patch)
tree	1ac67aab11df5f96856c0e3015d691db7dc9e811 /lib/libc
parent	default to rsa keyfile path for non key generation operations where (diff)
download	wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.tar.xz wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.zip