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

71 files changed, 486 insertions, 602 deletions

diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 398576a421f..ecc8e1dc44b 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -14,7 +14,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ac.c,v 1.10 2002/02/16 21:28:00 millert Exp $";
+static char rcsid[] = "$Id: ac.c,v 1.11 2002/02/17 19:42:35 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -89,8 +89,8 @@ struct utmp_list	*log_in(struct utmp_list *, struct utmp *);
 struct utmp_list	*log_out(struct utmp_list *, struct utmp *);
 int			on_console(struct utmp_list *);
 void			show(char *, time_t);
-void			show_today __P((struct user_list *, struct utmp_list *,
-			    time_t));
+void			show_today(struct user_list *, struct utmp_list *,
+			    time_t);
 void			show_users(struct user_list *);
 struct user_list	*update_user(struct user_list *, char *, time_t);
 void			usage(void);
diff --git a/usr.sbin/afs/src/lib/acl/acl.h b/usr.sbin/afs/src/lib/acl/acl.h
index 4a90b8abae2..923f8f682b9 100644
--- a/usr.sbin/afs/src/lib/acl/acl.h
+++ b/usr.sbin/afs/src/lib/acl/acl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: acl.h,v 1.2 2002/02/16 21:28:00 millert Exp $ */
+/* $Id: acl.h,v 1.3 2002/02/17 19:42:35 millert Exp $ */
 
 #ifndef __ACL_H
 #define __ACL_H
@@ -46,10 +46,6 @@
 #include <stds.h>
 #endif
 
-#ifndef __P
-#define __P(x) x
-#endif
-
 void acl_canonicalize_principal(char *principal, char *canon);
 int acl_initialize(char *acl_file, int perm);
 int acl_exact_match(char *acl, char *principal);
diff --git a/usr.sbin/afs/src/rxkad/rxkad.h b/usr.sbin/afs/src/rxkad/rxkad.h
index 3ab7a79a693..b4110712b9f 100644
--- a/usr.sbin/afs/src/rxkad/rxkad.h
+++ b/usr.sbin/afs/src/rxkad/rxkad.h
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  */
 
-/* @(#)$Id: rxkad.h,v 1.3 2002/02/16 21:28:00 millert Exp $ */
+/* @(#)$Id: rxkad.h,v 1.4 2002/02/17 19:42:35 millert Exp $ */
 
 #ifndef __RXKAD_H
 #define __RXKAD_H
@@ -65,35 +65,31 @@ extern int rxkad_min_level;	/* enforce min level at client end */
 
 extern int rxkad_EpochWasSet;
 
-#ifndef __P
-#define __P(x) x
-#endif
-
-int32 rxkad_GetServerInfo __P((struct rx_connection *con,
-			       rxkad_level *level,
-			       u_int32 *expiration,
-			       char *name,
-			       char *instance,
-			       char *cell,
-			       int32 *kvno));
+int32 rxkad_GetServerInfo(struct rx_connection *con,
+			  rxkad_level *level,
+			  u_int32 *expiration,
+			  char *name,
+			  char *instance,
+			  char *cell,
+			  int32 *kvno);
 
 struct rx_securityClass *
-rxkad_NewServerSecurityObject __P((/*rxkad_level*/ int min_level,
-				   void *appl_data,
-				   int (*get_key)(void *appl_data,
-						  int kvno,
-						  des_cblock *key),
-				   int (*user_ok)(char *name,
-						  char *inst,
-						  char *realm,
-						  int kvno)));
+rxkad_NewServerSecurityObject(/*rxkad_level*/ int min_level,
+			      void *appl_data,
+			      int (*get_key)(void *appl_data,
+			      int kvno,
+			      des_cblock *key),
+			      int (*user_ok)(char *name,
+					     char *inst,
+					     char *realm,
+					     int kvno));
 
 struct rx_securityClass *
-rxkad_NewClientSecurityObject __P((/*rxkad_level*/ int level,
-				   void *sessionkey,
-				   int32 kvno,
-				   int ticketLen,
-				   char *ticket));
+rxkad_NewClientSecurityObject(/*rxkad_level*/ int level,
+			      void *sessionkey,
+			      int32 kvno,
+			      int ticketLen,
+			      char *ticket);
 
 #define RXKADINCONSISTENCY	(19270400L)
 #define RXKADPACKETSHORT	(19270401L)
@@ -144,25 +140,25 @@ int time_to_life(u_int32 start, u_int32 end);
 int tkt_CheckTimes(int32 begin, int32 end, int32 now);
 
 int
-tkt_MakeTicket __P((char *ticket,
-		    int *ticketLen,
-		    struct ktc_encryptionKey *key,
-		    char *name, char *inst, char *cell,
-		    u_int32 start, u_int32 end,
-		    struct ktc_encryptionKey *sessionKey,
-		    u_int32 host,
-		    char *sname, char *sinst));
+tkt_MakeTicket(char *ticket,
+	       int *ticketLen,
+	       struct ktc_encryptionKey *key,
+	       char *name, char *inst, char *cell,
+	       u_int32 start, u_int32 end,
+	       struct ktc_encryptionKey *sessionKey,
+	       u_int32 host,
+	       char *sname, char *sinst);
 
 int
-tkt_DecodeTicket __P((char *asecret,
-		      int32 ticketLen,
-		      struct ktc_encryptionKey *key,
-		      char *name,
-		      char *inst,
-		      char *cell,
-		      char *sessionKey,
-		      int32 *host,
-		      int32 *start,
-		      int32 *end));
+tkt_DecodeTicket(char *asecret,
+		 int32 ticketLen,
+		 struct ktc_encryptionKey *key,
+		 char *name,
+		 char *inst,
+		 char *cell,
+		 char *sessionKey,
+		 int32 *host,
+		 int32 *start,
+		 int32 *end);
 
 #endif /* __RXKAD_H */
diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h
index 5017fdda174..16e516ab684 100644
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.16 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: config.h,v 1.17 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $	*/
 
 /*
@@ -55,12 +55,6 @@
 #if !defined(MAKE_BOOTSTRAP) && defined(BSD)
 #include <sys/cdefs.h>
 #include <paths.h>
-#else /* ...BSD */
-#if defined(__STDC__) || defined(__cplusplus)
-#define	__P(protos)	protos		/* full-blown ANSI C */
-#else /* ...STDC */
-#define	__P(protos)	()		/* traditional C preprocessor */
-#endif /* ...STDC */
 #endif /* ...BSD */
 
 #ifdef __STDC__
@@ -384,8 +378,7 @@ char	*sourcepath(const char *);
 void	error(const char *, ...);			/* immediate errs */
 void	xerror(const char *, int, const char *, ...);	/* delayed errs */
 __dead void panic(const char *, ...);
-struct nvlist *newnv __P((const char *, const char *, void *, int,
-	    struct nvlist *));
+struct nvlist *newnv(const char *, const char *, void *, int, struct nvlist *);
 void	nvfree(struct nvlist *);
 void	nvfreel(struct nvlist *);
 
diff --git a/usr.sbin/config/files.c b/usr.sbin/config/files.c
index 4245d2fe5b9..e57cffc7a7d 100644
--- a/usr.sbin/config/files.c
+++ b/usr.sbin/config/files.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: files.c,v 1.9 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: files.c,v 1.10 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: files.c,v 1.6 1996/03/17 13:18:17 cgd Exp $	*/
 
 /*
@@ -72,8 +72,8 @@ static int	checkaux(const char *, void *);
 static int	fixcount(const char *, void *);
 static int	fixfsel(const char *, void *);
 static int	fixsel(const char *, void *);
-static int	expr_eval __P((struct nvlist *,
-		    int (*)(const char *, void *), void *));
+static int	expr_eval(struct nvlist *,
+		    int (*)(const char *, void *), void *);
 static void	expr_free(struct nvlist *);
 
 void
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 03a0e2acc22..4feedfd8ab5 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.23 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.24 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $	*/
 
 /*
@@ -74,8 +74,8 @@ static struct nvlist **nextdefopt;
 static struct nvlist **nextmkopt;
 
 static __dead void stop(void);
-static int do_option __P((struct hashtab *, struct nvlist ***,
-			const char *, const char *, const char *));
+static int do_option(struct hashtab *, struct nvlist ***,
+    const char *, const char *, const char *);
 static int crosscheck(void);
 static int badstar(void);
 static int mksymlinks(void);
diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c
index 2abf276e3b9..009516850b2 100644
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sem.c,v 1.23 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: sem.c,v 1.24 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: sem.c,v 1.10 1996/11/11 23:40:11 gwr Exp $	*/
 
 /*
@@ -80,10 +80,10 @@ static struct devi **nextpseudo;
 static int has_errobj(struct nvlist *, void *);
 static struct nvlist *addtoattr(struct nvlist *, struct devbase *);
 static int exclude(struct nvlist *, const char *, const char *);
-static int resolve __P((struct nvlist **, const char *, const char *,
-			struct nvlist *, int));
-static int lresolve __P((struct nvlist **, const char *, const char *,
-			struct nvlist *, int));
+static int resolve(struct nvlist **, const char *, const char *,
+    struct nvlist *, int);
+static int lresolve(struct nvlist **, const char *, const char *,
+    struct nvlist *, int);
 static struct devi *newdevi(const char *, int, struct devbase *d);
 static struct devi *getdevi(const char *);
 static const char *concat(const char *, int);
diff --git a/usr.sbin/config/sem.h b/usr.sbin/config/sem.h
index 89dfa079738..5e1fb471f22 100644
--- a/usr.sbin/config/sem.h
+++ b/usr.sbin/config/sem.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sem.h,v 1.9 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: sem.h,v 1.10 2002/02/17 19:42:35 millert Exp $	*/
 /*	$NetBSD: sem.h,v 1.6 1996/11/11 23:40:10 gwr Exp $	*/
 
 /*
@@ -50,10 +50,9 @@ void		enddefs(void);
 void		setdefmaxusers(int, int, int);
 void		setmaxusers(int);
 int		defattr(const char *, struct nvlist *);
-void		defdev __P((struct devbase *, int, struct nvlist *,
-			struct nvlist *));
-void		defdevattach __P((struct deva *, struct devbase *,
-			struct nvlist *, struct nvlist *));
+void		defdev(struct devbase *, int, struct nvlist *, struct nvlist *);
+void		defdevattach(struct deva *, struct devbase *,
+		    struct nvlist *, struct nvlist *);
 struct devbase *getdevbase(const char *name);
 struct deva    *getdevattach(const char *name);
 struct attr    *getattr(const char *name);
diff --git a/usr.sbin/eeprom/defs.h b/usr.sbin/eeprom/defs.h
index f51f9217aad..8be7394133a 100644
--- a/usr.sbin/eeprom/defs.h
+++ b/usr.sbin/eeprom/defs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: defs.h,v 1.3 2002/02/16 21:28:02 millert Exp $	*/
+/*	$OpenBSD: defs.h,v 1.4 2002/02/17 19:42:36 millert Exp $	*/
 /*	$NetBSD: defs.h,v 1.2 1996/02/28 01:13:20 thorpej Exp $	*/
 
 /*-
@@ -83,8 +83,7 @@ struct	strvaltabent {
  */
 struct	extabent {
 	char	*ex_keyword;		/* keyword for this entry */
-	void	(*ex_handler) __P((struct extabent *,
-		    struct opiocdesc *, char *));
+	void	(*ex_handler)(struct extabent *, struct opiocdesc *, char *);
 					/* handler function for this entry */
 };
 #endif /* __sparc__ */
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index 335b90d8332..d65735ea160 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lp.h,v 1.7 2002/02/16 21:28:03 millert Exp $	*/
+/*	$OpenBSD: lp.h,v 1.8 2002/02/17 19:42:36 millert Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -113,7 +113,7 @@ void     dump(char *, char *, int);
 void	 fatal(const char *, ...);
 int	 getline(FILE *);
 int	 getport(char *, int);
-int	 getq __P((struct queue *(*[])));
+int	 getq(struct queue *(*[]));
 void     header(void);
 void     inform(char *);
 int      inlist(char *, char *);
diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c
index 4fdcc9ea833..ffe94ae536f 100644
--- a/usr.sbin/map-mbone/mapper.c
+++ b/usr.sbin/map-mbone/mapper.c
@@ -100,9 +100,9 @@ char *			graph_name(u_int32_t addr, char *buf);
 void			graph_edges(Node *node);
 void			elide_aliases(Node *node);
 void			graph_map(void);
-int			get_number __P((int *var, int deflt, char ***pargv,
-						int *pargc));
-u_int32_t			host_addr(char *name);
+int			get_number(int *var, int deflt, char ***pargv,
+			    int *pargc);
+u_int32_t		host_addr(char *name);
 
 
 Node *find_node(addr, ptr)
diff --git a/usr.sbin/mopd/common/file.h b/usr.sbin/mopd/common/file.h
index 076e31b8e50..9c6df070eb9 100644
--- a/usr.sbin/mopd/common/file.h
+++ b/usr.sbin/mopd/common/file.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: file.h,v 1.5 2002/02/17 19:42:36 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: file.h,v 1.5 2002/02/17 19:42:36 millert Exp $
  *
  */
 
