From 959b08f10901aad8a413e226e79fe03697098381 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Sun, 17 Feb 2002 19:42:26 +0000
Subject: [PATCH] Manual cleanup of remaining userland __P use (excluding
 packages maintained outside the tree)

---
 src/include/dirent.h            |  6 ++---
 src/include/fts.h               |  6 ++---
 src/include/glob.h              |  4 ++--
 src/include/mpool.h             |  6 ++---
 src/include/netdb.h             | 11 ++++-----
 src/include/netgroup.h          |  5 ++--
 src/include/ohash.h             | 10 ++++----
 src/include/regex.h             |  5 ++--
 src/include/resolv.h            | 38 ++++++++++++++---------------
 src/include/rpc/auth.h          |  9 ++++---
 src/include/rpc/clnt.h          | 42 ++++++++++++---------------------
 src/include/rpc/pmap_clnt.h     | 22 +++++++----------
 src/include/rpc/rpc.h           | 10 ++++----
 src/include/rpc/svc.h           | 21 ++++++++---------
 src/include/rpc/xdr.h           |  8 +++----
 src/include/rpcsvc/ypclnt.h     | 16 ++++++-------
 src/include/search.h            | 28 +++++++++++-----------
 src/include/stdio.h             |  6 ++---
 src/include/stdlib.h            | 25 +++++++++-----------
 src/include/unistd.h            | 14 +++++------
 src/lib/libc/stdlib/merge.c     |  6 ++---
 src/lib/libc/stdlib/qsort.c     |  4 ++--
 src/lib/libc/stdlib/radixsort.c |  6 ++---
 src/lib/libutil/scsi.h          | 31 +++++++++++-------------
 src/lib/libutil/util.h          | 10 ++++----
 25 files changed, 160 insertions(+), 189 deletions(-)

diff --git a/src/include/dirent.h b/src/include/dirent.h
index 012e8006..45392a7d 100644
--- a/src/include/dirent.h
+++ b/src/include/dirent.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dirent.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: dirent.h,v 1.8 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $	*/
 
 /*-
@@ -104,8 +104,8 @@ int closedir(DIR *);
 DIR *__opendir2(const char *, int);
 long telldir(const DIR *);
 void seekdir(DIR *, long);
-int scandir __P((const char *, struct dirent ***,
-    int (*)(struct dirent *), int (*)(const void *, const void *)));
+int scandir(const char *, struct dirent ***,
+    int (*)(struct dirent *), int (*)(const void *, const void *));
 int alphasort(const void *, const void *);
 int getdirentries(int, char *, int, long *);
 #endif /* not POSIX */
