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

15 files changed, 169 insertions, 204 deletions

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 */