@@ -58,11 +58,10 @@ void	mopFileSwapX(u_char *, int, int);
 int	CheckMopFile(int);
 int	GetMopFileInfo(int, u_long *, u_long *);
 int	CheckAOutFile(int);
-int	GetAOutFileInfo __P((int, u_long *, u_long *, u_long *, u_long *,
-			     u_long *, u_long *, u_long *, u_long *, int *));
-int	GetFileInfo     __P((int, u_long *, u_long *, int *,
-			     u_long *, u_long *, u_long *, u_long *,
-			     u_long *, u_long *));
+int	GetAOutFileInfo(int, u_long *, u_long *, u_long *, u_long *,
+			u_long *, u_long *, u_long *, u_long *, int *);
+int	GetFileInfo(int, u_long *, u_long *, int *, u_long *, u_long *,
+		    u_long *, u_long *, u_long *, u_long *);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/get.h b/usr.sbin/mopd/common/get.h
index 03c32018325..c70bb6cfee8 100644
--- a/usr.sbin/mopd/common/get.h
+++ b/usr.sbin/mopd/common/get.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: get.h,v 1.5 2002/02/17 19:42:36 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: get.h,v 1.5 2002/02/17 19:42:36 millert Exp $
  *
  */
 
@@ -51,8 +51,8 @@ u_short	mopGetShort(u_char *,int *);
 u_long	mopGetLong(u_char *,int *);
 void	mopGetMulti(u_char *,int *,u_char *,int);
 int	mopGetTrans(u_char *, int);
-void	mopGetHeader __P((u_char *, int *, u_char **, u_char **, u_short *,
-			  int *, int));
+void	mopGetHeader(u_char *, int *, u_char **, u_char **, u_short *,
+		     int *, int);
 u_short	mopGetLength(u_char *, int);
 __END_DECLS
 #endif
diff --git a/usr.sbin/mopd/common/print.h b/usr.sbin/mopd/common/print.h
index d79f58e27c2..6d4ab04a1a9 100644
--- a/usr.sbin/mopd/common/print.h
+++ b/usr.sbin/mopd/common/print.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: print.h,v 1.5 2002/02/17 19:42:36 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $
+ *	$OpenBSD: print.h,v 1.5 2002/02/17 19:42:36 millert Exp $
  *
  */
 
@@ -56,8 +56,7 @@ void	mopPrintHeader(FILE *, u_char *, int);
 void	mopPrintMopHeader(FILE *, u_char *, int);
 void	mopPrintDevice(FILE *, u_char);
 void	mopPrintTime(FILE *, u_char *);
