Manual cleanup of remaining userland __P use (excluding packages maintained outside the tree)

36 files changed, 238 insertions, 292 deletions

diff --git a/lib/csu/sparc64/crt0.c b/lib/csu/sparc64/crt0.c
index bc0b88d99fa..5c776bc708f 100644
--- a/lib/csu/sparc64/crt0.c
+++ b/lib/csu/sparc64/crt0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crt0.c,v 1.3 2002/02/16 21:27:20 millert Exp $	*/
+/*	$OpenBSD: crt0.c,v 1.4 2002/02/17 19:42:22 millert Exp $	*/
 
 /*
  * Copyright (c) 1995 Christopher G. Demetriou
@@ -59,7 +59,7 @@ __start:
 ");
 
 
-void ___start __P((char **, void (*)(void), const void *));
+void ___start(char **, void (*)(void), const void *);
 
 void
 ___start(char **sp, void (*cleanup)(void), const void *obj)
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
index e985a9aa0ba..4c083ecdd51 100644
--- a/lib/libc/db/btree/extern.h
+++ b/lib/libc/db/btree/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.6 2002/02/17 19:42:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -54,8 +54,8 @@ 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_split(BTREE *, PAGE *,
+	    const DBT *, const DBT *, int, size_t, u_int32_t);
 int	 __bt_sync(const DB *, u_int);
 
 int	 __ovfl_delete(BTREE *, void *);
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
index 03ef3964fde..8ac029b6726 100644
--- a/lib/libc/db/hash/extern.h
+++ b/lib/libc/db/hash/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.6 2002/02/17 19:42:22 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -41,8 +41,8 @@ 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	 __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
+	    int, u_int32_t, SPLIT_RETURN *);
 int	 __buf_free(HTAB *, int, int);
 void	 __buf_init(HTAB *, int);
 u_int32_t	 __call_hash(HTAB *, char *, int);
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
index a4976fc0b05..235cba4d130 100644
--- a/lib/libc/gen/getnetgrent.c
+++ b/lib/libc/gen/getnetgrent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetgrent.c,v 1.11 2002/02/16 21:27:22 millert Exp $	*/
+/*	$OpenBSD: getnetgrent.c,v 1.12 2002/02/17 19:42: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.11 2002/02/16 21:27:22 millert Exp $";
+static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.12 2002/02/17 19:42:22 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -72,15 +72,14 @@ 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 *,
-				      char *, const char *,
-				      const char *, const char *));
-static char		*in_lookup1 __P((const char *, const char *,
-					 const char *, int));
-static int		 in_lookup __P((const char *, const char *,
-					const char *, const char *, int));
+static int		 in_check(const char *, const char *,
+			    const char *, struct netgroup *);
+static int		 in_find(char *, struct stringlist *,
+			    char *, const char *, const char *, const char *);
+static char		*in_lookup1(const char *, const char *,
+			    const char *, int);
+static int		 in_lookup(const char *, const char *,
+			    const char *, const char *, int);
 
 /*
  * _ng_sl_init(): Initialize a string list
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 3048ee8318f..aa918f41a8a 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.17 2002/02/16 21:27:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.18 2002/02/17 19:42:22 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -138,10 +138,10 @@ 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	 glob2(Char *, Char *, Char *, Char *, Char *, Char *,
+		    glob_t *, size_t *);
+static int	 glob3(Char *, Char *, Char *, Char *, Char *, Char *,
+		    Char *, Char *, glob_t *, size_t *);
 static int	 globextend(const Char *, glob_t *, size_t *);
 static const Char *
 		 globtilde(const Char *, Char *, size_t, glob_t *);
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 72183d260ba..d16900b4a0e 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getaddrinfo.c,v 1.32 2002/02/16 21:27:23 millert Exp $	*/
+/*	$OpenBSD: getaddrinfo.c,v 1.33 2002/02/17 19:42:23 millert Exp $	*/
 /*	$KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $	*/
 
 /*
@@ -200,18 +200,18 @@ struct res_target {
 };
 
 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 *,
-	const char *, struct addrinfo **));
-static int explore_numeric __P((const struct addrinfo *, const char *,
-	const char *, struct addrinfo **));
-static int explore_numeric_scope __P((const struct addrinfo *, const char *,
-	const char *, struct addrinfo **));
-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 explore_fqdn(const struct addrinfo *, const char *,
+	const char *, struct addrinfo **);
+static int explore_null(const struct addrinfo *,
+	const char *, struct addrinfo **);
+static int explore_numeric(const struct addrinfo *, const char *,
+	const char *, struct addrinfo **);
+static int explore_numeric_scope(const struct addrinfo *, const char *,
+	const char *, struct addrinfo **);
+static int get_canonname(const struct addrinfo *,
+	struct addrinfo *, const char *);
+static struct addrinfo *get_ai(const struct addrinfo *,
+	const struct afd *, const char *);
 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);
@@ -225,23 +225,21 @@ static int ip6_str2scopeid(char *, struct sockaddr_in6 *);
 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 *));
+static struct addrinfo *_files_getaddrinfo(const char *,
+	const struct addrinfo *);
 
 #ifdef YP
 static struct addrinfo *_yphostent(char *, const struct addrinfo *);
-static struct addrinfo *_yp_getaddrinfo __P((const char *,
-	const struct addrinfo *));
+static struct addrinfo *_yp_getaddrinfo(const char *,
+	const struct addrinfo *);
 #endif
 
-static struct addrinfo *getanswer __P((const querybuf *, int, const char *, int,
-	const struct addrinfo *));
+static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
+	const struct addrinfo *);
 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 *,
-	const struct addrinfo *));
+static int res_querydomainN(const char *, const char *, struct res_target *);
+static struct addrinfo *_dns_getaddrinfo(const char *, const struct addrinfo *);
 
 
 /* XXX macros that make external reference is BAD. */
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index d4e3c5e6f00..9061caf0c23 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.44 2002/02/16 21:27:23 millert Exp $";
+static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.45 2002/02/17 19:42:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -126,8 +126,7 @@ typedef union {
 	char ac;
 } align;
 