diff --git a/src/include/fts.h b/src/include/fts.h
index 8f01f294..233c2c77 100644
--- a/src/include/fts.h
+++ b/src/include/fts.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fts.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: fts.h,v 1.8 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: fts.h,v 1.5 1994/12/28 01:41:50 mycroft Exp $	*/
 
 /*
@@ -122,8 +122,8 @@ typedef struct _ftsent {
 __BEGIN_DECLS
 FTSENT	*fts_children(FTS *, int);
 int	 fts_close(FTS *);
-FTS	*fts_open __P((char * const *, int,
-	    int (*)(const FTSENT **, const FTSENT **)));
+FTS	*fts_open(char * const *, int,
+	    int (*)(const FTSENT **, const FTSENT **));
 FTSENT	*fts_read(FTS *);
 int	 fts_set(FTS *, FTSENT *, int);
 __END_DECLS
diff --git a/src/include/glob.h b/src/include/glob.h
index 6766660b..84cdd081 100644
--- a/src/include/glob.h
+++ b/src/include/glob.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glob.h,v 1.6 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: glob.h,v 1.7 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $	*/
 
 /*
@@ -93,7 +93,7 @@ typedef struct {
 #define GLOB_ABEND	GLOB_ABORTED
 
 __BEGIN_DECLS
-int	glob __P((const char *, int, int (*)(const char *, int), glob_t *));
+int	glob(const char *, int, int (*)(const char *, int), glob_t *);
 void	globfree(glob_t *);
 __END_DECLS
 
diff --git a/src/include/mpool.h b/src/include/mpool.h
index 3d5a249c..b355371c 100644
--- a/src/include/mpool.h
+++ b/src/include/mpool.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpool.h,v 1.7 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: mpool.h,v 1.8 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: mpool.h,v 1.7 1996/05/03 21:13:41 cgd Exp $	*/
 
 /*-
@@ -99,8 +99,8 @@ typedef struct MPOOL {
 
 __BEGIN_DECLS
 MPOOL	*mpool_open(void *, int, pgno_t, pgno_t);
-void	 mpool_filter __P((MPOOL *, void (*)(void *, pgno_t, void *),
-	    void (*)(void *, pgno_t, void *), void *));
+void	 mpool_filter(MPOOL *, void (*)(void *, pgno_t, void *),
+	    void (*)(void *, pgno_t, void *), void *);
 void	*mpool_new(MPOOL *, pgno_t *, u_int);
 void	*mpool_get(MPOOL *, pgno_t, u_int);
 int	 mpool_delete(MPOOL *, void *);
diff --git a/src/include/netdb.h b/src/include/netdb.h
index 6dd03a21..a8cdbf2f 100644
--- a/src/include/netdb.h
+++ b/src/include/netdb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netdb.h,v 1.15 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: netdb.h,v 1.16 2002/02/17 19:42:21 millert Exp $	*/
 
 /*
  * ++Copyright++ 1980, 1983, 1988, 1993
@@ -265,12 +265,11 @@ void		setnetent(int);
 void		setprotoent(int);
 void		setservent(int);
 
-int		getaddrinfo __P((const char *, const char *,
-		    const struct addrinfo *, struct addrinfo **));
+int		getaddrinfo(const char *, const char *,
+		    const struct addrinfo *, struct addrinfo **);
 void		freeaddrinfo(struct addrinfo *);
-int		getnameinfo __P((const struct sockaddr *, socklen_t,
-		    char *, size_t, char *, size_t,
-		    int));
+int		getnameinfo(const struct sockaddr *, socklen_t,
+		    char *, size_t, char *, size_t, int);
 char		*gai_strerror(int);
 int		net_addrcmp(struct sockaddr *, struct sockaddr *);
 int		getrrsetbyname(const char *, unsigned int, unsigned int, unsigned int, struct rrsetinfo **);
diff --git a/src/include/netgroup.h b/src/include/netgroup.h
index ac68a0b8..23a76a73 100644
--- a/src/include/netgroup.h
+++ b/src/include/netgroup.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: netgroup.h,v 1.4 2002/02/16 21:27:17 millert Exp $*/
+/* * $OpenBSD: netgroup.h,v 1.5 2002/02/17 19:42:21 millert Exp $*/
 /*
  * Copyright (c) 1994 Christos Zoulas
  * All rights reserved.
@@ -61,8 +61,7 @@ __BEGIN_DECLS
 void	setnetgrent(const char *);
 int	getnetgrent(const char **, const char **, const char **);
 void	endnetgrent(void);
-int	innetgr		__P((const char *, const char *, const char *,
-			     const char *));
+int	innetgr(const char *, const char *, const char *, const char *);
 #ifdef _NETGROUP_PRIVATE
 struct stringlist;
 
diff --git a/src/include/ohash.h b/src/include/ohash.h
index b53121d7..6e7a6c2f 100644
--- a/src/include/ohash.h
+++ b/src/include/ohash.h
@@ -1,6 +1,6 @@
 #ifndef OHASH_H
 #define OHASH_H
-/* $OpenBSD: ohash.h,v 1.2 2002/02/16 21:27:17 millert Exp $ */
+/* $OpenBSD: ohash.h,v 1.3 2002/02/17 19:42:21 millert Exp $ */
 /* ex:ts=8 sw=4: 
  */
 
@@ -65,10 +65,10 @@ void ohash_init(struct ohash *, unsigned, struct ohash_info *);
 void ohash_delete(struct ohash *);
 
 unsigned int ohash_lookup_string(struct ohash *, const char *, u_int32_t);