-void	mopPrintInfo      __P((FILE *, u_char *, int *, u_short,
-			       u_char, int));
+void	mopPrintInfo(FILE *, u_char *, int *, u_short, u_char, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/mopd/process.h b/usr.sbin/mopd/mopd/process.h
index c500738cab1..e825cc35789 100644
--- a/usr.sbin/mopd/mopd/process.h
+++ b/usr.sbin/mopd/mopd/process.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: process.h,v 1.4 2002/02/17 19:42:36 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: process.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: process.h,v 1.4 2002/02/17 19:42:36 millert Exp $
  *
  */
 
@@ -42,10 +42,10 @@ void	mopProcessRC (/* FILE *, struct if_info *, u_char *, int *,
 			 u_char *, u_char *, int, u_short */);
 #else
 __BEGIN_DECLS
-void	mopProcessDL __P((FILE *, struct if_info *, u_char *, int *,
-			  u_char *, u_char *, int, u_short));
-void	mopProcessRC __P((FILE *, struct if_info *, u_char *, int *,
-			  u_char *, u_char *, int, u_short));
+void	mopProcessDL(FILE *, struct if_info *, u_char *, int *,
+		     u_char *, u_char *, int, u_short);
+void	mopProcessRC(FILE *, struct if_info *, u_char *, int *,
+		     u_char *, u_char *, int, u_short);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index 7f6e6c8480e..1fbd584aeac 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -108,9 +108,9 @@ vifi_t  numvifs;		/* to keep loader happy */
 char *			inet_name(u_int32_t addr);
 void			ask(u_int32_t dst);
 void			ask2(u_int32_t dst);
-int			get_number __P((int *var, int deflt, char ***pargv,
-					int *pargc));
-u_int32_t			host_addr(char *name);
+int			get_number(int *var, int deflt, char ***pargv,
+			    int *pargc);
+u_int32_t		host_addr(char *name);
 void			usage(void);
 
 /* to shut up -Wstrict-prototypes */
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 666e11a561e..b5c6150a910 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -36,14 +36,6 @@
 #include <sys/un.h>
 #endif /* RSRR */
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(x)	x
-#else
-#define __P(x)	()
-#endif
-#endif
-
 typedef void (*cfunc_t)(void *);
 typedef void (*ihfunc_t)(int, fd_set *);
 
@@ -167,41 +159,35 @@ extern int		register_input_handler(int fd, ihfunc_t func);
 /* igmp.c */
 extern void		init_igmp(void);
 extern void		accept_igmp(int recvlen);
-extern void		send_igmp __P((u_int32_t src, u_int32_t dst, int type,
-						int code, u_int32_t group,
-						int datalen));
+extern void		send_igmp(u_int32_t src, u_int32_t dst, int type,
+			    int code, u_int32_t group, int datalen);
 
 /* callout.c */
 extern void		callout_init(void);
 extern void		age_callout_queue(void);
-extern int		timer_setTimer __P((int delay, cfunc_t action,
-						char *data));
+extern int		timer_setTimer(int delay, cfunc_t action, char *data);
 extern void		timer_clearTimer(int timer_id);
 
 /* route.c */
 extern void		init_routes(void);
 extern void		start_route_updates(void);
-extern void		update_route __P((u_int32_t origin, u_int32_t mask,
-						u_int metric, u_int32_t src,
-						vifi_t vifi));
+extern void		update_route(u_int32_t origin, u_int32_t mask,
+			    u_int metric, u_int32_t src, vifi_t vifi);
 extern void		age_routes(void);
 extern void		expire_all_routes(void);
 extern void		free_all_routes(void);
-extern void		accept_probe __P((u_int32_t src, u_int32_t dst,
-						char *p, int datalen,
-						u_int32_t level));
-extern void		accept_report __P((u_int32_t src, u_int32_t dst,
-						char *p, int datalen,
-						u_int32_t level));
+extern void		accept_probe(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen, u_int32_t level);
+extern void		accept_report(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen, u_int32_t level);
 extern struct rtentry *	determine_route(u_int32_t src);
-extern void		report __P((int which_routes, vifi_t vifi,
-						u_int32_t dst));
+extern void		report(int which_routes, vifi_t vifi, u_int32_t dst);
 extern void		report_to_all_neighbors(int which_routes);
 extern int		report_next_chunk(void);
 extern void		add_vif_to_routes(vifi_t vifi);
 extern void		delete_vif_from_routes(vifi_t vifi);
-extern void		delete_neighbor_from_routes __P((u_int32_t addr,
-							vifi_t vifi));
+extern void		delete_neighbor_from_routes(u_int32_t addr,
+			    vifi_t vifi);
 extern void		dump_routes(FILE *fp);
 extern void		start_route_updates(void);
 
@@ -213,24 +199,22 @@ extern void		age_vifs(void);
 extern void		dump_vifs(FILE *fp);
 extern void		stop_all_vifs(void);
 extern struct listaddr *neighbor_info(vifi_t vifi, u_int32_t addr);
-extern void		accept_group_report __P((u_int32_t src, u_int32_t dst,
-					u_int32_t group, int r_type));
+extern void		accept_group_report(u_int32_t src, u_int32_t dst,
+			    u_int32_t group, int r_type);
 extern void		query_groups(void);
 extern void		probe_for_neighbors(void);
-extern int		update_neighbor __P((vifi_t vifi, u_int32_t addr,
-					int msgtype, char *p, int datalen,
-					u_int32_t level));
+extern int		update_neighbor(vifi_t vifi, u_int32_t addr,
+			    int msgtype, char *p, int datalen, u_int32_t level);
 extern void		accept_neighbor_request(u_int32_t src, u_int32_t dst);
-extern void		accept_neighbor_request2 __P((u_int32_t src,
-					u_int32_t dst));
-extern void		accept_neighbors __P((u_int32_t src, u_int32_t dst,
-					u_char *p, int datalen, u_int32_t level));
-extern void		accept_neighbors2 __P((u_int32_t src, u_int32_t dst,
-					u_char *p, int datalen, u_int32_t level));
-extern void		accept_leave_message __P((u_int32_t src, u_int32_t dst,
-					u_int32_t group));
-extern void		accept_membership_query __P((u_int32_t src, u_int32_t dst,
-					u_int32_t group, int tmo));
+extern void		accept_neighbor_request2(u_int32_t src, u_int32_t dst);
+extern void		accept_neighbors(u_int32_t src, u_int32_t dst,
+			    u_char *p, int datalen, u_int32_t level);
+extern void		accept_neighbors2(u_int32_t src, u_int32_t dst,
+			    u_char *p, int datalen, u_int32_t level);
+extern void		accept_leave_message(u_int32_t src, u_int32_t dst,
+			    u_int32_t group);
+extern void		accept_membership_query(u_int32_t src, u_int32_t dst,
+			    u_int32_t group, int tmo);
 
 /* config.c */
 extern void		config_vifs_from_kernel(void);
@@ -249,12 +233,12 @@ extern int		inet_cksum(u_short *addr, u_int len);
 /* prune.c */
 extern unsigned		kroutes;
 extern void		add_table_entry(u_int32_t origin, u_int32_t mcastgrp);
-extern void 		del_table_entry __P((struct rtentry *r,
-					u_int32_t mcastgrp, u_int del_flag));
+extern void 		del_table_entry(struct rtentry *r,
+			    u_int32_t mcastgrp, u_int del_flag);
 extern void		update_table_entry(struct rtentry *r);
 extern void		init_ktable(void);
-extern void 		accept_prune __P((u_int32_t src, u_int32_t dst, char *p,
-					int datalen));
+extern void 		accept_prune(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen);
 extern void		steal_sources(struct rtentry *rt);
 extern void		reset_neighbor_state(vifi_t vifi, u_int32_t addr);
 extern int		grplst_mem(vifi_t vifi, u_int32_t mcastgrp);
@@ -265,14 +249,13 @@ extern void		dump_cache(FILE *fp2);
 extern void 		update_lclgrp(vifi_t vifi, u_int32_t mcastgrp);
 extern void		delete_lclgrp(vifi_t vifi, u_int32_t mcastgrp);
 extern void		chkgrp_graft(vifi_t vifi, u_int32_t mcastgrp);
-extern void		accept_graft __P((u_int32_t src, u_int32_t dst, char *p,
-					int datalen));
-extern void 		accept_g_ack __P((u_int32_t src, u_int32_t dst, char *p,
-					int datalen));
+extern void		accept_graft(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen);
+extern void 		accept_g_ack(u_int32_t src, u_int32_t dst, char *p,
+			    int datalen);
 /* u_int is promoted u_char */
-extern void		accept_mtrace __P((u_int32_t src, u_int32_t dst,
-					u_int32_t group, char *data, u_int no,
-					int datalen));
+extern void		accept_mtrace(u_int32_t src, u_int32_t dst,
+			    u_int32_t group, char *data, u_int no, int datalen);
 
 /* kern.c */
 extern void		k_set_rcvbuf(int bufsize);
@@ -301,8 +284,8 @@ extern struct stable *	find_grp_src();
 /* prune.c */
 extern struct gtable	*kernel_table;
 extern struct gtable	*gtp;
-extern int		find_src_grp __P((u_int32_t src, u_int32_t mask,
-					u_int32_t grp));
+extern int		find_src_grp(u_int32_t src, u_int32_t mask,
+			    u_int32_t grp);
 
 /* rsrr.c */
 extern void		rsrr_init(void);
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index cd79b73fe2c..6c3f6ba63c9 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -57,8 +57,8 @@ static struct ptable *	find_prune_entry(u_int32_t vr, struct ptable *pt);
 static void		expire_prune(vifi_t vifi, struct gtable *gt);
 static void		send_prune(struct gtable *gt);
 static void		send_graft(struct gtable *gt);
-static void		send_graft_ack __P((u_int32_t src, u_int32_t dst,
-					u_int32_t origin, u_int32_t grp));
+static void		send_graft_ack(u_int32_t src, u_int32_t dst,
+			    u_int32_t origin, u_int32_t grp);
 static void		update_kernel(struct gtable *g);
 static char *		scaletime(u_long t);
 
diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c
index 7657cdd25ef..ec4cfc07102 100644
--- a/usr.sbin/mrouted/route.c
+++ b/usr.sbin/mrouted/route.c
@@ -40,14 +40,12 @@ unsigned int nroutes;			/* current number of route entries  */
 /*
  * Private functions.
  */
-static int init_children_and_leaves	__P((struct rtentry *r,
-						vifi_t parent));
+static int init_children_and_leaves(struct rtentry *r, vifi_t parent);
 static int find_route(u_int32_t origin, u_int32_t mask);
 static void create_route(u_int32_t origin, u_int32_t mask);
 static void discard_route(struct rtentry *prev_r);
 static int compare_rts(const void *rt1, const void *rt2);
-static int report_chunk		__P((struct rtentry *start_rt, vifi_t vifi,
-						u_int32_t dst));
+static int report_chunk(struct rtentry *start_rt, vifi_t vifi, u_int32_t dst);
 
 /*
  * Initialize the routing table and associated variables.
diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c
index 017dc152d19..26a1cb53b6c 100644
--- a/usr.sbin/mrouted/rsrr.c
+++ b/usr.sbin/mrouted/rsrr.c
@@ -76,11 +76,10 @@ int client_length = sizeof(client_addr);
  */
 static void	rsrr_accept(int recvlen);
 static void	rsrr_accept_iq(void);
-static int	rsrr_accept_rq __P((struct rsrr_rq *route_query, int flags,
-					struct gtable *gt_notify));
+static int	rsrr_accept_rq(struct rsrr_rq *route_query, int flags,
+		    struct gtable *gt_notify);
 static int	rsrr_send(int sendlen);
-static void	rsrr_cache __P((struct gtable *gt,
-					struct rsrr_rq *route_query));
+static void	rsrr_cache(struct gtable *gt, struct rsrr_rq *route_query);
 
 /* Initialize RSRR socket */
 void
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index ea84bc76629..71b46a989ec 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -45,8 +45,8 @@ static void DelVif(void *arg);
 static int SetTimer(int vifi, struct listaddr *g);
 static int DeleteTimer(int id);
 static void SendQuery(void *arg);
-static int SetQueryTimer __P((struct listaddr *g, vifi_t vifi, int to_expire,
-					int q_time));
+static int SetQueryTimer(struct listaddr *g, vifi_t vifi, int to_expire,
+    int q_time);
 
 
 /*
diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c
index 81d76614a44..d0e5e9a140a 100644
--- a/usr.sbin/mtrace/mtrace.c
+++ b/usr.sbin/mtrace/mtrace.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static char rcsid[] =
-    "@(#) $Id: mtrace.c,v 1.10 2002/02/16 21:28:05 millert Exp $";
+    "@(#) $Id: mtrace.c,v 1.11 2002/02/17 19:42:37 millert Exp $";
 #endif
 
 #include <netdb.h>
@@ -149,21 +149,19 @@ u_int32_t			get_netmask(int s, u_int32_t dst);
 int			get_ttl(struct resp_buf *buf);
 int			t_diff(u_long a, u_long b);
 u_long			fixtime(u_long time);
-int			send_recv __P((u_int32_t dst, int type, int code,
-					int tries, struct resp_buf *save));
+int			send_recv(u_int32_t dst, int type, int code,
+			    int tries, struct resp_buf *save);
 char *			print_host(u_int32_t addr);
 char *			print_host2(u_int32_t addr1, u_int32_t addr2);
 void			print_trace(int index, struct resp_buf *buf);
 int			what_kind(struct resp_buf *buf, char *why);
 char *			scale(int *hop);
-void			stat_line __P((struct tr_resp *r, struct tr_resp *s,
-					int have_next, int *res));
-void			fixup_stats __P((struct resp_buf *base,
-					struct resp_buf *prev,
-					struct resp_buf *new));
-int			print_stats __P((struct resp_buf *base,
-					struct resp_buf *prev,
-					struct resp_buf *new));
+void			stat_line(struct tr_resp *r, struct tr_resp *s,
+			    int have_next, int *res);
+void			fixup_stats(struct resp_buf *base,
+			    struct resp_buf *prev, struct resp_buf *new);
+int			print_stats(struct resp_buf *base,
+			    struct resp_buf *prev, struct resp_buf *new);
 void			check_vif_state(void);
 
 int			main(int argc, char *argv[]);
diff --git a/usr.sbin/named/conf/portability.h b/usr.sbin/named/conf/portability.h
index 7d4ad88e1f9..baa3e594c4b 100644
--- a/usr.sbin/named/conf/portability.h
+++ b/usr.sbin/named/conf/portability.h
@@ -260,14 +260,6 @@ struct timezoneBSD {
 };
 #endif
 
-#ifndef __P
-# if defined(__STDC__) || defined(__GNUC__)
-#  define __P(x) x
-# else
-#  define __P(x) ()
-# endif
-#endif
-
 #ifndef _TIMEZONE
 # define _TIMEZONE timezone
 #endif
diff --git a/usr.sbin/named/include/resolv.h b/usr.sbin/named/include/resolv.h
index 193c97213af..ebf9b712468 100644
--- a/usr.sbin/named/include/resolv.h
+++ b/usr.sbin/named/include/resolv.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolv.h,v 1.4 2002/02/16 21:28:05 millert Exp $	*/
+/*	$OpenBSD: resolv.h,v 1.5 2002/02/17 19:42:37 millert Exp $	*/
 
 /*
  * ++Copyright++ 1983, 1987, 1989, 1993
@@ -170,19 +170,19 @@ struct __res_state {
 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,
-					      const u_char **query,
-					      int *querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
+typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns,
+					  const u_char **query,
+					  int *querylen,
+					  u_char *ans,
+					  int anssiz,
+					  int *resplen);
 
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
-					      const u_char *query,
-					      int querylen,
-					      u_char *ans,
-					      int anssiz,
-					      int *resplen));
+typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns,
+					  const u_char *query,
+					  int querylen,
+					  u_char *ans,
+					  int anssiz,
+					  int *resplen);
 
 struct res_sym {
 	int	number;		/* Identifying number, like T_MX */
@@ -267,31 +267,30 @@ 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/usr.sbin/named/libresolv/inet_net_ntop.c b/usr.sbin/named/libresolv/inet_net_ntop.c
index b1308b9aed9..1fb34e3cfcb 100644
--- a/usr.sbin/named/libresolv/inet_net_ntop.c
+++ b/usr.sbin/named/libresolv/inet_net_ntop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/12 10:42:05 downsj Exp $	*/
+/*	$OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:37 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/12 10:42:05 downsj Exp $";
+static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.2 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif
 
@@ -41,8 +41,8 @@ static const char rcsid[] = "$OpenBSD: inet_net_ntop.c,v 1.1 1997/03/12 10:42:05
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-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 *src, int bits, char *dst,
+    size_t size);
 
 /*
  * char *
diff --git a/usr.sbin/named/libresolv/inet_net_pton.c b/usr.sbin/named/libresolv/inet_net_pton.c
index 2f8c1e6e09d..92f1b7d3552 100644
--- a/usr.sbin/named/libresolv/inet_net_pton.c
+++ b/usr.sbin/named/libresolv/inet_net_pton.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_pton.c,v 1.1 1997/03/12 10:42:05 downsj Exp $	*/
+/*	$OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:37 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/12 10:42:05 downsj Exp $";
+static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.2 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif
 
@@ -43,8 +43,7 @@ static const char rcsid[] = "$OpenBSD: inet_net_pton.c,v 1.1 1997/03/12 10:42:05
 # define SPRINTF(x) ((size_t)sprintf x)
 #endif
 
-static int	inet_net_pton_ipv4 __P((const char *src, u_char *dst,
-					size_t size));
+static int inet_net_pton_ipv4(const char *src, u_char *dst, size_t size);
 
 /*
  * static int
diff --git a/usr.sbin/named/libresolv/res_comp.c b/usr.sbin/named/libresolv/res_comp.c
index 9bf9acda04d..44212083295 100644
--- a/usr.sbin/named/libresolv/res_comp.c
+++ b/usr.sbin/named/libresolv/res_comp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Exp $	*/
+/*	$OpenBSD: res_comp.c,v 1.6 2002/02/17 19:42:37 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.14 1998/05/11 04:19:47 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Exp $";
+static char rcsid[] = "$OpenBSD: res_comp.c,v 1.6 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -83,14 +83,14 @@ static char rcsid[] = "$OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Ex
 
 static int	ns_name_ntop(const u_char *, char *, size_t);
 static int	ns_name_pton(const char *, u_char *, size_t);
-static int	ns_name_unpack __P((const u_char *, const u_char *,
-				    const u_char *, u_char *, size_t));
-static int	ns_name_pack __P((const u_char *, u_char *, int,
-				  const u_char **, const u_char **));
-static int	ns_name_uncompress __P((const u_char *, const u_char *,
-					const u_char *, char *, size_t));
-static int	ns_name_compress __P((const char *, u_char *, size_t,
-				      const u_char **, const u_char **));
+static int	ns_name_unpack(const u_char *, const u_char *,
+		    const u_char *, u_char *, size_t);
+static int	ns_name_pack(const u_char *, u_char *, int,
+		    const u_char **, const u_char **);
+static int	ns_name_uncompress(const u_char *, const u_char *,
+		    const u_char *, char *, size_t);
+static int	ns_name_compress(const char *, u_char *, size_t,
+		    const u_char **, const u_char **);
 static int	ns_name_skip(const u_char **, const u_char *);
 
 /*
diff --git a/usr.sbin/named/named-xfer/named-xfer.c b/usr.sbin/named/named-xfer/named-xfer.c
index bf365c3786a..ae2eb43a3b2 100644
--- a/usr.sbin/named/named-xfer/named-xfer.c
+++ b/usr.sbin/named/named-xfer/named-xfer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: named-xfer.c,v 1.9 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: named-xfer.c,v 1.10 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * The original version of xfer by Kevin Dunlap.
@@ -97,7 +97,7 @@ char copyright[] =
 static char sccsid[] = "@(#)named-xfer.c	4.18 (Berkeley) 3/7/91";
 static char rcsid[] = "$From: named-xfer.c,v 8.24 1998/04/07 04:59:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: named-xfer.c,v 1.9 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: named-xfer.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -158,8 +158,8 @@ static	char		*ProgName;
 
 static	void		usage(const char *);
 static	int		getzone(struct zoneinfo *, u_int32_t, int),
-			print_output __P((struct zoneinfo *, u_int32_t,
-					  u_char *, int, u_char *)),
+			print_output(struct zoneinfo *, u_int32_t,
+			    u_char *, int, u_char *),
 			netread(int, char *, int, int);
 static	SIG_FN		read_alarm();
 static	SIG_FN		term_handler();
diff --git a/usr.sbin/named/named/db_func.h b/usr.sbin/named/named/db_func.h
index f609532a78f..bcbb757217f 100644
--- a/usr.sbin/named/named/db_func.h
+++ b/usr.sbin/named/named/db_func.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_func.h,v 1.5 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: db_func.h,v 1.6 2002/02/17 19:42:37 millert Exp $	*/
 
 /* db_proc.h - prototypes for functions in db_*.c
  *
@@ -6,11 +6,11 @@
  */
 
 /* ++from db_update.c++ */
-extern int		db_update __P((char name[],
-				       struct databuf *odp,
-				       struct databuf *newdp,
-				       int flags,
-				       struct hashbuf *htp)),
+extern int		db_update(char name[],
+				  struct databuf *odp,
+				  struct databuf *newdp,
+				  int flags,
+				  struct hashbuf *htp),
 			db_cmp(struct databuf *,struct databuf *),
 			findMyZone(struct namebuf *np, int class);
 extern void		fixttl(struct databuf *dp);
@@ -37,17 +37,14 @@ extern u_int		db_getclev(const char *);
 
 /* ++from db_load.c++ */
 extern void		endline(FILE *),
-			get_netlist __P((FILE *, struct netinfo **,
-					 int, char *)),
+			get_netlist(FILE *, struct netinfo **, int, char *),
 			free_netlist(struct netinfo **);
 extern int		getword(char *, int, FILE *, int),
 			getnum(FILE *, const char *, int),
-			db_load __P((const char *, const char *,
-				     struct zoneinfo *, const char *)),
-			position_on_netlist __P((struct in_addr,
-						 struct netinfo *));
-extern struct netinfo	*addr_on_netlist __P((struct in_addr,
-					      struct netinfo *));
+			db_load(const char *, const char *,
+			    struct zoneinfo *, const char *),
+			position_on_netlist(struct in_addr, struct netinfo *);
+extern struct netinfo	*addr_on_netlist(struct in_addr, struct netinfo *);
 /* --from db_load.c-- */
 
 /* ++from db_glue.c++ */
@@ -74,12 +71,10 @@ extern char		*protocolname(int),
 #ifndef BSD
 extern int		getdtablesize(void);
 #endif
-extern struct databuf	*rm_datum __P((struct databuf *,
-				       struct namebuf *,
-				       struct databuf *));
-extern struct namebuf	*rm_name __P((struct namebuf *, 
-				      struct namebuf **,
-				      struct namebuf *));
+extern struct databuf	*rm_datum(struct databuf *, struct namebuf *,
+			    struct databuf *);
+extern struct namebuf	*rm_name(struct namebuf *, struct namebuf **,
+			    struct namebuf *);
 #ifdef INVQ
 extern void		addinv(struct namebuf *, struct databuf *),
 			rminv(struct databuf *);
@@ -87,14 +82,14 @@ struct invbuf		*saveinv(void);
 #endif
 extern char *		ctimel(long);
 extern struct in_addr	data_inaddr(const u_char *data);
-extern void		setsignal __P((int, int, SIG_FN (*)())),
-			resignal __P((int, int, SIG_FN (*)()));
+extern void		setsignal(int, int, SIG_FN (*)()),
+			resignal(int, int, SIG_FN (*)());
 extern void		db_free(struct databuf *);
 /* --from db_glue.c-- */
 
 /* ++from db_lookup.c++ */
-extern struct namebuf	*nlookup __P((const char *, struct hashbuf **,
-				      const char **, int));
+extern struct namebuf	*nlookup(const char *, struct hashbuf **,
+			    const char **, int);
 extern struct namebuf	*np_parent(struct namebuf *);
 extern int		match(struct databuf *, int, int);
 /* --from db_lookup.c-- */
diff --git a/usr.sbin/named/named/db_load.c b/usr.sbin/named/named/db_load.c
index bfafd9d96c9..00e78788cb4 100644
--- a/usr.sbin/named/named/db_load.c
+++ b/usr.sbin/named/named/db_load.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: db_load.c,v 1.6 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: db_load.c,v 1.7 2002/02/17 19:42:37 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)db_load.c	4.38 (Berkeley) 3/2/91";
 static char rcsid[] = "$From: db_load.c,v 8.33 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: db_load.c,v 1.6 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: db_load.c,v 1.7 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -117,12 +117,12 @@ static int		gettoken(register FILE *, const char *),
 			getservices(int, char *, FILE *, const char *),
 			getcharstring(char *, char *, int, int, int, FILE *, const char *);
 static void		makename(char *, const char *);