-static struct hostent *getanswer __P((const querybuf *, int, const char *,
-				      int));
+static struct hostent *getanswer(const querybuf *, int, const char *, int);
 
 extern int h_errno;
 
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
index c19603f2d17..15dc9dcdea2 100644
--- a/lib/libc/net/getnameinfo.c
+++ b/lib/libc/net/getnameinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnameinfo.c,v 1.22 2002/02/16 21:27:23 millert Exp $	*/
+/*	$OpenBSD: getnameinfo.c,v 1.23 2002/02/17 19:42:23 millert Exp $	*/
 /*	$KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $	*/
 
 /*
@@ -81,8 +81,8 @@ struct sockinet {
 };
 
 #ifdef INET6
-static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
-				 size_t, int));
+static int ip6_parsenumeric(const struct sockaddr *, const char *, char *,
+    size_t, int);
 static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
 #endif
 
diff --git a/lib/libc/net/inet_net_ntop.c b/lib/libc/net/inet_net_ntop.c
index 943ec44550f..f5cb588d107 100644
--- a/lib/libc/net/inet_net_ntop.c
+++ b/lib/libc/net/inet_net_ntop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30 downsj Exp $	*/
+/*	$OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:23 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -21,7 +21,7 @@
 #if 0
 static const char rcsid[] = "$From: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp $";
 #else
-static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30 downsj Exp $";
+static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:23 millert Exp $";
 #endif
 #endif
 
@@ -35,8 +35,7 @@ static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/13 19:07:30
 #include <string.h>
 #include <stdlib.h>
 
-static char *	inet_net_ntop_ipv4 __P((const u_char *src, int bits,
-					char *dst, size_t size));
+static char *inet_net_ntop_ipv4(const u_char *, int, char *, size_t);
 
 /*
  * char *
diff --git a/lib/libc/net/inet_net_pton.c b/lib/libc/net/inet_net_pton.c
index b529e836645..932531eb5d1 100644
--- a/lib/libc/net/inet_net_pton.c
+++ b/lib/libc/net/inet_net_pton.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30 downsj Exp $	*/
+/*	$OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:23 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -21,7 +21,7 @@
 #if 0
 static const char rcsid[] = "$From: inet_net_pton.c,v 8.3 1996/11/11 06:36:52 vixie Exp $";
 #else
-static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30 downsj Exp $";
+static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:23 millert Exp $";
 #endif
 #endif
 
@@ -37,8 +37,7 @@ static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/13 19:07:30
 #include <string.h>
 #include <stdlib.h>
 
-static int	inet_net_pton_ipv4 __P((const char *src, u_char *dst,
-					size_t size));
+static int	inet_net_pton_ipv4(const char *, u_char *, size_t);
 
 /*
  * static int
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
index 95d481a7f64..143b667ba8e 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.40 2002/02/16 21:27:23 millert Exp $";
+static char *rcsid = "$OpenBSD: rcmd.c,v 1.41 2002/02/17 19:42:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -58,8 +58,8 @@ static char *rcsid = "$OpenBSD: rcmd.c,v 1.40 2002/02/16 21:27:23 millert Exp $"
 #include <netgroup.h>
 
 int	__ivaliduser(FILE *, in_addr_t, const char *, const char *);
-int	__ivaliduser_sa __P((FILE *, struct sockaddr *, socklen_t,
-		const char *, const char *));
+int	__ivaliduser_sa(FILE *, struct sockaddr *, socklen_t,
+	    const char *, const char *);
 static int __icheckhost(struct sockaddr *, socklen_t, const char *);
 static char *__gethostloop(struct sockaddr *, socklen_t);
 
diff --git a/lib/libc/net/res_comp.c b/lib/libc/net/res_comp.c
index f7a0358967e..948923cf37d 100644
--- a/lib/libc/net/res_comp.c
+++ b/lib/libc/net/res_comp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $	*/
+/*	$OpenBSD: res_comp.c,v 1.9 2002/02/17 19:42:23 millert Exp $	*/
 
 /*
  * ++Copyright++ 1985, 1993
@@ -60,7 +60,7 @@
 static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
 static char rcsid[] = "$From: res_comp.c,v 8.11 1996/12/02 09:17:22 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Exp $";
+static char rcsid[] = "$OpenBSD: res_comp.c,v 1.9 2002/02/17 19:42:23 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -76,8 +76,7 @@ static char rcsid[] = "$OpenBSD: res_comp.c,v 1.8 1997/07/09 01:08:49 millert Ex
 #include <unistd.h>
 #include <string.h>
 
-static int	dn_find __P((u_char *exp_dn, u_char *msg,
-			     u_char **dnptrs, u_char **lastdnptr));
+static int dn_find(u_char *, u_char *, u_char **, u_char **);
 
 /*
  * Expand compressed domain name 'comp_dn' to full domain name.
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
index 8efe61030ef..70d5c564471 100644
--- a/lib/libc/stdio/local.h
+++ b/lib/libc/stdio/local.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: local.h,v 1.3 2002/02/16 21:27:24 millert Exp $	*/
+/*	$OpenBSD: local.h,v 1.4 2002/02/17 19:42:23 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -53,7 +53,7 @@ void	_cleanup(void);
 void	(*__cleanup)(void);
 void	__smakebuf(FILE *);
 int	__swhatbuf(FILE *, size_t *, int *);
-int	_fwalk __P((int (*)(FILE *)));
+int	_fwalk(int (*)(FILE *));
 int	__swsetup(FILE *);
 int	__sflags(const char *, int *);
 
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index 086547819ea..326a6e92746 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.15 2002/02/16 21:27:24 millert Exp $";
+static char *rcsid = "$OpenBSD: vfprintf.c,v 1.16 2002/02/17 19:42:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -60,10 +60,8 @@ static char *rcsid = "$OpenBSD: vfprintf.c,v 1.15 2002/02/16 21:27:24 millert Ex
 #include "local.h"
 #include "fvwrite.h"
 
-static void __find_arguments __P((const char *fmt0, va_list ap,
-	va_list **argtable));
-static int __grow_type_table __P((unsigned char **typetable,
-	int *tablesize));
+static void __find_arguments(const char *fmt0, va_list ap, va_list **argtable);
+static int __grow_type_table(unsigned char **typetable, int *tablesize);
 
 /*
  * Flush out all the vectors defined by the given uio,
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index 345eb2fd8ba..4ae6488af23 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.4 2002/02/16 21:27:24 millert Exp $";
+static char *rcsid = "$OpenBSD: merge.c,v 1.5 2002/02/17 19:42:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -58,8 +58,8 @@ static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $"
 #include <stdlib.h>
 #include <string.h>
 
-static void setup __P((u_char *, u_char *, size_t, size_t, int (*)()));
-static void insertionsort __P((u_char *, size_t, size_t, int (*)()));
+static void setup(u_char *, u_char *, size_t, size_t, int (*)());
+static void insertionsort(u_char *, size_t, size_t, int (*)());
 
 #define ISIZE sizeof(int)
 #define PSIZE sizeof(u_char *)
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
index d16ed7b0bd7..9b8bb5801ba 100644
--- a/lib/libc/stdlib/qsort.c
+++ b/lib/libc/stdlib/qsort.c
@@ -32,13 +32,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: qsort.c,v 1.6 2002/02/16 21:27:24 millert Exp $";
+static char *rcsid = "$OpenBSD: qsort.c,v 1.7 2002/02/17 19:42: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 char	*med3(char *, char *, char *, 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 40d7c0789f6..e03b4797153 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.4 2002/02/16 21:27:24 millert Exp $";
+static char *rcsid = "$OpenBSD: radixsort.c,v 1.5 2002/02/17 19:42:24 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -63,8 +63,8 @@ typedef struct {
 static __inline void simplesort
 (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));
+static void r_sort_b(const u_char **,
+	    const u_char **, int, int, const u_char *, u_int);
 
 #define	THRESHOLD	20		/* Divert to simplesort(). */
 #define	SIZE		512		/* Default stack size. */