-unsigned int ohash_lookup_interval __P((struct ohash *, const char *, \
-	const char *, u_int32_t));
-unsigned int ohash_lookup_memory __P((struct ohash *, const char *, \
-	size_t, u_int32_t));
+unsigned int ohash_lookup_interval(struct ohash *, const char *,
+	    const char *, u_int32_t);
+unsigned int ohash_lookup_memory(struct ohash *, const char *,
+	    size_t, u_int32_t);
 void *ohash_find(struct ohash *, unsigned int);
 void *ohash_remove(struct ohash *, unsigned int);
 void *ohash_insert(struct ohash *, unsigned int, void *);
diff --git a/src/include/regex.h b/src/include/regex.h
index 7e70e07d..68dba634 100644
--- a/src/include/regex.h
+++ b/src/include/regex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regex.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: regex.h,v 1.5 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: regex.h,v 1.4.6.1 1996/06/10 18:57:07 explorer Exp $	*/
 
 /*-
@@ -102,8 +102,7 @@ typedef struct {
 __BEGIN_DECLS
 int	regcomp(regex_t *, const char *, int);
 size_t	regerror(int, const regex_t *, char *, size_t);
-int	regexec __P((const regex_t *,
-	    const char *, size_t, regmatch_t [], int));
+int	regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
 void	regfree(regex_t *);
 __END_DECLS
 
diff --git a/src/include/resolv.h b/src/include/resolv.h
index 2a866ede..137d2ba6 100644
--- a/src/include/resolv.h
+++ b/src/include/resolv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolv.h,v 1.8 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: resolv.h,v 1.9 2002/02/17 19:42:21 millert Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -223,19 +223,19 @@ struct __res_state_ext {
 typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
 	res_sendhookact;
 
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
+typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns,
 					      const u_char **query,
 					      int *querylen,
 					      u_char *ans,
 					      int anssiz,
-					      int *resplen));
+					      int *resplen);
 
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
+typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns,
 					      const u_char *query,
 					      int querylen,
 					      u_char *ans,
 					      int anssiz,
-					      int *resplen));
+					      int *resplen);
 
 struct res_sym {
 	int	number;		/* Identifying number, like T_MX */
@@ -324,31 +324,31 @@ const char *	p_type(int);
 void		p_query(const u_char *);
 const u_char *	p_cdnname(const u_char *, const u_char *, int, FILE *);
 const u_char *	p_cdname(const u_char *, const u_char *, FILE *);
-const u_char *	p_fqnname __P((const u_char *cp, const u_char *msg,
-			       int, char *, int));
+const u_char *	p_fqnname(const u_char *cp, const u_char *msg,
+		    int, char *, int);
 const u_char *	p_fqname(const u_char *, const u_char *, FILE *);
 const u_char *	p_rr(const u_char *, const u_char *, FILE *);
 const char *	p_option(u_long option);
 char *		p_secstodate(u_long);
 int		dn_count_labels(char *);
-int		dn_comp __P((const char *, u_char *, int,
-			     u_char **, u_char **));
-int		dn_expand __P((const u_char *, const u_char *, const u_char *,
-			       char *, int));
+int		dn_comp(const char *, u_char *, int,
+		    u_char **, u_char **);
+int		dn_expand(const u_char *, const u_char *, const u_char *,
+		    char *, int);
 int		res_init(void);
 u_int		res_randomid(void);
 int		res_query(const char *, int, int, u_char *, int);
 int		res_search(const char *, int, int, u_char *, int);
-int		res_querydomain __P((const char *, const char *, int, int,
-				     u_char *, int));
-int		res_mkquery __P((int, const char *, int, int, const u_char *, int,
-				 const u_char *, u_char *, int));
+int		res_querydomain(const char *, const char *, int, int,
+		    u_char *, int);
+int		res_mkquery(int, const char *, int, int, const u_char *, int,
+		    const u_char *, u_char *, int);
 int		res_send(const u_char *, int, u_char *, int);
 int		res_isourserver(const struct sockaddr_in *);