-static int		makename_ok __P((char *name, const char *origin,
-					 int class,
-					 enum transport transport,
-					 enum context context,
-					 const char *owner,
-					 const char *filename, int lineno));
+static int		makename_ok(char *name, const char *origin,
+				    int class,
+				    enum transport transport,
+				    enum context context,
+				    const char *owner,
+				    const char *filename, int lineno);
 static int		getmlword(char *, int, FILE *, int);
 static int		getallwords(char *, int, FILE *, int);
 static u_int32_t	wordtouint32(char *);
diff --git a/usr.sbin/named/named/ns_func.h b/usr.sbin/named/named/ns_func.h
index 8a64bd15a74..dc4c53c602f 100644
--- a/usr.sbin/named/named/ns_func.h
+++ b/usr.sbin/named/named/ns_func.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_func.h,v 1.3 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_func.h,v 1.4 2002/02/17 19:42:37 millert Exp $	*/
 
 /* ns_func.h - declarations for ns_*.c's externally visible functions
  *
@@ -10,61 +10,57 @@ extern void		ns_resp(u_char *, int),
 			prime_cache(void),
 			delete_all(struct namebuf *, int, int),
 			delete_stale(struct namebuf *);
-extern struct qinfo	*sysquery __P((const char *, int, int,
-				       struct in_addr *, int, int));
-extern struct notify	*findNotifyPeer __P((const struct zoneinfo *,
-					   struct in_addr));
+extern struct qinfo	*sysquery(const char *, int, int,
+			    struct in_addr *, int, int);
+extern struct notify	*findNotifyPeer(const struct zoneinfo *,
+			    struct in_addr);
 extern void		sysnotify(const char *, int, int);
-extern int		doupdate __P((u_char *, int, u_char *, int,
-				      struct databuf **, int, u_int)),
+extern int		doupdate(u_char *, int, u_char *, int,
+			    struct databuf **, int, u_int),
 			send_msg(u_char *, int, struct qinfo *),
-			findns __P((struct namebuf **, int,
-				    struct databuf **, int *, int)),
-			finddata __P((struct namebuf *, int, int, HEADER *,
-				      char **, int *, int *)),
+			findns(struct namebuf **, int,
+			    struct databuf **, int *, int),
+			finddata(struct namebuf *, int, int, HEADER *,
+			    char **, int *, int *),
 			wanted(struct databuf *, int, int),
-			add_data __P((struct namebuf *,
-				      struct databuf **,
-				      u_char *, int, int *));
+			add_data(struct namebuf *, struct databuf **,
+			    u_char *, int, int *);
 /* --from ns_resp.c-- */
 
 /* ++from ns_req.c++ */
-extern void		ns_req __P((u_char *, int, int,
-				    struct qstream *,
-				    struct sockaddr_in *,
-				    int)),
+extern void		ns_req(u_char *, int, int, struct qstream *,
+			    struct sockaddr_in *, int),
 			free_addinfo(void),
 			free_nsp(struct databuf **);
 extern int		stale(struct databuf *),
-			make_rr __P((const char *, struct databuf *,
-				     u_char *, int, int)),
+			make_rr(const char *, struct databuf *,
+			    u_char *, int, int),
 			doaddinfo(HEADER *, u_char *, int),
-			doaddauth __P((HEADER *, u_char *, int,
-				       struct namebuf *,
-				       struct databuf *));
+			doaddauth(HEADER *, u_char *, int,
+			    struct namebuf *, struct databuf *);
 #ifdef BIND_NOTIFY
-extern int		findZonePri __P((const struct zoneinfo *,
-					 const struct sockaddr_in *));
+extern int		findZonePri(const struct zoneinfo *,
+			    const struct sockaddr_in *);
 #endif
 /* --from ns_req.c-- */
 
 /* ++from ns_forw.c++ */
 extern time_t		retrytime(struct qinfo *);
-extern int		ns_forw __P((struct databuf *nsp[],
-				     u_char *msg,
-				     int msglen,
-				     struct sockaddr_in *fp,
-				     struct qstream *qsp,
-				     int dfd,
-				     struct qinfo **qpp,
-				     char *dname,
-				     int class, int type,
-				     struct namebuf *np)),
+extern int		ns_forw(struct databuf *nsp[],
+				u_char *msg,
+				int msglen,
+				struct sockaddr_in *fp,
+				struct qstream *qsp,
+				int dfd,
+				struct qinfo **qpp,
+				char *dname,
+				int class, int type,
+				struct namebuf *np),
 			haveComplained(const char *, const char *),
-			nslookup __P((struct databuf *nsp[],
-				      struct qinfo *qp,
-				      const char *syslogdname,
-				      const char *sysloginfo)),
+			nslookup(struct databuf *nsp[],
+				 struct qinfo *qp,
+				 const char *syslogdname,
+				 const char *sysloginfo),
 			qcomp(struct qserv *, struct qserv *);
 extern struct qdatagram	*aIsUs(struct in_addr);
 extern void		schedretry(struct qinfo *, time_t),
@@ -117,9 +113,8 @@ extern void		printzoneinfo(int);
 
 /* ++from ns_sort.c++ */
 extern struct netinfo	*local(struct sockaddr_in *);
-extern void		sort_response __P((u_char *, int,
-					   struct netinfo *,
-					   u_char *));
+extern void		sort_response(u_char *, int, struct netinfo *,
+			    u_char *);
 /* --from ns_sort.c-- */
 
 /* ++from ns_init.c++ */
@@ -128,10 +123,9 @@ extern void		ns_refreshtime(struct zoneinfo *, time_t),
 			ns_init(char *);
 extern enum context	ns_ptrcontext(const char *owner);
 extern enum context	ns_ownercontext(int type, enum transport);
-extern int		ns_nameok __P((const char *name, int class,
-				       enum transport, enum context,
-				       const char *owner,
-				       struct in_addr source));
+extern int		ns_nameok(const char *name, int class, enum transport,
+			    enum context, const char *owner,
+			    struct in_addr source);
 extern int		ns_wildcard(const char *name);
 /* --from ns_init.c-- */
 
@@ -151,22 +145,22 @@ extern void		ns_logstats(void);
 extern void		qtypeIncr(int qtype);
 extern struct nameser	*nameserFind(struct in_addr addr, int flags);
 #define NS_F_INSERT	0x0001
-extern void		nameserIncr __P((struct in_addr addr,
-					 enum nameserStats which));
+extern void		nameserIncr(struct in_addr addr,
+				    enum nameserStats which);
 /* --from ns_stats.c-- */
 
 /* ++from ns_validate.c++ */
 extern int
 #ifdef NCACHE
-			validate __P((char *, char *, struct sockaddr_in *,
-				      int, int, char *, int, int)),
+			validate(char *, char *, struct sockaddr_in *,
+				 int, int, char *, int, int),
 #else
-			validate __P((char *, char *, struct sockaddr_in *,
-				      int, int, char *, int)),
+			validate(char *, char *, struct sockaddr_in *,
+				 int, int, char *, int),
 #endif
-			dovalidate __P((u_char *, int, u_char *, int, int,
-					char *, struct sockaddr_in *, int *)),
+			dovalidate(u_char *, int, u_char *, int, int,
+				   char *, struct sockaddr_in *, int *),
 			update_msg(u_char *, int *, int Vlist[], int);
-extern void		store_name_addr __P((const char *, struct in_addr,
-					     const char *, const char *));
+extern void		store_name_addr(const char *, struct in_addr,
+					const char *, const char *);
 /* --from ns_validate.c-- */
diff --git a/usr.sbin/named/named/ns_init.c b/usr.sbin/named/named/ns_init.c
index 0d6d6ffe46e..7a41cba736c 100644
--- a/usr.sbin/named/named/ns_init.c
+++ b/usr.sbin/named/named/ns_init.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_init.c,v 1.7 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_init.c,v 1.8 2002/02/17 19:42:37 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_init.c	4.38 (Berkeley) 3/21/91";
 static char rcsid[] = "$From: ns_init.c,v 8.26 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_init.c,v 1.7 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_init.c,v 1.8 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -92,10 +92,9 @@ static void		zoneinit(struct zoneinfo *),
 			do_reload(char *, int, int),
 			free_forwarders(void),
 			ns_limit(const char *name, int value),