diff --git a/lib/libc/yp/ypinternal.h b/lib/libc/yp/ypinternal.h
index eb842d71935..ee6cecd25b7 100644
--- a/lib/libc/yp/ypinternal.h
+++ b/lib/libc/yp/ypinternal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypinternal.h,v 1.3 2002/02/16 21:27:25 millert Exp $	 */
+/*	$OpenBSD: ypinternal.h,v 1.4 2002/02/17 19:42:24 millert Exp $	 */
 
 /*
  * Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
@@ -61,10 +61,8 @@ int _yp_check(char **);
 
 #ifdef YPMATCHCACHE
 
-static bool_t ypmatch_add __P((const char *, const char *,
-    u_int, char *, u_int));
-static bool_t ypmatch_find __P((const char *, const char *,
-    u_int, char **, u_int *));
+static bool_t ypmatch_add(const char *, const char *, u_int, char *, u_int);
+static bool_t ypmatch_find(const char *, const char *, u_int, char **, u_int *);
 
 static struct ypmatch_ent {
 	struct ypmatch_ent 	*next;
diff --git a/lib/libc_r/include/pthread.h b/lib/libc_r/include/pthread.h
index c81cf953901..4a3f470c741 100644
--- a/lib/libc_r/include/pthread.h
+++ b/lib/libc_r/include/pthread.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread.h,v 1.15 2002/02/16 21:27:25 millert Exp $	*/
+/*	$OpenBSD: pthread.h,v 1.16 2002/02/17 19:42:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
@@ -207,42 +207,39 @@ __BEGIN_DECLS
 int		pthread_attr_destroy(pthread_attr_t *);
 int		pthread_attr_getstacksize(pthread_attr_t *, size_t *);
 int		pthread_attr_getstackaddr(pthread_attr_t *, void **);
-int		pthread_attr_getdetachstate __P((const pthread_attr_t *,
-			int *));
+int		pthread_attr_getdetachstate(const pthread_attr_t *, int *);
 int		pthread_attr_init(pthread_attr_t *);
 int		pthread_attr_setstacksize(pthread_attr_t *, size_t);
 int		pthread_attr_setstackaddr(pthread_attr_t *, void *);
 int		pthread_attr_setdetachstate(pthread_attr_t *, int);
 void		pthread_cleanup_pop(int execute);
-void		pthread_cleanup_push __P((void (*routine) (void *),
-			void *routine_arg));
+void		pthread_cleanup_push(void (*routine)(void *),
+		    void *routine_arg);
 int		pthread_condattr_destroy(pthread_condattr_t *attr);
 int		pthread_condattr_init(pthread_condattr_t *attr);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_condattr_getpshared __P((const pthread_condattr_t *attr,
-			int *pshared));
-int		pthread_condattr_setpshared __P((pthread_condattr_t *attr,
-			int pshared));
+int		pthread_condattr_getpshared(const pthread_condattr_t *attr,
+		    int *pshared);
+int		pthread_condattr_setpshared(pthread_condattr_t *attr,
+		    int pshared);
 #endif
 
 int		pthread_cond_broadcast(pthread_cond_t *);
 int		pthread_cond_destroy(pthread_cond_t *);
-int		pthread_cond_init __P((pthread_cond_t *,
-			const pthread_condattr_t *));
+int		pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *);
 int		pthread_cond_signal(pthread_cond_t *);
-int		pthread_cond_timedwait __P((pthread_cond_t *,
-			pthread_mutex_t *, const struct timespec * abstime));
+int		pthread_cond_timedwait(pthread_cond_t *,
+		    pthread_mutex_t *, const struct timespec * abstime);
 int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
-int		pthread_create __P((pthread_t *, const pthread_attr_t *,
-			void *(*start_routine) (void *), void *));
+int		pthread_create(pthread_t *, const pthread_attr_t *,
+		    void *(*start_routine) (void *), void *);
 int		pthread_detach(pthread_t);
 int		pthread_equal(pthread_t, pthread_t);
 __dead void	pthread_exit(void *) __attribute__((__noreturn__));
 void		*pthread_getspecific(pthread_key_t);
 int		pthread_join(pthread_t, void **);
-int		pthread_key_create __P((pthread_key_t *,
-			void (*routine) (void *)));
+int		pthread_key_create(pthread_key_t *, void (*routine)(void *));
 int		pthread_key_delete(pthread_key_t);
 int		pthread_kill(struct pthread *, int);
 int		pthread_mutexattr_init(pthread_mutexattr_t *);
@@ -250,26 +247,24 @@ int		pthread_mutexattr_destroy(pthread_mutexattr_t *);
 int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
 int		pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 int		pthread_mutex_destroy(pthread_mutex_t *);
-int		pthread_mutex_init __P((pthread_mutex_t *,
-			const pthread_mutexattr_t *));
+int		pthread_mutex_init(pthread_mutex_t *,
+		    const pthread_mutexattr_t *);
 int		pthread_mutex_lock(pthread_mutex_t *);
 int		pthread_mutex_trylock(pthread_mutex_t *);
 int		pthread_mutex_unlock(pthread_mutex_t *);
-int		pthread_once __P((pthread_once_t *,
-			void (*) (void)));
+int		pthread_once(pthread_once_t *, void (*)(void));
 int		pthread_rwlock_destroy(pthread_rwlock_t *);
-int		pthread_rwlock_init __P((pthread_rwlock_t *,
-			const pthread_rwlockattr_t *));
+int		pthread_rwlock_init(pthread_rwlock_t *,
+		    const pthread_rwlockattr_t *);
 int		pthread_rwlock_rdlock(pthread_rwlock_t *);
 int		pthread_rwlock_tryrdlock(pthread_rwlock_t *);
 int		pthread_rwlock_trywrlock(pthread_rwlock_t *);
 int		pthread_rwlock_unlock(pthread_rwlock_t *);
 int		pthread_rwlock_wrlock(pthread_rwlock_t *);
 int		pthread_rwlockattr_init(pthread_rwlockattr_t *);
-int		pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *,
-			int *));
-int		pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *,
-			int));
+int		pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *,
+		    int *);
+int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
 int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
 pthread_t	pthread_self(void);
 int		pthread_setspecific(pthread_key_t, const void *);
@@ -285,51 +280,50 @@ int		pthread_setprio(pthread_t, int);
 void		pthread_yield(void);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_mutexattr_getpshared __P((pthread_mutexattr_t *,
-			int *pshared));
-int		pthread_mutexattr_setpshared __P((pthread_mutexattr_t *,
-			int pshared));
+int		pthread_mutexattr_getpshared(pthread_mutexattr_t *,
+		    int *pshared);
+int		pthread_mutexattr_setpshared(pthread_mutexattr_t *,
+		    int pshared);
 #endif
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT)
-int		pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *,
-			int *prioceiling));
-int		pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *,
-			int prioceiling));
+int		pthread_mutexattr_getprioceiling(pthread_mutexattr_t *,
+		    int *prioceiling);
+int		pthread_mutexattr_setprioceiling(pthread_mutexattr_t *,
+		    int prioceiling);
 int		pthread_mutex_getprioceiling(pthread_mutex_t *, int *);
-int		pthread_mutex_setprioceiling __P((pthread_mutex_t *, int,
-			int *));
+int		pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *);
 #endif
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT) || defined (_POSIX_THREAD_PRIO_INHERIT)
-int		pthread_mutexattr_getprotocol __P((pthread_mutexattr_t *,
-			int *protocol));
-int		pthread_mutexattr_setprotocol __P((pthread_mutexattr_t *,
-			int protocol));
+int		pthread_mutexattr_getprotocol(pthread_mutexattr_t *,
+		    int *protocol);
+int		pthread_mutexattr_setprotocol(pthread_mutexattr_t *,
+		    int protocol);
 #endif
 
-int		pthread_getschedparam __P((pthread_t pthread, int *policy,
-			struct sched_param * param));
-int		pthread_setschedparam __P((pthread_t pthread, int policy,
-			const struct sched_param * param));
+int		pthread_getschedparam(pthread_t pthread, int *policy,
+		    struct sched_param * param);
+int		pthread_setschedparam(pthread_t pthread, int policy,
+		    const struct sched_param * param);
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 int		pthread_attr_getinheritsched(const pthread_attr_t *, int *);
-int		pthread_attr_getschedparam __P((const pthread_attr_t *,
-			struct sched_param *));
+int		pthread_attr_getschedparam(const pthread_attr_t *,
+		    struct sched_param *);
 int		pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
 int		pthread_attr_getscope(const pthread_attr_t *, int *);
 int		pthread_attr_setinheritsched(pthread_attr_t *, int);
-int		pthread_attr_setschedparam __P((pthread_attr_t *,
-			const struct sched_param *));
+int		pthread_attr_setschedparam(pthread_attr_t *,
+		    const struct sched_param *);
 int		pthread_attr_setschedpolicy(pthread_attr_t *, int);
 int		pthread_attr_setscope(pthread_attr_t *, int);
 #endif
 
 int		pthread_attr_setfloatstate(pthread_attr_t *, int);
 int		pthread_attr_getfloatstate(pthread_attr_t *, int *);
-int		pthread_attr_setcleanup __P((pthread_attr_t *,
-			void (*routine) (void *), void *));
+int		pthread_attr_setcleanup(pthread_attr_t *,
+		    void (*routine)(void *), void *);
 
 
 #ifdef notyet
@@ -339,10 +333,8 @@ int		pthread_attr_setcleanup __P((pthread_attr_t *,
 #define PTHREAD_PRIO_INHERIT
 #define PTHREAD_PRIO_NONE
 #define PTHREAD_PRIO_PROTECT
-int		pthread_attr_getguardsize __P((const pthread_attr_t *, 
-			size_t *));
-int		pthread_attr_setguardsize __P((const pthread_attr_t *, 
-			size_t));
+int		pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
+int		pthread_attr_setguardsize(const pthread_attr_t *, size_t);
 int		pthread_getconcurrency(void);
 int		pthread_setconcurrency(int);
 #endif	/* susv2 */