-int		res_nameinquery __P((const char *, int, int,
-				     const u_char *, const u_char *));
-int		res_queriesmatch __P((const u_char *, const u_char *,
-				      const u_char *, const u_char *));
+int		res_nameinquery(const char *, int, int,
+		    const u_char *, const u_char *);
+int		res_queriesmatch(const u_char *, const u_char *,
+		    const u_char *, const u_char *);
 void		res_close(void);
 __END_DECLS
 
diff --git a/src/include/rpc/auth.h b/src/include/rpc/auth.h
index 7787659b..fc983083 100644
--- a/src/include/rpc/auth.h
+++ b/src/include/rpc/auth.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: auth.h,v 1.4 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: auth.h,v 1.7 1995/04/29 05:27:55 cgd Exp $	*/
 
 /*
@@ -106,8 +106,8 @@ typedef struct __rpc_auth {
 		/* nextverf & serialize */
 		int	(*ah_marshal)(struct __rpc_auth *, XDR *);
 		/* validate varifier */
-		int	(*ah_validate) __P((struct __rpc_auth *,
-			    struct opaque_auth *));
+		int	(*ah_validate)(struct __rpc_auth *,
+			    struct opaque_auth *);
 		/* refresh credentials */
 		int	(*ah_refresh)(struct __rpc_auth *);
 		/* destroy this structure */
@@ -172,8 +172,7 @@ struct sockaddr_in;
 extern AUTH *authunix_create(char *, int, int, int, int *);
 extern AUTH *authunix_create_default(void);
 extern AUTH *authnone_create(void);
-extern AUTH *authdes_create		__P((char *, u_int,
-					    struct sockaddr_in *, des_block *));
+extern AUTH *authdes_create(char *, u_int, struct sockaddr_in *, des_block *);
 __END_DECLS
 
 #define AUTH_NONE	0		/* no authentication */
diff --git a/src/include/rpc/clnt.h b/src/include/rpc/clnt.h
index 93c9b783..46b40271 100644
--- a/src/include/rpc/clnt.h
+++ b/src/include/rpc/clnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnt.h,v 1.6 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: clnt.h,v 1.7 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: clnt.h,v 1.6 1995/04/29 05:27:58 cgd Exp $	*/
 
 /*
@@ -120,22 +120,22 @@ typedef struct __rpc_client {
 	AUTH	*cl_auth;			/* authenticator */
 	struct clnt_ops {
 		/* call remote procedure */
-		enum clnt_stat	(*cl_call) __P((struct __rpc_client *,
+		enum clnt_stat	(*cl_call)(struct __rpc_client *,
 				    u_long, xdrproc_t, caddr_t, xdrproc_t,
-				    caddr_t, struct timeval));
+				    caddr_t, struct timeval);
 		/* abort a call */
 		void		(*cl_abort)(struct __rpc_client *);
 		/* get specific error code */
-		void		(*cl_geterr) __P((struct __rpc_client *,
-				    struct rpc_err *));
+		void		(*cl_geterr)(struct __rpc_client *,
+				    struct rpc_err *);
 		/* frees results */
-		bool_t		(*cl_freeres) __P((struct __rpc_client *,
-				    xdrproc_t, caddr_t));
+		bool_t		(*cl_freeres)(struct __rpc_client *,
+				    xdrproc_t, caddr_t);
 		/* destroy this structure */
 		void		(*cl_destroy)(struct __rpc_client *);
 		/* the ioctl() of rpc */
-		bool_t          (*cl_control) __P((struct __rpc_client *, u_int,
-				    void *));
+		bool_t          (*cl_control)(struct __rpc_client *, u_int,
+				    void *);
 	} *cl_ops;
 	caddr_t			cl_private;	/* private stuff */
 } CLIENT;
@@ -285,12 +285,8 @@ __END_DECLS
  *	u_int recvsz;
  */
 __BEGIN_DECLS
-extern CLIENT *clnttcp_create	__P((struct sockaddr_in *,
-				     u_long,
-				     u_long,
-				     int *,
-				     u_int,
-				     u_int));
+extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *,
+    u_int, u_int);
 __END_DECLS
 
 
@@ -316,18 +312,10 @@ __END_DECLS
  *	u_int recvsz;
  */
 __BEGIN_DECLS