-			ns_checknames __P((const char *names,
-					   const char *severity)),
-			ns_rlimit __P((const char *name, enum limit limit,
-				       long value)),
+			ns_checknames(const char *names, const char *severity),
+			ns_rlimit(const char *name, enum limit limit,
+				  long value),
 			ns_option(const char *name);
 
 static struct zoneinfo	*find_zone(char *, int, int);
diff --git a/usr.sbin/named/named/ns_req.c b/usr.sbin/named/named/ns_req.c
index 8b1012e8fe5..0c783a7e188 100644
--- a/usr.sbin/named/named/ns_req.c
+++ b/usr.sbin/named/named/ns_req.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_req.c,v 1.8 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_req.c,v 1.9 2002/02/17 19:42:37 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_req.c	4.47 (Berkeley) 7/1/91";
 static char rcsid[] = "$From: ns_req.c,v 8.30 1998/05/11 04:19:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_req.c,v 1.8 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_req.c,v 1.9 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -111,30 +111,30 @@ struct addinfo {
 
 enum req_action { Finish, Refuse, Return };
 
-static enum req_action	req_query __P((HEADER *hp, u_char **cpp, u_char *eom,
-				       struct qstream *qsp,
-				       int *buflenp, int *msglenp,
-				       u_char *msg, int dfd,
-				       struct sockaddr_in *from));
+static enum req_action	req_query(HEADER *hp, u_char **cpp, u_char *eom,
+				  struct qstream *qsp,
+				  int *buflenp, int *msglenp,
+				  u_char *msg, int dfd,
+				  struct sockaddr_in *from);
 
-static enum req_action	req_iquery __P((HEADER *hp, u_char **cpp, u_char *eom,
-					int *buflenp, u_char *msg,
-					struct sockaddr_in *from));
+static enum req_action	req_iquery(HEADER *hp, u_char **cpp, u_char *eom,
+				   int *buflenp, u_char *msg,
+				   struct sockaddr_in *from);
 
 #ifdef BIND_NOTIFY
-static enum req_action	req_notify __P((HEADER *hp, u_char **cpp, u_char *eom,
-					u_char *msg,struct sockaddr_in *from));
+static enum req_action	req_notify(HEADER *hp, u_char **cpp, u_char *eom,
+				   u_char *msg,struct sockaddr_in *from);
 #endif
 
 static void		fwritemsg(FILE *, u_char *, int),
-			doaxfr __P((struct namebuf *, FILE *,
-				    struct namebuf *, int)),
-			startxfr __P((struct qstream *, struct namebuf *,
-				      u_char *, int, int, const char *));
+			doaxfr(struct namebuf *, FILE *,
+			       struct namebuf *, int),
+			startxfr(struct qstream *, struct namebuf *,
+				 u_char *, int, int, const char *);
 
 static struct addinfo	addinfo[NADDRECS];
-static void		addname __P((const char *, const char *,
-				     u_int16_t, u_int16_t));
+static void		addname(const char *, const char *,
+				u_int16_t, u_int16_t);
 static void		copyCharString(u_char **, const char *);
 
 /*
diff --git a/usr.sbin/named/named/ns_resp.c b/usr.sbin/named/named/ns_resp.c
index c5d4ef9870a..10663f71eec 100644
--- a/usr.sbin/named/named/ns_resp.c
+++ b/usr.sbin/named/named/ns_resp.c
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ns_resp.c,v 1.6 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_resp.c,v 1.7 2002/02/17 19:42:37 millert Exp $	*/
 
 #if !defined(lint) && !defined(SABER)
 #if 0
 static char sccsid[] = "@(#)ns_resp.c	4.65 (Berkeley) 3/3/91";
 static char rcsid[] = "$From: ns_resp.c,v 8.41 1998/04/07 04:59:45 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ns_resp.c,v 1.6 2002/02/16 21:28:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: ns_resp.c,v 1.7 2002/02/17 19:42:37 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -135,17 +135,15 @@ struct flush_set {
 	struct db_list *fs_last;
 };
 
-static void		rrsetadd __P((struct flush_set *, char *,
-				      struct databuf *)),
+static void		rrsetadd(struct flush_set *, char *, struct databuf *),
 			rrsetupdate(struct flush_set *, int flags),
 			flushrrset(struct flush_set *),
 			free_flushset(struct flush_set *);
 static int		rrsetcmp(char *, struct db_list *),
 			check_root(void),
 			check_ns(void),
-			rrextract __P((u_char *, int, u_char *,
-				       struct databuf **, char *, int,
-				       char **));
+			rrextract(u_char *, int, u_char *, struct databuf **,
+				  char *, int, char **);
 
 static void		add_related_additional(char *);
 static void		free_related_additional(void);
diff --git a/usr.sbin/named/named/ns_validate.c b/usr.sbin/named/named/ns_validate.c
index 2eba777c7a6..95f57ac1da7 100644
--- a/usr.sbin/named/named/ns_validate.c
+++ b/usr.sbin/named/named/ns_validate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns_validate.c,v 1.4 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ns_validate.c,v 1.5 2002/02/17 19:42:37 millert Exp $	*/
 
 /**************************************************************************
  * ns_validate.c (was security.c in original ISI contribution)
@@ -28,12 +28,10 @@
 #ifdef VALIDATE
 
 static int		isvalid(struct namebuf *, int, int, char *, int),
-			check_addr_ns __P((struct databuf **,
-					   struct sockaddr_in *,
-					   char *)),
-			check_in_tables __P((struct databuf **,
-					     struct sockaddr_in *,
-					     char *));
+			check_addr_ns(struct databuf **,
+				      struct sockaddr_in *, char *),
+			check_in_tables(struct databuf **,
+					struct sockaddr_in *, char *);
 #if 0
 static void		stick_in_queue(char *, int, int, char *);
 #endif
diff --git a/usr.sbin/named/named/tree.c b/usr.sbin/named/named/tree.c
index 5cc2132f989..5fd7cd083a1 100644
--- a/usr.sbin/named/named/tree.c
+++ b/usr.sbin/named/named/tree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.c,v 1.3 1997/07/30 15:42:47 kstailey Exp $	*/
+/*	$OpenBSD: tree.c,v 1.4 2002/02/17 19:42:37 millert Exp $	*/
 
 /* tree - balanced binary tree library
  *
@@ -79,12 +79,11 @@ static char	*debugFuncs[256];
 #endif
 
 
-static tree *	sprout	__P( (tree **, tree_t, int *, int (*)(), void (*)()) );
-static int	delete	__P( (tree **, int (*)(), tree_t, void (*)(),
-			      int *, int *) );
-static void	del	__P( (tree **, int *, tree **, void (*)(), int *) );
-static void	bal_L	__P( (tree **, int *) );
-static void	bal_R	__P( (tree **, int *) );
+static tree *	sprout(tree **, tree_t, int *, int (*)(), void (*)());
+static int	delete(tree **, int (*)(), tree_t, void (*)(), int *, int *);
+static void	del(tree **, int *, tree **, void (*)(), int *);
+static void	bal_L(tree **, int *);
+static void	bal_R(tree **, int *);
 
 
 void
diff --git a/usr.sbin/named/named/tree.h b/usr.sbin/named/named/tree.h
index 7d2af9e03ec..32e7ae9fe11 100644
--- a/usr.sbin/named/named/tree.h
+++ b/usr.sbin/named/named/tree.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tree.h,v 1.4 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: tree.h,v 1.5 2002/02/17 19:42:37 millert Exp $	*/
 
 /* tree.h - declare structures used by tree library
  *
@@ -13,14 +13,6 @@
 #define	_TREE_H_INCLUDED
 
 
-#ifndef __P
-# if defined(__STDC__) || defined(__GNUC__)
-#  define __P(x) x
-# else
-#  define __P(x) ()
-# endif
-#endif
-
 /*
  * tree_t is our package-specific anonymous pointer.
  */