diff --git a/lib/libcom_err/com_err.h b/lib/libcom_err/com_err.h
index af9ffff8f54..577a6dee6e5 100644
--- a/lib/libcom_err/com_err.h
+++ b/lib/libcom_err/com_err.h
@@ -47,14 +47,6 @@
 #include <stdarg.h>
 #endif
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(X) X
-#else
-#define __P(X) ()
-#endif
-#endif
-
 
 /*
  * For compatibility with MIT's com_err the com_right.h include
diff --git a/lib/libcompat/4.3/lsearch.c b/lib/libcompat/4.3/lsearch.c
index 9cc27856bb3..23ad2c40ca6 100644
--- a/lib/libcompat/4.3/lsearch.c
+++ b/lib/libcompat/4.3/lsearch.c
@@ -43,8 +43,8 @@ static char sccsid[] = "@(#)lsearch.c	8.1 (Berkeley) 6/4/93";
 #include <search.h>
 
 typedef int (*cmp_fn_t)(const void *, const void *);
-static void *linear_base __P((const void *, const void *, size_t *, size_t,
-			     cmp_fn_t, int));
+static void *linear_base(const void *, const void *, size_t *, size_t,
+    cmp_fn_t, int);
 
 void *
 lsearch(key, base, nelp, width, compar)
@@ -52,6 +52,7 @@ lsearch(key, base, nelp, width, compar)
 	size_t *nelp, width;
 	cmp_fn_t compar;
 {
+
 	return(linear_base(key, base, nelp, width, compar, 1));
 }
 
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h
index 91cdf7f253e..56711d105c2 100644
--- a/lib/libedit/chared.h
+++ b/lib/libedit/chared.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chared.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: chared.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: chared.h,v 1.2 1997/01/11 06:47:49 lukem Exp $	*/
 
 /*-
@@ -142,12 +142,10 @@ protected void  cv_delfini(EditLine *);
 protected char *cv__endword(char *, char *, int);
 protected int   ce__isword(int);
 protected void  cv_undo(EditLine *, int, int, char *);
-protected char *cv_next_word	__P((EditLine*, char *, char *, int, 
-				     int (*)(int)));
-protected char *cv_prev_word	__P((EditLine*, char *, char *, int,
-				     int (*)(int)));
-protected char *c__next_word	__P((char *, char *, int, int (*)(int)));
-protected char *c__prev_word	__P((char *, char *, int, int (*)(int)));
+protected char *cv_next_word(EditLine*, char *, char *, int, int (*)(int));
+protected char *cv_prev_word(EditLine*, char *, char *, int, int (*)(int));
+protected char *c__next_word(char *, char *, int, int (*)(int));
+protected char *c__prev_word(char *, char *, int, int (*)(int));
 protected void  c_insert(EditLine *, int);
 protected void  c_delbefore(EditLine *, int);
 protected void  c_delafter(EditLine *, int);
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index e108095f350..21a27356913 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.c,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: key.c,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: key.c,v 1.2 1997/01/11 06:47:58 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: key.c,v 1.4 2002/02/16 21:27:26 millert Exp $";
+static char rcsid[] = "$OpenBSD: key.c,v 1.5 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -85,15 +85,13 @@ struct key_node_t {
     struct key_node_t *sibling;	/* ptr to another key with same prefix 	*/
 };
 