-extern CLIENT *clntudp_create	__P((struct sockaddr_in *,
-				     u_long,
-				     u_long,
-				     struct timeval,
-				     int *));
-extern CLIENT *clntudp_bufcreate __P((struct sockaddr_in *,
-				     u_long,
-				     u_long,
-				     struct timeval,
-				     int *,
-				     u_int,
-				     u_int));
+extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long,
+    struct timeval, int *);
+extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long,
+    struct timeval, int *, u_int, u_int);
 __END_DECLS
 
 
diff --git a/src/include/rpc/pmap_clnt.h b/src/include/rpc/pmap_clnt.h
index 9e54c502..2a6fbecb 100644
--- a/src/include/rpc/pmap_clnt.h
+++ b/src/include/rpc/pmap_clnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_clnt.h,v 1.4 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: pmap_clnt.h,v 1.5 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: pmap_clnt.h,v 1.5 1994/12/04 01:12:42 cgd Exp $	*/
 
 /*
@@ -70,18 +70,14 @@ __BEGIN_DECLS
 extern bool_t		pmap_set(u_long, u_long, u_int, int);
 extern bool_t		pmap_unset(u_long, u_long);
 extern struct pmaplist	*pmap_getmaps(struct sockaddr_in *);
-extern enum clnt_stat	pmap_rmtcall	__P((struct sockaddr_in *,
-					     u_long, u_long, u_long,
-					     xdrproc_t, caddr_t,
-					     xdrproc_t, caddr_t,
-					     struct timeval, u_long *));
-extern enum clnt_stat	clnt_broadcast	__P((u_long, u_long, u_long,
-					     xdrproc_t, char *,
-					     xdrproc_t, char *,
-					     bool_t (*) __P((caddr_t,
-						struct sockaddr_in *))));
-extern u_short		pmap_getport	__P((struct sockaddr_in *,
-					     u_long, u_long, u_int));
+extern enum clnt_stat	pmap_rmtcall(struct sockaddr_in *, u_long, u_long,
+			    u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t,
+			    struct timeval, u_long *);
+extern enum clnt_stat	clnt_broadcast(u_long, u_long, u_long, xdrproc_t,
+			    char *, xdrproc_t, char *,
+			    bool_t (*)(caddr_t, struct sockaddr_in *));
+extern u_short		pmap_getport(struct sockaddr_in *, u_long, u_long,
+			    u_int);
 __END_DECLS
 
 #endif /* !_RPC_PMAPCLNT_H */
diff --git a/src/include/rpc/rpc.h b/src/include/rpc/rpc.h
index 1d929e86..fc9189f5 100644
--- a/src/include/rpc/rpc.h
+++ b/src/include/rpc/rpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc.h,v 1.9 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: rpc.h,v 1.10 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: rpc.h,v 1.5 1994/12/04 01:15:30 cgd Exp $	*/
 
 /*
@@ -93,10 +93,10 @@ extern void setrpcent(int);
 extern void endrpcent(void);
 
 extern int get_myaddress(struct sockaddr_in *);
-extern int registerrpc __P((int, int, int, char *(*)(char [UDPMSGSIZE]),
-	xdrproc_t, xdrproc_t));
-extern int callrpc __P((char *, int, int, int, xdrproc_t, char *,
-	xdrproc_t , char *));
+extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
+	xdrproc_t, xdrproc_t);
+extern int callrpc(char *, int, int, int, xdrproc_t, char *,
+	xdrproc_t , char *);
 extern int getrpcport(char *, int, int, int);
 
 extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
diff --git a/src/include/rpc/svc.h b/src/include/rpc/svc.h
index be428e2f..d41951bc 100644
--- a/src/include/rpc/svc.h
+++ b/src/include/rpc/svc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc.h,v 1.6 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: svc.h,v 1.7 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: svc.h,v 1.9 1995/04/29 05:28:01 cgd Exp $	*/
 
 /*
@@ -79,19 +79,18 @@ typedef struct __rpc_svcxprt {
 	u_short		xp_port;	 /* associated port number */
 	struct xp_ops {
 		/* receive incomming requests */
-		bool_t	(*xp_recv) __P((struct __rpc_svcxprt *,
-			    struct rpc_msg *));
+		bool_t	(*xp_recv)(struct __rpc_svcxprt *,
+			    struct rpc_msg *);
 		/* get transport status */
 		enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *);
 		/* get arguments */