@@ -40,11 +32,11 @@ typedef	struct tree_s {
 
 
 void	tree_init(tree **);
-tree_t	tree_srch	__P((tree **, int (*)(), tree_t));
-tree_t	tree_add	__P((tree **, int (*)(), tree_t, void (*)()));
-int	tree_delete	__P((tree **, int (*)(), tree_t, void (*)()));
-int	tree_trav	__P((tree **, int (*)()));
-void	tree_mung	__P((tree **, void (*)()));
+tree_t	tree_srch(tree **, int (*)(), tree_t);
+tree_t	tree_add(tree **, int (*)(), tree_t, void (*)());
+int	tree_delete(tree **, int (*)(), tree_t, void (*)());
+int	tree_trav(tree **, int (*)());
+void	tree_mung(tree **, void (*)());
 
 
 #endif	/* _TREE_H_INCLUDED */
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index fb7ff983b28..6cc7c9fc005 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndp.c,v 1.13 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: ndp.c,v 1.14 2002/02/17 19:42:38 millert Exp $	*/
 /*	$KAME: ndp.c,v 1.69 2001/07/23 14:46:31 itojun Exp $	*/
 
 /*
@@ -146,8 +146,7 @@ int set(int, char **);
 void get(char *);
 int delete(char *);
 void dump(struct in6_addr *);
-static struct in6_nbrinfo *getnbrinfo __P((struct in6_addr *addr,
-					   int ifindex, int));
+static struct in6_nbrinfo *getnbrinfo(struct in6_addr *addr, int ifindex, int);
 static char *ether_str(struct sockaddr_dl *);
 int ndp_ether_aton(char *, u_char *);
 void usage(void);
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index dedd22da1fc..821cfddeb7c 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $	*/
+/*	$OpenBSD: netgroup_mkdb.c,v 1.10 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 #ifndef lint
-static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $";
+static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -71,8 +71,8 @@ struct nentry {
 
 
 static DB       *ng_insert(DB *, const char *);
-static void	 ng_reventry __P((DB *, DB *, struct nentry *, char *,
-				  size_t, struct stringlist *));
+static void	 ng_reventry(DB *, DB *, struct nentry *, char *,
+		    size_t, struct stringlist *);
 
 static void	 ng_print(struct nentry *, struct string *);
 static void	 ng_rprint(DB *, struct string *);
diff --git a/usr.sbin/pkg_install/sign/extern.h b/usr.sbin/pkg_install/sign/extern.h
index 181a8c5c765..35f54ea11d9 100644
--- a/usr.sbin/pkg_install/sign/extern.h
+++ b/usr.sbin/pkg_install/sign/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.5 2002/02/17 19:42:38 millert Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
  *
@@ -38,19 +38,19 @@ struct mygzip_header;
 struct signature;
 
 /* common.c */
-extern int read_header_and_diagnose __P((FILE *file, \
+extern int read_header_and_diagnose(FILE *file, \
 	/*@out@*/struct mygzip_header *h, /*@null@*/struct signature **sign, \
-	const char *filename));
+	const char *filename);
 extern int reap(pid_t pid);
 
 /* sign.c */
-extern int sign __P((/*@observer@*/const char *filename, int type, \
-	/*@null@*/const char *userid, char *envp[]));
+extern int sign(/*@observer@*/const char *filename, int type, \
+	/*@null@*/const char *userid, char *envp[]);
 
 /* check.c */
-extern int check_signature __P((/*@dependent@*/FILE *file, \
+extern int check_signature(/*@dependent@*/FILE *file, \
 	/*@null@*/const char *userid, char *envp[], \
-	/*@observer@*/const char *filename));
+	/*@observer@*/const char *filename);
 
 #define PKG_BADSIG 0
 #define PKG_GOODSIG 1
@@ -65,14 +65,13 @@ typedef /*@observer@*/char *pchar;
 /* sha1.c */
 #define SHA1_DB_NAME	"/var/db/pkg/SHA1"
 
-extern void *new_sha1_checker __P((struct mygzip_header *h, \
+extern void *new_sha1_checker(struct mygzip_header *h, \
 	struct signature *sign, const char *userid, char *envp[], \
-	const char *filename));
+	const char *filename);
 
-extern void sha1_add __P((void *arg, const char *buffer, \
-	size_t length));
+extern void sha1_add(void *arg, const char *buffer, size_t length);
 
 extern int sha1_sign_ok(void *arg);
 
-extern int retrieve_sha1_marker __P((const char *filename, \
-	struct signature **sign, const char *userid));
+extern int retrieve_sha1_marker(const char *filename, \
+	struct signature **sign, const char *userid);
diff --git a/usr.sbin/pkg_install/sign/gzip.h b/usr.sbin/pkg_install/sign/gzip.h
index f55be34cf15..1bc09f23439 100644
--- a/usr.sbin/pkg_install/sign/gzip.h
+++ b/usr.sbin/pkg_install/sign/gzip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gzip.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: gzip.h,v 1.4 2002/02/17 19:42:38 millert Exp $ */
 /*-
  * Copyright (c) 1999 Marc Espie.
  *
@@ -66,16 +66,16 @@ struct signature {
 #define GZIP_SIGNED 		1	/* gzip file, signature parsed ok */
 #define GZIP_NOT_GZIP 		2	/* not a proper gzip file */
 #define GZIP_NOT_PGPSIGNED 	3	/* gzip file, unknown extension */
-extern int gzip_read_header __P((FILE *f, /*@out@*/struct mygzip_header *h, \
-	/*@null@*/struct signature **sign));
+extern int gzip_read_header(FILE *f, /*@out@*/struct mygzip_header *h, \
+	/*@null@*/struct signature **sign);
 /* gzip_write_header returns 1 for success */
-extern int gzip_write_header __P((FILE *f, const struct mygzip_header *h, \
-	/*@null@*/struct signature *sign));
+extern int gzip_write_header(FILE *f, const struct mygzip_header *h, \
+	/*@null@*/struct signature *sign);
 /* writing header to memory. Returns size needed, or 0 if buffer too small
    buffer must be at least 14 characters */
-extern int gzip_copy_header __P((const struct mygzip_header *h, \
+extern int gzip_copy_header(const struct mygzip_header *h, \
 	/*@null@*/struct signature *sign, \
-	void (*add)(void *, const char *, size_t), void *data));
+	void (*add)(void *, const char *, size_t), void *data);
 
 extern void free_signature(/*@null@*/struct signature *sign);
 extern void sign_fill_tag(struct signature *sign);
diff --git a/usr.sbin/pkg_install/sign/pgp.h b/usr.sbin/pkg_install/sign/pgp.h
index 641ab4cbab4..e179a26afa5 100644
--- a/usr.sbin/pkg_install/sign/pgp.h
+++ b/usr.sbin/pkg_install/sign/pgp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgp.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: pgp.h,v 1.4 2002/02/17 19:42:38 millert Exp $ */
 /* Estimate size of pgp signature */
 #define MAXPGPSIGNSIZE	1024
 
@@ -9,16 +9,15 @@
 struct mygzip_header;
 struct signature;
 
-extern void *new_pgp_checker __P((struct mygzip_header *h, \
+extern void *new_pgp_checker(struct mygzip_header *h, \
 	struct signature *sign, const char *userid, char *envp[], \
-	const char *filename));
+	const char *filename);
 
-extern void pgp_add __P((void *arg, const char *buffer, \
-	size_t length));
+extern void pgp_add(void *arg, const char *buffer, size_t length);
 
 extern int pgp_sign_ok(void *arg);
 
 extern void handle_pgp_passphrase(void);
 
-extern int retrieve_pgp_signature __P((const char *filename, \
-struct signature **sign, const char *userid, char *envp[]));
+extern int retrieve_pgp_signature(const char *filename, \
+	struct signature **sign, const char *userid, char *envp[]);
diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h
index 9dda6faa520..af61be3dff9 100644
--- a/usr.sbin/pkg_install/sign/stand.h
+++ b/usr.sbin/pkg_install/sign/stand.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stand.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */
+/* $OpenBSD: stand.h,v 1.4 2002/02/17 19:42:38 millert Exp $ */
 
 /* provided to cater for BSD idiosyncrasies */
 
@@ -6,14 +6,6 @@
 #include <sys/param.h>
 #endif
 
-#ifndef __P
-#ifdef __STDC__
-#define __P(x)	x
-#else
-#define __P(x) ()
-#endif
-#endif
-
 #if defined(BSD4_4)
 #include <err.h>
 #else
diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c
index 60d5b4e49de..9c8210cdbe8 100644
--- a/usr.sbin/pppd/auth.c
+++ b/usr.sbin/pppd/auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: auth.c,v 1.22 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * auth.c - PPP authentication and phase control.
@@ -38,7 +38,7 @@
 #if 0
 static char rcsid[] = "Id: auth.c,v 1.37 1998/03/26 04:46:03 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: auth.c,v 1.22 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -143,8 +143,8 @@ static int  get_pap_passwd(char *);
 static int  have_pap_secret(void);
 static int  have_chap_secret(char *, char *, u_int32_t);
 static int  ip_addr_check(u_int32_t, struct wordlist *);
-static int  scan_authfile __P((FILE *, char *, char *, u_int32_t, char *,
-			       struct wordlist **, char *));
+static int  scan_authfile(FILE *, char *, char *, u_int32_t, char *,
+		struct wordlist **, char *);
 static void free_wordlist(struct wordlist *);
 static void auth_script(char *);
 static void set_allowed_addrs(int, struct wordlist *);
diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c
index 439d73a8395..b8a7c81fe07 100644
--- a/usr.sbin/pppd/cbcp.c
+++ b/usr.sbin/pppd/cbcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: cbcp.c,v 1.4 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * cbcp - Call Back Configuration Protocol.
@@ -24,7 +24,7 @@
 #if 0
 static char rcsid[] = "Id: cbcp.c,v 1.2 1997/04/30 05:50:26 paulus Exp";
 #else
-static char rcsid[] = "$OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: cbcp.c,v 1.4 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -48,9 +48,8 @@ static void cbcp_open(int unit);
 static void cbcp_lowerup(int unit);
 static void cbcp_input(int unit, u_char *pkt, int len);
 static void cbcp_protrej(int unit);
-static int  cbcp_printpkt  __P((u_char *pkt, int len,
-				void (*printer)(void *, char *, ...),
-				void *arg));
+static int  cbcp_printpkt(u_char *pkt, int len,
+    void (*printer)(void *, char *, ...), void *arg);
 
 struct protent cbcp_protent = {
     PPP_CBCP,
diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c
index f9cfad3e793..b4f746cb89a 100644
--- a/usr.sbin/pppd/ccp.c
+++ b/usr.sbin/pppd/ccp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: ccp.c,v 1.10 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * ccp.c - PPP Compression Control Protocol.
@@ -31,7 +31,7 @@
 #if 0
 static char rcsid[] = "Id: ccp.c,v 1.22 1998/03/25 01:25:02 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ccp.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -55,9 +55,8 @@ static void ccp_lowerup(int unit);
 static void ccp_lowerdown(int);
 static void ccp_input(int unit, u_char *pkt, int len);
 static void ccp_protrej(int unit);
-static int  ccp_printpkt __P((u_char *pkt, int len,
-			      void (*printer)(void *, char *, ...),
-			      void *arg));
+static int  ccp_printpkt(u_char *pkt, int len,
+    void (*printer)(void *, char *, ...), void *arg);
 static void ccp_datainput(int unit, u_char *pkt, int len);
 
 struct protent ccp_protent = {
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index cc2819530a0..e978f26eb0d 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: chap.c,v 1.10 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * chap.c - Challenge Handshake Authentication Protocol.
@@ -39,7 +39,7 @@
 #if 0
 static char rcsid[] = "Id: chap.c,v 1.15 1997/11/27 06:07:48 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: chap.c,v 1.10 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -69,8 +69,7 @@ static void ChapLowerUp(int);
 static void ChapLowerDown(int);
 static void ChapInput(int, u_char *, int);
 static void ChapProtocolReject(int);
-static int  ChapPrintPkt __P((u_char *, int,
-			      void (*)(void *, char *, ...), void *));
+static int  ChapPrintPkt(u_char *, int, void (*)(void *, char *, ...), void *);
 
 struct protent chap_protent = {
     PPP_CHAP,
diff --git a/usr.sbin/pppd/chat/chat.c b/usr.sbin/pppd/chat/chat.c
index 8b927b4ba4f..e02bb725f5b 100644
--- a/usr.sbin/pppd/chat/chat.c
+++ b/usr.sbin/pppd/chat/chat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  *	Chat -- a program for automatic session establishment (i.e. dial
@@ -83,7 +83,7 @@
 #if 0
 static char rcsid[] = "Id: chat.c,v 1.19 1998/03/24 23:57:48 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: chat.c,v 1.15 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -118,17 +118,14 @@ static char rcsid[] = "$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $
 #define SIGTYPE void
 #endif
 
-#undef __P
 #undef __V
 
 #ifdef __STDC__
 #include <stdarg.h>
 #define __V(x)	x
-#define __P(x)	x
 #else
 #include <varargs.h>
 #define __V(x)	(va_alist) va_dcl
-#define __P(x)	()
 #define const
 #endif
 
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 424b20c58b1..33368115b5e 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: ipcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * ipcp.c - PPP IP Control Protocol.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: ipcp.c,v 1.34 1998/04/28 23:38:09 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ipcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -101,8 +101,7 @@ static void ipcp_lowerup(int);
 static void ipcp_lowerdown(int);
 static void ipcp_input(int, u_char *, int);
 static void ipcp_protrej(int);
-static int  ipcp_printpkt __P((u_char *, int,
-			       void (*)(void *, char *, ...), void *));
+static int  ipcp_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
 static void ip_check_options(void);
 static int  ip_demand_conf(int);
 static int  ip_active_pkt(u_char *, int);
diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c
index 081166b6c60..a5fc1b7b3fa 100644
--- a/usr.sbin/pppd/ipxcp.c
+++ b/usr.sbin/pppd/ipxcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: ipxcp.c,v 1.7 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * ipxcp.c - PPP IPX Control Protocol.
@@ -24,7 +24,7 @@
 #if 0
 static char rcsid[] = "Id: ipxcp.c,v 1.6 1998/03/25 03:08:16 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.7 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -101,8 +101,8 @@ static void ipxcp_lowerup(int);
 static void ipxcp_lowerdown(int);
 static void ipxcp_input(int, u_char *, int);
 static void ipxcp_protrej(int);
-static int  ipxcp_printpkt __P((u_char *, int,
-				void (*)(void *, char *, ...), void *));
+static int  ipxcp_printpkt(u_char *, int,
+    void (*)(void *, char *, ...), void *);
 
 struct protent ipxcp_protent = {
     PPP_IPXCP,
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index fa8fd8f60dc..ac337fe0dc1 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: lcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * lcp.c - PPP Link Control Protocol.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: lcp.c,v 1.31 1997/11/27 06:08:44 paulus Exp $";
 #else
-static char rcsid[] = "$OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: lcp.c,v 1.8 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -116,8 +116,7 @@ static fsm_callbacks lcp_callbacks = {	/* LCP callback routines */
 static void lcp_init(int);
 static void lcp_input(int, u_char *, int);
 static void lcp_protrej(int);
-static int  lcp_printpkt __P((u_char *, int,
-			      void (*)(void *, char *, ...), void *));
+static int  lcp_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
 
 struct protent lcp_protent = {
     PPP_LCP,
diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h
index e9a83a306c3..708efac92fa 100644
--- a/usr.sbin/pppd/pppd.h
+++ b/usr.sbin/pppd/pppd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppd.h,v 1.11 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: pppd.h,v 1.12 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * pppd.h - PPP daemon global declarations.
@@ -156,9 +156,8 @@ struct protent {
     /* Close the protocol */
     void (*close)(int unit, char *reason);
     /* Print a packet in readable form */
-    int  (*printpkt) __P((u_char *pkt, int len,
-			  void (*printer)(void *, char *, ...),
-			  void *arg));
+    int  (*printpkt)(u_char *pkt, int len,
+	void (*printer)(void *, char *, ...), void *arg);
     /* Process a received data packet */
     void (*datainput)(int unit, u_char *pkt, int len);
     int  enabled_flag;		/* 0 iff protocol is disabled */
@@ -183,20 +182,20 @@ void detach(void);		/* Detach from controlling tty */
 void die(int);			/* Cleanup and exit */
 void quit(void);		/* like die(1) */
 void novm(char *);		/* Say we ran out of memory, and die */
-void timeout __P((void (*func)(void *), void *arg, int t));
+void timeout(void (*func)(void *), void *arg, int t);
 				/* Call func(arg) after t seconds */
-void untimeout __P((void (*func)(void *), void *arg));
+void untimeout(void (*func)(void *), void *arg);
 				/* Cancel call to func(arg) */
 int run_program(char *prog, char **args, int must_exist);
 				/* Run program prog with args in child */
 void demuxprotrej(int, int);
 				/* Demultiplex a Protocol-Reject */
-void format_packet __P((u_char *, int, void (*) (void *, char *, ...),
-		void *));	/* Format a packet in human-readable form */
+void format_packet(u_char *, int, void (*) (void *, char *, ...), void *);
+				/* Format a packet in human-readable form */
 void log_packet(u_char *, int, char *, int);
 				/* Format a packet and log it with syslog */
-void print_string __P((char *, int,  void (*) (void *, char *, ...),
-		void *));	/* Format a string for output */
+void print_string(char *, int,  void (*) (void *, char *, ...), void *);
+				/* Format a string for output */
 int fmtmsg(char *, int, char *, ...);		/* sprintf++ */
 int vfmtmsg(char *, int, char *, va_list);	/* vsprintf++ */
 void script_setenv(char *, char *);	/* set script env var */
@@ -311,8 +310,8 @@ int  set_filters(struct bpf_program *pass, struct bpf_program *active);
 int  parse_args(int argc, char **argv);
 				/* Parse options from arguments given */
 void usage(void);		/* Print a usage message */
-int  options_from_file __P((char *filename, int must_exist, int check_prot,
-			    int privileged));
+int  options_from_file(char *filename, int must_exist, int check_prot,
+		       int privileged);
 				/* Parse options from an options file */
 int  options_from_user(void);	/* Parse options from user's .ppprc */
 int  options_for_tty(void);	/* Parse options from /etc/ppp/options.tty */
diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c
index edb2d67f61a..17ede4956e0 100644
--- a/usr.sbin/pppd/upap.c
+++ b/usr.sbin/pppd/upap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: upap.c,v 1.8 2002/02/17 19:42:38 millert Exp $	*/
 
 /*
  * upap.c - User/Password Authentication Protocol.
@@ -23,7 +23,7 @@
 #if 0
 static char rcsid[] = "Id: upap.c,v 1.11 1997/04/30 05:59:56 paulus Exp";
 #else
-static char rcsid[] = "$OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: upap.c,v 1.8 2002/02/17 19:42:38 millert Exp $";
 #endif
 #endif
 
@@ -48,8 +48,7 @@ static void upap_lowerup(int);
 static void upap_lowerdown(int);
 static void upap_input(int, u_char *, int);
 static void upap_protrej(int);
-static int  upap_printpkt __P((u_char *, int,
-			       void (*)(void *, char *, ...), void *));
+static int  upap_printpkt(u_char *, int, void (*)(void *, char *, ...), void *);
 
 struct protent pap_protent = {
     PPP_PAP,
diff --git a/usr.sbin/pppoe/client.c b/usr.sbin/pppoe/client.c
index 0d022c82eac..dceeb92a4e5 100644
--- a/usr.sbin/pppoe/client.c
+++ b/usr.sbin/pppoe/client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: client.c,v 1.13 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: client.c,v 1.14 2002/02/17 19:42:39 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -66,20 +66,18 @@ u_int32_t client_cookie;
 u_int16_t client_sessionid;
 int pppfd, client_state;
 
-static int getpackets __P((int, char *, char *, struct ether_addr *,
-    struct ether_addr *));
+static int getpackets(int, char *, char *, struct ether_addr *,
+    struct ether_addr *);
 static int send_padi(int, struct ether_addr *, u_int8_t *);
-static int send_padr __P((int, char *, struct ether_addr *,
+static int send_padr(int, char *, struct ether_addr *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, struct tag_list *);
+static int recv_pado(int, char *, struct ether_addr *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+static int recv_pads(int, char *, char *, struct ether_addr *,
     struct ether_addr *, struct ether_header *, struct pppoe_header *,
-    struct tag_list *));
-static int recv_pado __P((int, char *, struct ether_addr *,
-    struct ether_addr *, struct ether_header *, struct pppoe_header *,
-    u_long, u_int8_t *));
-static int recv_pads __P((int, char *, char *, struct ether_addr *,
-    struct ether_addr *, struct ether_header *, struct pppoe_header *,
-    u_long, u_int8_t *));
-static int recv_padt __P((int, struct ether_addr *, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
+    u_long, u_int8_t *);
+static int recv_padt(int, struct ether_addr *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
 
 void timer_handler(int);
 int timer_set(u_int);
diff --git a/usr.sbin/pppoe/pppoe.h b/usr.sbin/pppoe/pppoe.h
index 238a9e236a8..9e4762e6c8a 100644
--- a/usr.sbin/pppoe/pppoe.h
+++ b/usr.sbin/pppoe/pppoe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pppoe.h,v 1.3 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: pppoe.h,v 1.4 2002/02/17 19:42:39 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -136,11 +136,10 @@ struct pppoe_session *session_find_fd(int);
 
 int runppp(int, char *);
 int bpf_to_ppp(int, u_long, u_int8_t *);
-int ppp_to_bpf __P((int, int, struct ether_addr *, struct ether_addr *,
-    u_int16_t));
+int ppp_to_bpf(int, int, struct ether_addr *, struct ether_addr *, u_int16_t);
 int send_padt(int, struct ether_addr *, struct ether_addr *, u_int16_t);
-void recv_debug __P((int, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
+void recv_debug(int, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
 void debug_packet(u_int8_t *, int);
 
 u_int32_t cookie_bake(void);
diff --git a/usr.sbin/pppoe/server.c b/usr.sbin/pppoe/server.c
index d861f306af7..ea34212e2a7 100644
--- a/usr.sbin/pppoe/server.c
+++ b/usr.sbin/pppoe/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.6 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: server.c,v 1.7 2002/02/17 19:42:39 millert Exp $	*/
 
 /*
  * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net
@@ -64,17 +64,17 @@ static char ac_cookie_key[8];
 
 static void getpackets(int, char *, struct ether_addr *);
 
-static void recv_padi __P((int, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-static void recv_padr __P((int, char *, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-static void recv_padt __P((int, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-
-static void send_pado __P((int, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
-static void send_pads __P((int, char *, struct ether_addr *,
-    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *));
+static void recv_padi(int, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+static void recv_padr(int, char *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+static void recv_padt(int, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+
+static void send_pado(int, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
+static void send_pads(int, char *, struct ether_addr *,
+    struct ether_header *, struct pppoe_header *, u_long, u_int8_t *);
 static void key_gen(void);
 static u_int8_t *key_make(u_int8_t *, int, u_int8_t *, int);
 static int key_cmp(u_int8_t *, int, u_int8_t *, int, u_int8_t *, int);
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index e86594082c4..bbe7fa7f290 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.32 2002/02/16 21:28:08 millert Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.33 2002/02/17 19:42:39 millert Exp $ */
 /*	$NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $	*/
 
 /*
@@ -28,7 +28,7 @@ char    copyright[] =
 #endif				/* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rarpd.c,v 1.32 2002/02/16 21:28:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: rarpd.c,v 1.33 2002/02/17 19:42:39 millert Exp $";
 #endif
 
 
@@ -96,8 +96,8 @@ void   rarp_loop(void);
 void   lookup_addrs(char *, struct if_info *);
 void   usage(void);
 void   rarp_process(struct if_info *, u_char *);
-void   rarp_reply    __P((struct if_info *, struct if_addr *,
-	struct ether_header *, u_int32_t, struct hostent *));
+void   rarp_reply(struct if_info *, struct if_addr *,
+	    struct ether_header *, u_int32_t, struct hostent *);
 void   update_arptab(u_char *, u_int32_t);
 void   err(int, const char *,...);
 void   debug(const char *,...);
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index c0243a429e9..11fd8399567 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route6d.c,v 1.23 2002/02/16 21:28:08 millert Exp $	*/
+/*	$OpenBSD: route6d.c,v 1.24 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: route6d.c,v 1.73 2001/09/05 01:12:34 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #if 0
-static char _rcsid[] = "$OpenBSD: route6d.c,v 1.23 2002/02/16 21:28:08 millert Exp $";
+static char _rcsid[] = "$OpenBSD: route6d.c,v 1.24 2002/02/17 19:42:39 millert Exp $";
 #endif
 
 #include <stdio.h>
@@ -223,10 +223,10 @@ void sockopt(struct ifc *);
 void ifconfig(void);
 void ifconfig1(const char *, const struct sockaddr *, struct ifc *, int);
 void rtrecv(void);
-int rt_del __P((const struct sockaddr_in6 *, const struct sockaddr_in6 *,
-	const struct sockaddr_in6 *));
-int rt_deladdr __P((struct ifc *, const struct sockaddr_in6 *,
-	const struct sockaddr_in6 *));
+int rt_del(const struct sockaddr_in6 *, const struct sockaddr_in6 *,
+    const struct sockaddr_in6 *);
+int rt_deladdr(struct ifc *, const struct sockaddr_in6 *,
+    const struct sockaddr_in6 *);
 void filterconfig(void);
 int getifmtu(int);
 const char *rttypes(struct rt_msghdr *);
@@ -242,8 +242,7 @@ void ifdump0(FILE *, const struct ifc *);
 void rtdump(int);
 void rt_entry(struct rt_msghdr *, int);
 void rtdexit(void);
-void riprequest __P((struct ifc *, struct netinfo6 *, int,
-	struct sockaddr_in6 *));
+void riprequest(struct ifc *, struct netinfo6 *, int, struct sockaddr_in6 *);
 void ripflush(struct ifc *, struct sockaddr_in6 *);
 void sendrequest(struct ifc *);
 int sin6mask2len(const struct sockaddr_in6 *);
diff --git a/usr.sbin/rpc.pcnfsd/paths.h b/usr.sbin/rpc.pcnfsd/paths.h
index cb9f4250054..bc16ce1f473 100644
--- a/usr.sbin/rpc.pcnfsd/paths.h
+++ b/usr.sbin/rpc.pcnfsd/paths.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: paths.h,v 1.3 2002/02/16 21:28:08 millert Exp $	*/
+/*	$OpenBSD: paths.h,v 1.4 2002/02/17 19:42:39 millert Exp $	*/
 /*	$NetBSD: paths.h,v 1.1 1995/08/14 19:50:09 gwr Exp $	*/
 
 #define SPOOLDIR        "/export/pcnfs"
@@ -21,5 +21,4 @@ int build_pr_list(void);
 pirstat build_pr_queue(printername, username, int, int *, int *);
 psrstat pr_start2(char *, char *, char *, char *, char *, char **);
 pcrstat pr_cancel(char *, char *, char *);
-pirstat get_pr_status __P((printername, bool_t *, bool_t *, int *, bool_t *,
-			char *));
+pirstat get_pr_status(printername, bool_t *, bool_t *, int *, bool_t *, char *);
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index decc7ea844a..841b93dfc9e 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.10 2002/02/16 21:28:08 millert Exp $	*/
+/*	$OpenBSD: if.c,v 1.11 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $	*/
 
 /*
@@ -75,8 +75,8 @@ size_t ifblock_size;
 char *ifblock;
 
 static void get_iflist(char **buf, size_t *size);
-static void parse_iflist __P((struct if_msghdr ***ifmlist_p, char *buf,
-		       size_t bufsize));
+static void parse_iflist(struct if_msghdr ***ifmlist_p, char *buf,
+    size_t bufsize);
 
 static void
 get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info)
diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h
index 49f1758ec6a..291712320d6 100644
--- a/usr.sbin/rtadvd/rrenum.h
+++ b/usr.sbin/rtadvd/rrenum.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rrenum.h,v 1.4 2001/01/21 15:42:36 itojun Exp $	*/
+/*	$OpenBSD: rrenum.h,v 1.5 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $	*/
 
 /*
@@ -30,5 +30,5 @@
  * SUCH DAMAGE.
  */
 
-void rr_input __P((int, struct icmp6_router_renum *, struct in6_pktinfo *,
-	struct sockaddr_in6 *, struct in6_addr *));
+void rr_input(int, struct icmp6_router_renum *, struct in6_pktinfo *,
+    struct sockaddr_in6 *, struct in6_addr *);
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index b4f1ce09fa7..d04e36dd340 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtadvd.c,v 1.14 2002/02/16 21:28:08 millert Exp $	*/
+/*	$OpenBSD: rtadvd.c,v 1.15 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: rtadvd.c,v 1.50 2001/02/04 06:15:15 itojun Exp $	*/
 
 /*
@@ -131,14 +131,14 @@ static void die(void);
 static void sock_open(void);
 static void rtsock_open(void);
 static void rtadvd_input(void);
-static void rs_input __P((int, struct nd_router_solicit *,
-			  struct in6_pktinfo *, struct sockaddr_in6 *));
-static void ra_input __P((int, struct nd_router_advert *,
-			  struct in6_pktinfo *, struct sockaddr_in6 *));
-static int prefix_check __P((struct nd_opt_prefix_info *, struct rainfo *,
-			     struct sockaddr_in6 *));
-static int nd6_options __P((struct nd_opt_hdr *, int,
-			    union nd_opts *, u_int32_t));
+static void rs_input(int, struct nd_router_solicit *,
+    struct in6_pktinfo *, struct sockaddr_in6 *);
+static void ra_input(int, struct nd_router_advert *,
+    struct in6_pktinfo *, struct sockaddr_in6 *);
+static int prefix_check(struct nd_opt_prefix_info *, struct rainfo *,
+    struct sockaddr_in6 *);
+static int nd6_options(struct nd_opt_hdr *, int,
+    union nd_opts *, u_int32_t);
 static void free_ndopts(union nd_opts *);
 static void ra_output(struct rainfo *);
 static void rtmsg_input(void);
diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h
index f667e8c268b..3e8d751f2d5 100644
--- a/usr.sbin/rtadvd/timer.h
+++ b/usr.sbin/rtadvd/timer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timer.h,v 1.5 2002/02/16 21:28:09 millert Exp $	*/
+/*	$OpenBSD: timer.h,v 1.6 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: timer.h,v 1.3 2000/05/27 11:30:43 jinmei Exp $	*/
 
 /*
@@ -53,13 +53,11 @@ struct rtadvd_timer {
 };
 
 void rtadvd_timer_init(void);
-struct rtadvd_timer *rtadvd_add_timer __P((void (*)(void *),
-		void (*)(void *, struct timeval *), void *, void *));
+struct rtadvd_timer *rtadvd_add_timer(void (*)(void *),
+    void (*)(void *, struct timeval *), void *, void *);
 void rtadvd_set_timer(struct timeval *, struct rtadvd_timer *);
 void rtadvd_remove_timer(struct rtadvd_timer **);
 struct timeval * rtadvd_check_timer(void);
 struct timeval * rtadvd_timer_rest(struct rtadvd_timer *);
-void TIMEVAL_ADD __P((struct timeval *, struct timeval *,
-		      struct timeval *)); 
-void TIMEVAL_SUB __P((struct timeval *, struct timeval *,
-		      struct timeval *)); 
+void TIMEVAL_ADD(struct timeval *, struct timeval *, struct timeval *); 
+void TIMEVAL_SUB(struct timeval *, struct timeval *, struct timeval *); 
diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c
index 9b52e09c1ed..f3b8f464b4f 100644
--- a/usr.sbin/rtsold/if.c
+++ b/usr.sbin/rtsold/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.9 2002/02/16 21:28:09 millert Exp $	*/
+/*	$OpenBSD: if.c,v 1.10 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: if.c,v 1.15 2001/05/22 06:04:17 jinmei Exp $	*/
 
 /*
@@ -80,8 +80,8 @@ static int get_llflag(const char *name);
 #ifndef HAVE_GETIFADDRS
 static unsigned int if_maxindex(void);
 #endif
-static void get_rtaddrs __P((int addrs, struct sockaddr *sa,
-			     struct sockaddr **rti_info));
+static void get_rtaddrs(int addrs, struct sockaddr *sa,
+    struct sockaddr **rti_info);
 
 int
 ifinit()
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index bfa8a7bd2f9..2e91c2f7e58 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsold.c,v 1.15 2002/02/16 21:28:09 millert Exp $	*/
+/*	$OpenBSD: rtsold.c,v 1.16 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: rtsold.c,v 1.32 2001/07/09 22:34:07 itojun Exp $	*/
 
 /*
@@ -96,10 +96,10 @@ static int ifreconfig(char *ifname);
 #endif
 static int make_packet(struct ifinfo *ifinfo);
 static struct timeval *rtsol_check_timer(void);
-static void TIMEVAL_ADD __P((struct timeval *a, struct timeval *b,
-			     struct timeval *result));
-static void TIMEVAL_SUB __P((struct timeval *a, struct timeval *b,
-			     struct timeval *result));
+static void TIMEVAL_ADD(struct timeval *a, struct timeval *b,
+    struct timeval *result);
+static void TIMEVAL_SUB(struct timeval *a, struct timeval *b,
+    struct timeval *result);
 
 static void rtsold_set_dump_file(void);
 static void usage(char *progname);
diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h
index 6c4a719c564..15dd80bdf7c 100644
--- a/usr.sbin/rtsold/rtsold.h
+++ b/usr.sbin/rtsold/rtsold.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsold.h,v 1.7 2002/02/16 21:28:09 millert Exp $	*/
+/*	$OpenBSD: rtsold.h,v 1.8 2002/02/17 19:42:39 millert Exp $	*/
 /*	$KAME: rtsold.h,v 1.11 2000/10/10 06:18:04 itojun Exp $	*/
 
 /*
@@ -72,8 +72,7 @@ extern int ifinit(void);
 extern int interface_up(char *name);
 extern int interface_status(struct ifinfo*);
 extern int lladdropt_length(struct sockaddr_dl *sdl);
-extern void lladdropt_fill __P((struct sockaddr_dl *sdl,
-				struct nd_opt_hdr *ndopt));
+extern void lladdropt_fill(struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt);
 extern struct sockaddr_dl *if_nametosdl(char *name);
 extern int getinet6sysctl(int code);
 
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 2511e26d902..b510317ab67 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)rwhod.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: rwhod.c,v 1.20 2002/02/16 21:28:09 millert Exp $";
+static char rcsid[] = "$OpenBSD: rwhod.c,v 1.21 2002/02/17 19:42:39 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -109,8 +109,8 @@ void	 quit(char *);
 void	 rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *);
 int	 verify(char *);
 void	 handleread(int s);
-int	 Sendto __P((int, const void *, size_t, int,
-	    const struct sockaddr *, socklen_t));
+int	 Sendto(int, const void *, size_t, int, const struct sockaddr *,
+	    socklen_t);
 char	*interval(int, char *);
 
 void
diff --git a/usr.sbin/tcpdump/gnuc.h b/usr.sbin/tcpdump/gnuc.h
index 869695afad0..d01cda3d8d7 100644
--- a/usr.sbin/tcpdump/gnuc.h
+++ b/usr.sbin/tcpdump/gnuc.h
@@ -1,15 +1,6 @@
-/*	$OpenBSD: gnuc.h,v 1.3 2000/10/03 14:31:55 ho Exp $	*/
+/*	$OpenBSD: gnuc.h,v 1.4 2002/02/17 19:42:39 millert Exp $	*/
 
-/* @(#) $Header: /home/cvs/src/usr.sbin/tcpdump/Attic/gnuc.h,v 1.3 2000/10/03 14:31:55 ho Exp $ (LBL) */
-
-/* Define __P() macro, if necessary */
-#ifndef __P
-#ifdef __STDC__
-#define __P(protos) protos
-#else
-#define __P(protos) ()
-#endif
-#endif
+/* @(#) $Header: /home/cvs/src/usr.sbin/tcpdump/Attic/gnuc.h,v 1.4 2002/02/17 19:42:39 millert Exp $ (LBL) */
 
 /* inline foo */
 #ifdef __GNUC__
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index dcb2805453e..82f28086f9c 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trpt.c,v 1.9 2002/02/16 21:28:10 millert Exp $	*/
+/*	$OpenBSD: trpt.c,v 1.10 2002/02/17 19:42:40 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -135,8 +135,8 @@ extern	char *__progname;
 
 int	main(int, char *[]);
 void	dotrace(caddr_t);
-void	tcp_trace __P((short, short, struct tcpcb *, struct tcpcb *,
-	    struct tcpiphdr *, int));
+void	tcp_trace(short, short, struct tcpcb *, struct tcpcb *,
+	    struct tcpiphdr *, int);
 int	numeric(const void *, const void *);
 void	usage(void);
 
diff --git a/usr.sbin/trsp/trsp.c b/usr.sbin/trsp/trsp.c
index f8ea088ac4f..b17ce3c2f2c 100644
--- a/usr.sbin/trsp/trsp.c
+++ b/usr.sbin/trsp/trsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trsp.c,v 1.8 2002/02/16 21:28:10 millert Exp $	*/
+/*	$OpenBSD: trsp.c,v 1.9 2002/02/17 19:42:40 millert Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -143,8 +143,8 @@ extern	char *__progname;
 int	main(int, char *[]);
 void	dotrace(caddr_t);
 int	numeric(const void *, const void *);
-void	spp_trace __P((short, short, struct sppcb *, struct sppcb *,
-	    struct spidp *, int));
+void	spp_trace(short, short, struct sppcb *, struct sppcb *,
+	    struct spidp *, int);
 void	usage(void);
 
 int
diff --git a/usr.sbin/ypserv/common/yplib_host.h b/usr.sbin/ypserv/common/yplib_host.h
index caa88ae235f..8547bb52130 100644
--- a/usr.sbin/ypserv/common/yplib_host.h
+++ b/usr.sbin/ypserv/common/yplib_host.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yplib_host.h,v 1.5 2002/02/16 21:28:11 millert Exp $ */
+/*	$OpenBSD: yplib_host.h,v 1.6 2002/02/17 19:42:40 millert Exp $ */
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
@@ -34,26 +34,24 @@
 #ifndef _YPLIB_HOST_H_
 #define _YPLIB_HOST_H_
 
-int	yp_match_host 	__P((CLIENT *client, char *indomain, char *inmap,
-			    const char *inkey, int inkeylen, char **outval,
-			    int *outvallen));
-int	yp_first_host	__P((CLIENT *client, char *indomain, char *inmap,
-			    char **outkey, int *outkeylen, char **outval,
-			    int *outvallen));
-int	yp_next_host	__P((CLIENT *client, char *indomain, char *inmap,
-			    char *inkey, int inkeylen, char **outkey,
-			    int *outkeylen, char **outval, int *outvallen));
-int	yp_master_host	__P((CLIENT *client,
-			    char *indomain, char *inmap, char **outname));
-int	yp_order_host	__P((CLIENT *client,
-			    char *indomain, char *inmap, u_int32_t *outorder));
-int	yp_all_host	__P((CLIENT *client, char *indomain, char *inmap,
-			    struct ypall_callback *incallback));
-int	yp_maplist_host	__P((CLIENT *client, char *indomain,
-			    struct ypmaplist **outmaplist));
+int	yp_match_host(CLIENT *client, char *indomain, char *inmap,
+	    const char *inkey, int inkeylen, char **outval, int *outvallen);
+int	yp_first_host(CLIENT *client, char *indomain, char *inmap,
+	    char **outkey, int *outkeylen, char **outval, int *outvallen);
+int	yp_next_host(CLIENT *client, char *indomain, char *inmap, char *inkey,
+	    int inkeylen, char **outkey, int *outkeylen, char **outval,
+	    int *outvallen);
+int	yp_master_host(CLIENT *client, char *indomain, char *inmap,
+	    char **outname);
+int	yp_order_host(CLIENT *client, char *indomain, char *inmap,
+	    u_int32_t *outorder);
+int	yp_all_host(CLIENT *client, char *indomain, char *inmap,
+	    struct ypall_callback *incallback);
+int	yp_maplist_host(CLIENT *client, char *indomain,
+	    struct ypmaplist **outmaplist);
 CLIENT *yp_bind_local(u_long program, u_long version);
-CLIENT *yp_bind_host	__P((char *server, u_long program, u_long version,
-			    u_short port, int usetcp));
+CLIENT *yp_bind_host(char *server, u_long program, u_long version,
+	    u_short port, int usetcp);
 
 #endif /* _YPLIB_HOST_H_ */