-private	int            node_trav	__P((EditLine *, key_node_t *, char *, 
-					     key_value_t *));
-private	int            node__try	__P((key_node_t *, char *, 
-					     key_value_t *, int));
+private	int            node_trav(EditLine *, key_node_t *, char *, 
+			    key_value_t *);
+private	int            node__try(key_node_t *, char *, key_value_t *, int);
 private	key_node_t    *node__get(int);
 private	void	       node__put(key_node_t *);
 private	int	       node__delete(key_node_t **, char *);
-private	int	       node_lookup 	__P((EditLine *, char *, key_node_t *,
-					     int));
+private	int	       node_lookup (EditLine *, char *, key_node_t *, int);
 private	int	       node_enum(EditLine *, key_node_t *, int);
 private	int	       key__decode_char(char *, int, int);
 
diff --git a/lib/libedit/key.h b/lib/libedit/key.h
index 256d48b72a7..60c3d13c092 100644
--- a/lib/libedit/key.h
+++ b/lib/libedit/key.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: key.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: key.h,v 1.2 1997/01/11 06:47:59 lukem Exp $	*/
 
 /*-
@@ -68,16 +68,12 @@ protected void 		key_end(EditLine *);
 protected key_value_t *	key_map_cmd(EditLine *, int);
 protected key_value_t *	key_map_str(EditLine *, char *);
 protected void		key_reset(EditLine *);
-protected int 		key_get		__P((EditLine *, char *, 
-					     key_value_t *));
-protected void		key_add		__P((EditLine *, char *, key_value_t *,
-					     int));
-protected void		key_clear	__P((EditLine *, el_action_t *,
-					     char *));
+protected int 		key_get(EditLine *, char *, key_value_t *);
+protected void		key_add(EditLine *, char *, key_value_t *, int);
+protected void		key_clear(EditLine *, el_action_t *, char *);
 protected int		key_delete(EditLine *, char *);
 protected void		key_print(EditLine *, char *);
-protected void	        key_kprint	__P((EditLine *, char *, 
-					     key_value_t *, int));
+protected void	        key_kprint(EditLine *, char *, key_value_t *, int);
 protected char 	       *key__decode_str(char *, char *, char *);
 
 #endif /* _h_el_key */
diff --git a/lib/libedit/map.h b/lib/libedit/map.h
index c63f11c60a3..c81d5daf907 100644
--- a/lib/libedit/map.h
+++ b/lib/libedit/map.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: map.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: map.h,v 1.2 1997/01/11 06:48:01 lukem Exp $	*/
 
 /*-
@@ -74,7 +74,6 @@ protected void	map_end(EditLine *);
 protected void	map_init_vi(EditLine *);
 protected void	map_init_emacs(EditLine *);
 protected int	map_set_editor(EditLine *, char *);
-protected int	map_addfunc		__P((EditLine *, const char *, 
-					     const char *, el_func_t));
+protected int	map_addfunc(EditLine *, const char *, const char *, el_func_t);
 
 #endif /* _h_el_map */
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index df6fe26fe90..d09711bed1d 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: refresh.c,v 1.6 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: refresh.c,v 1.2 1997/01/11 06:48:07 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp $";
+static char rcsid[] = "$OpenBSD: refresh.c,v 1.6 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -58,18 +58,15 @@ static char rcsid[] = "$OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp
 
 private	void	re_addc(EditLine *, int);
 private	void	re_update_line(EditLine *, char *, char *, int);
-private	void	re_insert		__P((EditLine *, char *, int, int, 
-					     char *, int));
-private	void	re_delete		__P((EditLine *, char *, int, int, 
-					     int));
+private	void	re_insert(EditLine *, char *, int, int, char *, int);
+private	void	re_delete(EditLine *, char *, int, int, int);
 private	void	re_fastputc(EditLine *, int);
 
 private	void	re__strncopy(char *, char *, size_t);
 private	void	re__copy_and_pad(char *, char *, size_t);
 
 #ifdef DEBUG_REFRESH