-		bool_t	(*xp_getargs) __P((struct __rpc_svcxprt *, xdrproc_t,
-			    caddr_t));
+		bool_t	(*xp_getargs)(struct __rpc_svcxprt *, xdrproc_t,
+			    caddr_t);
 		/* send reply */
-		bool_t	(*xp_reply) __P((struct __rpc_svcxprt *,
-			    struct rpc_msg *));
+		bool_t	(*xp_reply)(struct __rpc_svcxprt *, struct rpc_msg *);
 		/* free mem allocated for args */
-		bool_t	(*xp_freeargs) __P((struct __rpc_svcxprt *, xdrproc_t,
-			    caddr_t));
+		bool_t	(*xp_freeargs)(struct __rpc_svcxprt *, xdrproc_t,
+			    caddr_t);
 		/* destroy this struct */
 		void	(*xp_destroy)(struct __rpc_svcxprt *);
 	} *xp_ops;
@@ -170,8 +169,8 @@ struct svc_req {
  *	int protocol;    like TCP or UDP, zero means do not register 
  */
 __BEGIN_DECLS
-extern bool_t	svc_register __P((SVCXPRT *, u_long, u_long,
-		    void (*)(struct svc_req *, SVCXPRT *), int));
+extern bool_t	svc_register(SVCXPRT *, u_long, u_long,
+		    void (*)(struct svc_req *, SVCXPRT *), int);
 __END_DECLS
 
 /*
diff --git a/src/include/rpc/xdr.h b/src/include/rpc/xdr.h
index 3b9076ea..26731c04 100644
--- a/src/include/rpc/xdr.h
+++ b/src/include/rpc/xdr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xdr.h,v 1.3 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: xdr.h,v 1.4 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: xdr.h,v 1.7 1995/04/29 05:28:06 cgd Exp $	*/
 
 /*
@@ -291,9 +291,9 @@ extern void   xdrstdio_create(XDR *, FILE *, enum xdr_op);
 #endif
 
 /* XDR pseudo records for tcp */
-extern void   xdrrec_create	__P((XDR *, u_int, u_int, char *,
-				    int (*)(caddr_t, caddr_t, int),
-				    int (*)(caddr_t, caddr_t, int)));
+extern void   xdrrec_create(XDR *, u_int, u_int, char *,
+			    int (*)(caddr_t, caddr_t, int),
+			    int (*)(caddr_t, caddr_t, int));
 
 /* make end of xdr record */
 extern bool_t xdrrec_endofrecord(XDR *, int);
diff --git a/src/include/rpcsvc/ypclnt.h b/src/include/rpcsvc/ypclnt.h
index 8a4d6cf2..e80b64dc 100644
--- a/src/include/rpcsvc/ypclnt.h
+++ b/src/include/rpcsvc/ypclnt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypclnt.h,v 1.5 2002/02/16 21:27:18 millert Exp $	*/
+/*	$OpenBSD: ypclnt.h,v 1.6 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: ypclnt.h,v 1.7 1995/07/14 21:11:10 christos Exp $	*/
 
 /*
@@ -72,16 +72,14 @@ struct dom_binding;
 int	_yp_dobind(const char *, struct dom_binding **);
 void	yp_unbind(const char *);
 int	yp_get_default_domain(char **);
-int	yp_match 	__P((const char *, const char *, const char *,
-			     int , char **, int *));
-int	yp_first 	__P((const char *, const char *, char **, int *,
-			     char **, int *));
-int	yp_next		__P((const char *, const char *, const char *,
-			     int, char **, int *, char **, int *));
+int	yp_match(const char *, const char *, const char *, int , char **,
+	    int *);
+int	yp_first(const char *, const char *, char **, int *, char **, int *);
+int	yp_next(const char *, const char *, const char *, int, char **, int *,
+	    char **, int *);
 int	yp_master(const char *, const char *, char **);
 int	yp_order(const char *, const char *, int *);
-int	yp_all		__P((const char *, const char *,
-			     struct ypall_callback *));
+int	yp_all(const char *, const char *, struct ypall_callback *);
 char *	yperr_string(int);
 int	ypprot_err(unsigned int);
 struct ypmaplist;
diff --git a/src/include/search.h b/src/include/search.h
index 53efbadb..d0460df0 100644
--- a/src/include/search.h
+++ b/src/include/search.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.h,v 1.4 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: search.h,v 1.5 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: search.h,v 1.9 1995/08/08 21:14:45 jtc Exp $	*/
 
 /*
@@ -33,26 +33,26 @@ typedef enum {
 } VISIT;
 
 __BEGIN_DECLS
-extern void	*bsearch __P((const void *, const void *, size_t, size_t,
-			      int (*)(const void *, const void *)));
+extern void	*bsearch(const void *, const void *, size_t, size_t,
+		    int (*)(const void *, const void *));
 extern int	 hcreate(unsigned int);
 extern void	 hdestroy(void);
 extern ENTRY	*hsearch(ENTRY, ACTION);
 
-extern void	*lfind __P((const void *, const void *, size_t *, size_t,
-			      int (*)(const void *, const void *)));
-extern void	*lsearch __P((const void *, const void *, size_t *, size_t,
-			      int (*)(const void *, const void *)));
+extern void	*lfind(const void *, const void *, size_t *, size_t,
+		    int (*)(const void *, const void *));
+extern void	*lsearch(const void *, const void *, size_t *, size_t,
+		    int (*)(const void *, const void *));
 extern void	 insque(void *, void *);
 extern void	 remque(void *);
 
-extern void	*tdelete __P((const void *, void **,
-			      int (*)(const void *, const void *)));
-extern void	*tfind __P((const void *, void * const *,
-			      int (*)(const void *, const void *)));
-extern void	*tsearch __P((const void *, void **, 
-			      int (*)(const void *, const void *)));
-extern void      twalk __P((const void *, void (*)(const void *, VISIT, int)));
+extern void	*tdelete(const void *, void **,
+		    int (*)(const void *, const void *));
+extern void	*tfind(const void *, void * const *,
+		    int (*)(const void *, const void *));
+extern void	*tsearch(const void *, void **, 
+		    int (*)(const void *, const void *));
+extern void      twalk(const void *, void (*)(const void *, VISIT, int));
 __END_DECLS
 
 #endif
diff --git a/src/include/stdio.h b/src/include/stdio.h
index 4bf6c024..d6f64a65 100644
--- a/src/include/stdio.h
+++ b/src/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.20 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.21 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
 
 /*-
@@ -342,11 +342,11 @@ __END_DECLS
  * Stdio function-access interface.
  */
 __BEGIN_DECLS
-FILE	*funopen __P((const void *,
+FILE	*funopen(const void *,
 		int (*)(void *, char *, int),
 		int (*)(void *, const char *, int),
 		fpos_t (*)(void *, fpos_t, int),
-		int (*)(void *)));
+		int (*)(void *));
 __END_DECLS
 #define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
 #define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
diff --git a/src/include/stdlib.h b/src/include/stdlib.h
index 32b91157..b5b558ee 100644
--- a/src/include/stdlib.h
+++ b/src/include/stdlib.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdlib.h,v 1.16 2002/02/16 21:27:17 millert Exp $	*/
+/*	$OpenBSD: stdlib.h,v 1.17 2002/02/17 19:42:21 millert Exp $	*/
 /*	$NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $	*/
 
 /*-
@@ -95,12 +95,12 @@ typedef struct {
 __BEGIN_DECLS
 __dead void	 abort(void);
 int	 abs(int);
-int	 atexit __P((void (*)(void)));
+int	 atexit(void (*)(void));
 double	 atof(const char *);
 int	 atoi(const char *);
 long	 atol(const char *);
-void	*bsearch __P((const void *, const void *, size_t,
-	    size_t, int (*)(const void *, const void *)));
+void	*bsearch(const void *, const void *, size_t, size_t,
+	    int (*)(const void *, const void *));
 void	*calloc(size_t, size_t);
 div_t	 div(int, int);
 __dead void	 exit(int);
@@ -109,8 +109,7 @@ char	*getenv(const char *);
 long	 labs(long);
 ldiv_t	 ldiv(long, long);
 void	*malloc(size_t);
-void	 qsort __P((void *, size_t, size_t,
-	    int (*)(const void *, const void *)));
+void	 qsort(void *, size_t, size_t, int (*)(const void *, const void *));
 int	 rand(void);
 int	 rand_r(unsigned int *);
 void	*realloc(void *, size_t);
@@ -166,14 +165,12 @@ extern	 int optreset;
 int	 getsubopt(char **, char * const *, char **);
 extern	 char *suboptarg;		/* getsubopt(3) external variable */
 
-int	 heapsort __P((void *, size_t, size_t,
-	    int (*)(const void *, const void *)));
-int	 mergesort __P((void *, size_t, size_t,
-	    int (*)(const void *, const void *)));
-int	 radixsort __P((const unsigned char **, int, const unsigned char *,
-	    unsigned));
-int	 sradixsort __P((const unsigned char **, int, const unsigned char *,
-	    unsigned));
+int	 heapsort(void *, size_t, size_t, int (*)(const void *, const void *));
+int	 mergesort(void *, size_t, size_t, int (*)(const void *, const void *));
+int	 radixsort(const unsigned char **, int, const unsigned char *,
+	    unsigned);
+int	 sradixsort(const unsigned char **, int, const unsigned char *,
+	    unsigned);
 
 char	*initstate(unsigned int, char *, size_t);
 long	 random(void);
diff --git a/src/include/unistd.h b/src/include/unistd.h
index bae73c5b..394b5221 100644
--- a/src/include/unistd.h
+++ b/src/include/unistd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unistd.h,v 1.36 2002/02/16 21:27:17 millert Exp $ */
+/*	$OpenBSD: unistd.h,v 1.37 2002/02/17 19:42:21 millert Exp $ */
 /*	$NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $	*/
 
 /*-
@@ -159,12 +159,12 @@ int	 nice(int);
 void	 psignal(unsigned int, const char *);
 extern __const char *__const sys_siglist[];
 int	 profil(char *, size_t, unsigned long, unsigned int);
-int	 rcmd __P((char **, int, const char *,
-		const char *, const char *, int *));
-int	 rcmd_af __P((char **, int, const char *,
-		const char *, const char *, int *, int));
-int	 rcmdsh __P((char **, int, const char *,
-		const char *, const char *, char *));
+int	 rcmd(char **, int, const char *,
+	    const char *, const char *, int *);
+int	 rcmd_af(char **, int, const char *,
+	    const char *, const char *, int *, int);
+int	 rcmdsh(char **, int, const char *,
+	    const char *, const char *, char *);
 char	*re_comp(const char *);
 int	 re_exec(const char *);
 int	 readlink(const char *, char *, size_t);
diff --git a/src/lib/libc/stdlib/merge.c b/src/lib/libc/stdlib/merge.c
index 345eb2fd..4ae6488a 100644
--- a/src/lib/libc/stdlib/merge.c
+++ b/src/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/src/lib/libc/stdlib/qsort.c b/src/lib/libc/stdlib/qsort.c
index d16ed7b0..9b8bb580 100644
--- a/src/lib/libc/stdlib/qsort.c
+++ b/src/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/src/lib/libc/stdlib/radixsort.c b/src/lib/libc/stdlib/radixsort.c
index 40d7c078..e03b4797 100644
--- a/src/lib/libc/stdlib/radixsort.c
+++ b/src/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/src/lib/libutil/scsi.h b/src/lib/libutil/scsi.h
index 08b8a9b9..3551ce54 100644
--- a/src/lib/libutil/scsi.h
+++ b/src/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/src/lib/libutil/util.h b/src/lib/libutil/util.h
index 33bf1356..dee86c93 100644
--- a/src/lib/libutil/util.h
+++ b/src/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);