-private	void	re_printstr		__P((EditLine *, char *, char *, 
-					     char *));
+private	void	re_printstr(EditLine *, char *, char *, char *);
 # define __F el->el_errfile
 # define RE_DEBUG(a, b, c)	do 				\
 				    if (a) {			\
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index 2ecbc08bb41..c9c13b4bc78 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: term.c,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: term.c,v 1.6 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: term.c,v 1.8 1997/01/23 14:02:49 mrg Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: term.c,v 1.5 2002/02/16 21:27:26 millert Exp $";
+static char rcsid[] = "$OpenBSD: term.c,v 1.6 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -254,8 +254,7 @@ private struct termcapval {
 private	void	term_rebuffer_display(EditLine *);
 private	void	term_free_display(EditLine *);
 private	void	term_alloc_display(EditLine *);
-private	void	term_alloc		__P((EditLine *,
-					     struct termcapstr *, char *)); 
+private	void	term_alloc(EditLine *, struct termcapstr *, char *); 
 private void	term_init_arrow(EditLine *);
 private void	term_reset_arrow(EditLine *);
 
diff --git a/lib/libedit/term.h b/lib/libedit/term.h
index 5c251653d94..3b2bcd8c716 100644
--- a/lib/libedit/term.h
+++ b/lib/libedit/term.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: term.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: term.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: term.h,v 1.4 1997/01/11 06:48:14 lukem Exp $	*/
 
 /*-
@@ -95,8 +95,7 @@ protected int  term_init(EditLine *);
 protected void term_bind_arrow(EditLine *);
 protected void term_print_arrow(EditLine *, char *);
 protected int  term_clear_arrow(EditLine *, char *);
-protected int  term_set_arrow		__P((EditLine *, char *, 
-					     key_value_t *, int));
+protected int  term_set_arrow(EditLine *, char *, key_value_t *, int);
 protected void term_end(EditLine *);
 protected int  term_set(EditLine *, char *);
 protected int  term_settc(EditLine *, int, char **);
diff --git a/lib/libedit/termcap.h b/lib/libedit/termcap.h
index f7190a6d865..a590c2d0d9e 100644
--- a/lib/libedit/termcap.h
+++ b/lib/libedit/termcap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: termcap.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: termcap.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: termcap.h,v 1.2 1997/01/11 06:48:14 lukem Exp $	*/
 
 /*-
@@ -50,6 +50,6 @@ char *tgetstr(char *, char **);
 int   tgetflag(char *);
 int   tgetnum(char *);
 char *tgoto(char *, int, int);
-char *tputs	__P((char *, int, void (*)(int)));
+char *tputs(char *, int, void (*)(int));
 
 #endif /* _h_termcap */
diff --git a/lib/libedit/tokenizer.h b/lib/libedit/tokenizer.h
index 2a5c4d2deb3..75a38b1a875 100644
--- a/lib/libedit/tokenizer.h
+++ b/lib/libedit/tokenizer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tokenizer.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: tokenizer.h,v 1.5 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: tokenizer.h,v 1.2 1997/01/11 06:48:16 lukem Exp $	*/
 
 /*-
@@ -50,7 +50,6 @@ typedef struct tokenizer Tokenizer;
 Tokenizer 	*tok_init(const char *);
 void		 tok_reset(Tokenizer *);
 void		 tok_end(Tokenizer *);
-int		 tok_line	__P((Tokenizer *, const char *, 
-				     int *, char ***));
+int		 tok_line(Tokenizer *, const char *, int *, char ***);
 
 #endif /* _h_tokenizer */
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 73865047e5f..a1b256bcf5e 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $ */
+/*	$OpenBSD: kvm.c,v 1.28 2002/02/17 19:42:25 millert Exp $ */
 /*	$NetBSD: kvm.c,v 1.43 1996/05/05 04:31:59 gwr Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm.c	8.2 (Berkeley) 2/13/94";
 #else
-static char *rcsid = "$OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $";
+static char *rcsid = "$OpenBSD: kvm.c,v 1.28 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -74,8 +74,8 @@ static char *rcsid = "$OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $";
 
 static int	kvm_dbopen(kvm_t *, const char *);
 static int	_kvm_get_header(kvm_t *);
-static kvm_t	*_kvm_open __P((kvm_t *, const char *, const char *,
-		    const char *, int, char *));
+static kvm_t	*_kvm_open(kvm_t *, const char *, const char *, const char *,
+		    int, char *);
 static int	clear_gap(kvm_t *, FILE *, int);
 
 char *
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 40f055fd658..8725ae2e4f2 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Exp $	*/
+/*	$OpenBSD: kvm_proc.c,v 1.14 2002/02/17 19:42:25 millert Exp $	*/
 /*	$NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
 #else
-static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Exp $";
+static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.14 2002/02/17 19:42:25 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -117,16 +117,14 @@ static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Ex
 #define KREAD(kd, addr, obj) \
 	(kvm_read(kd, addr, (void *)(obj), sizeof(*obj)) != sizeof(*obj))
 
-ssize_t		kvm_uread __P((kvm_t *, const struct proc *, u_long, char *,
-		    size_t));
+ssize_t		kvm_uread(kvm_t *, const struct proc *, u_long, char *, size_t);
 
-static char	**kvm_argv __P((kvm_t *, const struct proc *, u_long, int,
-		    int));
+static char	**kvm_argv(kvm_t *, const struct proc *, u_long, int, int);
 static int	kvm_deadprocs(kvm_t *, int, int, u_long, u_long, int);
-static char	**kvm_doargv __P((kvm_t *, const struct kinfo_proc *, int,
-		    void (*)(struct ps_strings *, u_long *, int *)));
-static int	kvm_proclist __P((kvm_t *, int, int, struct proc *,
-		    struct kinfo_proc *, int));
+static char	**kvm_doargv(kvm_t *, const struct kinfo_proc *, int,
+		    void (*)(struct ps_strings *, u_long *, int *));
+static int	kvm_proclist(kvm_t *, int, int, struct proc *,
+		    struct kinfo_proc *, int);
 static int	proc_verify(kvm_t *, u_long, const struct proc *);
 static void	ps_str_a(struct ps_strings *, u_long *, int *);
 static void	ps_str_e(struct ps_strings *, u_long *, int *);
diff --git a/lib/libocurses/curses.h b/lib/libocurses/curses.h
index 3914699e45c..24151eae00a 100644
--- a/lib/libocurses/curses.h
+++ b/lib/libocurses/curses.h
@@ -334,7 +334,7 @@ int	 tgetnum(char *);
 int	 tgetflag(char *);
 char	*tgetstr(char *, char **);
 char	*tgoto(char *, int, int);
-void	 tputs __P((char *, int, void (*)(int)));
+void	 tputs(char *, int, void (*)(int));
 __END_DECLS
 
 #endif /* !_OCURSES_H_ */
diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h
index c81cf953901..4a3f470c741 100644
--- a/lib/libpthread/include/pthread.h
+++ b/lib/libpthread/include/pthread.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pthread.h,v 1.15 2002/02/16 21:27:25 millert Exp $	*/
+/*	$OpenBSD: pthread.h,v 1.16 2002/02/17 19:42:24 millert Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
@@ -207,42 +207,39 @@ __BEGIN_DECLS
 int		pthread_attr_destroy(pthread_attr_t *);
 int		pthread_attr_getstacksize(pthread_attr_t *, size_t *);
 int		pthread_attr_getstackaddr(pthread_attr_t *, void **);
-int		pthread_attr_getdetachstate __P((const pthread_attr_t *,
-			int *));
+int		pthread_attr_getdetachstate(const pthread_attr_t *, int *);
 int		pthread_attr_init(pthread_attr_t *);
 int		pthread_attr_setstacksize(pthread_attr_t *, size_t);
 int		pthread_attr_setstackaddr(pthread_attr_t *, void *);
 int		pthread_attr_setdetachstate(pthread_attr_t *, int);
 void		pthread_cleanup_pop(int execute);
-void		pthread_cleanup_push __P((void (*routine) (void *),
-			void *routine_arg));
+void		pthread_cleanup_push(void (*routine)(void *),
+		    void *routine_arg);
 int		pthread_condattr_destroy(pthread_condattr_t *attr);
 int		pthread_condattr_init(pthread_condattr_t *attr);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_condattr_getpshared __P((const pthread_condattr_t *attr,
-			int *pshared));
-int		pthread_condattr_setpshared __P((pthread_condattr_t *attr,
-			int pshared));
+int		pthread_condattr_getpshared(const pthread_condattr_t *attr,
+		    int *pshared);
+int		pthread_condattr_setpshared(pthread_condattr_t *attr,
+		    int pshared);
 #endif
 
 int		pthread_cond_broadcast(pthread_cond_t *);
 int		pthread_cond_destroy(pthread_cond_t *);
-int		pthread_cond_init __P((pthread_cond_t *,
-			const pthread_condattr_t *));
+int		pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *);
 int		pthread_cond_signal(pthread_cond_t *);
-int		pthread_cond_timedwait __P((pthread_cond_t *,
-			pthread_mutex_t *, const struct timespec * abstime));
+int		pthread_cond_timedwait(pthread_cond_t *,
+		    pthread_mutex_t *, const struct timespec * abstime);
 int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
-int		pthread_create __P((pthread_t *, const pthread_attr_t *,
-			void *(*start_routine) (void *), void *));
+int		pthread_create(pthread_t *, const pthread_attr_t *,
+		    void *(*start_routine) (void *), void *);
 int		pthread_detach(pthread_t);
 int		pthread_equal(pthread_t, pthread_t);
 __dead void	pthread_exit(void *) __attribute__((__noreturn__));
 void		*pthread_getspecific(pthread_key_t);
 int		pthread_join(pthread_t, void **);
-int		pthread_key_create __P((pthread_key_t *,
-			void (*routine) (void *)));
+int		pthread_key_create(pthread_key_t *, void (*routine)(void *));
 int		pthread_key_delete(pthread_key_t);
 int		pthread_kill(struct pthread *, int);
 int		pthread_mutexattr_init(pthread_mutexattr_t *);
@@ -250,26 +247,24 @@ int		pthread_mutexattr_destroy(pthread_mutexattr_t *);
 int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
 int		pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 int		pthread_mutex_destroy(pthread_mutex_t *);
-int		pthread_mutex_init __P((pthread_mutex_t *,
-			const pthread_mutexattr_t *));
+int		pthread_mutex_init(pthread_mutex_t *,
+		    const pthread_mutexattr_t *);
 int		pthread_mutex_lock(pthread_mutex_t *);
 int		pthread_mutex_trylock(pthread_mutex_t *);
 int		pthread_mutex_unlock(pthread_mutex_t *);
-int		pthread_once __P((pthread_once_t *,
-			void (*) (void)));
+int		pthread_once(pthread_once_t *, void (*)(void));
 int		pthread_rwlock_destroy(pthread_rwlock_t *);
-int		pthread_rwlock_init __P((pthread_rwlock_t *,
-			const pthread_rwlockattr_t *));
+int		pthread_rwlock_init(pthread_rwlock_t *,
+		    const pthread_rwlockattr_t *);
 int		pthread_rwlock_rdlock(pthread_rwlock_t *);
 int		pthread_rwlock_tryrdlock(pthread_rwlock_t *);
 int		pthread_rwlock_trywrlock(pthread_rwlock_t *);
 int		pthread_rwlock_unlock(pthread_rwlock_t *);
 int		pthread_rwlock_wrlock(pthread_rwlock_t *);
 int		pthread_rwlockattr_init(pthread_rwlockattr_t *);
-int		pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *,
-			int *));
-int		pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *,
-			int));
+int		pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *,
+		    int *);
+int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
 int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
 pthread_t	pthread_self(void);
 int		pthread_setspecific(pthread_key_t, const void *);
@@ -285,51 +280,50 @@ int		pthread_setprio(pthread_t, int);
 void		pthread_yield(void);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_mutexattr_getpshared __P((pthread_mutexattr_t *,
-			int *pshared));
-int		pthread_mutexattr_setpshared __P((pthread_mutexattr_t *,
-			int pshared));
+int		pthread_mutexattr_getpshared(pthread_mutexattr_t *,
+		    int *pshared);
+int		pthread_mutexattr_setpshared(pthread_mutexattr_t *,
+		    int pshared);
 #endif
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT)
-int		pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *,
-			int *prioceiling));
-int		pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *,
-			int prioceiling));
+int		pthread_mutexattr_getprioceiling(pthread_mutexattr_t *,
+		    int *prioceiling);
+int		pthread_mutexattr_setprioceiling(pthread_mutexattr_t *,
+		    int prioceiling);
 int		pthread_mutex_getprioceiling(pthread_mutex_t *, int *);
-int		pthread_mutex_setprioceiling __P((pthread_mutex_t *, int,
-			int *));
+int		pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *);
 #endif
 
 #if defined(_POSIX_THREAD_PRIO_PROTECT) || defined (_POSIX_THREAD_PRIO_INHERIT)
-int		pthread_mutexattr_getprotocol __P((pthread_mutexattr_t *,
-			int *protocol));
-int		pthread_mutexattr_setprotocol __P((pthread_mutexattr_t *,
-			int protocol));
+int		pthread_mutexattr_getprotocol(pthread_mutexattr_t *,
+		    int *protocol);
+int		pthread_mutexattr_setprotocol(pthread_mutexattr_t *,
+		    int protocol);
 #endif
 
-int		pthread_getschedparam __P((pthread_t pthread, int *policy,
-			struct sched_param * param));
-int		pthread_setschedparam __P((pthread_t pthread, int policy,
-			const struct sched_param * param));
+int		pthread_getschedparam(pthread_t pthread, int *policy,
+		    struct sched_param * param);
+int		pthread_setschedparam(pthread_t pthread, int policy,
+		    const struct sched_param * param);
 
 #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
 int		pthread_attr_getinheritsched(const pthread_attr_t *, int *);
-int		pthread_attr_getschedparam __P((const pthread_attr_t *,
-			struct sched_param *));
+int		pthread_attr_getschedparam(const pthread_attr_t *,
+		    struct sched_param *);
 int		pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
 int		pthread_attr_getscope(const pthread_attr_t *, int *);
 int		pthread_attr_setinheritsched(pthread_attr_t *, int);
-int		pthread_attr_setschedparam __P((pthread_attr_t *,
-			const struct sched_param *));
+int		pthread_attr_setschedparam(pthread_attr_t *,
+		    const struct sched_param *);
 int		pthread_attr_setschedpolicy(pthread_attr_t *, int);
 int		pthread_attr_setscope(pthread_attr_t *, int);
 #endif
 
 int		pthread_attr_setfloatstate(pthread_attr_t *, int);
 int		pthread_attr_getfloatstate(pthread_attr_t *, int *);
-int		pthread_attr_setcleanup __P((pthread_attr_t *,
-			void (*routine) (void *), void *));
+int		pthread_attr_setcleanup(pthread_attr_t *,
+		    void (*routine)(void *), void *);
 
 
 #ifdef notyet
@@ -339,10 +333,8 @@ int		pthread_attr_setcleanup __P((pthread_attr_t *,
 #define PTHREAD_PRIO_INHERIT
 #define PTHREAD_PRIO_NONE
 #define PTHREAD_PRIO_PROTECT
-int		pthread_attr_getguardsize __P((const pthread_attr_t *, 
-			size_t *));
-int		pthread_attr_setguardsize __P((const pthread_attr_t *, 
-			size_t));
+int		pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
+int		pthread_attr_setguardsize(const pthread_attr_t *, size_t);
 int		pthread_getconcurrency(void);
 int		pthread_setconcurrency(int);
 #endif	/* susv2 */
diff --git a/lib/libutil/scsi.h b/lib/libutil/scsi.h
index 08b8a9b9b48..3551ce54eee 100644
--- a/lib/libutil/scsi.h
+++ b/lib/libutil/scsi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi.h,v 1.2 2002/02/16 21:27:29 millert Exp $	*/
+/*	$OpenBSD: scsi.h,v 1.3 2002/02/17 19:42:26 millert Exp $	*/
 
 /* Copyright (c) 1994 HD Associates (hd@world.std.com)
  * All rights reserved.
@@ -54,26 +54,23 @@ scsireq_t *scsireq_reset(scsireq_t *);
 scsireq_t *scsireq_new(void);
 
 int scsireq_buff_decode(u_char *, size_t, char *, ...);
-int scsireq_buff_decode_visit __P((u_char *, size_t, char *,
-void (*a)(void *, int, void *, int, char *), void *));
+int scsireq_buff_decode_visit(u_char *, size_t, char *,
+    void (*a)(void *, int, void *, int, char *), void *);
 
 int scsireq_decode(scsireq_t *, char *, ...);
-int scsireq_decode_visit __P((scsireq_t *, char *,
-void (*) (void *, int, void *, int, char *), void *));
+int scsireq_decode_visit(scsireq_t *, char *,
+    void (*)(void *, int, void *, int, char *), void *);
 
 int scsireq_encode(scsireq_t *, char *, ...);
-int scsireq_encode_visit __P((scsireq_t *, char *,
-	int (*)(void *, char *), void *));
-int scsireq_buff_encode_visit __P((u_char *, size_t, char *,
-	int (*)(void *, char *), void *));
-
-scsireq_t *scsireq_build __P((scsireq_t *,
-	u_long, caddr_t, u_long,
-	char *, ...));
-
-scsireq_t *scsireq_build_visit __P((scsireq_t *,
-	u_long, caddr_t, u_long, char *,
-	int (*)(void *, char *), void *));
+int scsireq_encode_visit(scsireq_t *, char *,
+    int (*)(void *, char *), void *);
+int scsireq_buff_encode_visit(u_char *, size_t, char *,
+    int (*)(void *, char *), void *);
+
+scsireq_t *scsireq_build(scsireq_t *, u_long, caddr_t, u_long, char *, ...);
+
+scsireq_t *scsireq_build_visit(scsireq_t *, u_long, caddr_t, u_long, char *,
+    int (*)(void *, char *), void *);
 
 int scsireq_enter(int, scsireq_t *);
 
diff --git a/lib/libutil/util.h b/lib/libutil/util.h
index 33bf13560a9..dee86c93f15 100644
--- a/lib/libutil/util.h
+++ b/lib/libutil/util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.h,v 1.19 2002/02/16 21:27:29 millert Exp $	*/
+/*	$OpenBSD: util.h,v 1.20 2002/02/17 19:42:26 millert Exp $	*/
 /*	$NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $	*/
 
 /*-
@@ -100,10 +100,10 @@ void	pw_copy(int, int, struct passwd *);
 void	pw_getconf(char *, size_t, const char *, const char *);
 int	pw_scan(char *, struct passwd *, int *);
 void	pw_error(const char *, int, int);
-int	openpty __P((int *, int *, char *, struct termios *,
-	    struct winsize *));
-int	opendisk __P((const char *path, int flags, char *buf, size_t buflen,
-	    int iscooked));
+int	openpty(int *, int *, char *, struct termios *,
+	    struct winsize *);
+int	opendisk(const char *path, int flags, char *buf, size_t buflen,
+	    int iscooked);
 pid_t	forkpty(int *, char *, struct termios *, struct winsize *);
 int	getmaxpartitions(void);
 int	getrawpartition(void);