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

11 files changed, 127 insertions, 127 deletions

diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 355f89f7711..fabe3eb1d43 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atalk.c,v 1.6 2002/01/17 21:34:58 mickey Exp $	*/
+/*	$OpenBSD: atalk.c,v 1.7 2002/02/16 21:27:50 millert Exp $	*/
 /*	$NetBSD: atalk.c,v 1.2 1997/05/22 17:21:26 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from @(#)atalk.c	1.1 (Whistle) 6/6/96";
 #else
-static char rcsid[] = "$OpenBSD: atalk.c,v 1.6 2002/01/17 21:34:58 mickey Exp $";
+static char rcsid[] = "$OpenBSD: atalk.c,v 1.7 2002/02/16 21:27:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -69,10 +69,10 @@ struct socket   sockb;
 
 static int first = 1;
 
-static char *at_pr_net __P((struct sockaddr_at *, int));
-static char *at_pr_host __P((struct sockaddr_at *, int));
-static char *at_pr_range __P((struct sockaddr_at *));
-static char *at_pr_port __P((struct sockaddr_at *));
+static char *at_pr_net(struct sockaddr_at *, int);
+static char *at_pr_host(struct sockaddr_at *, int);
+static char *at_pr_range(struct sockaddr_at *);
+static char *at_pr_port(struct sockaddr_at *);
 
 /*
  * Print a summary of connections related to a Network Systems
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index b7256739193..b9f0b578a3c 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.28 2002/01/17 21:34:58 mickey Exp $	*/
+/*	$OpenBSD: if.c,v 1.29 2002/02/16 21:27:50 millert Exp $	*/
 /*	$NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)if.c	8.2 (Berkeley) 2/21/94";
 #else
-static char *rcsid = "$OpenBSD: if.c,v 1.28 2002/01/17 21:34:58 mickey Exp $";
+static char *rcsid = "$OpenBSD: if.c,v 1.29 2002/02/16 21:27:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -71,8 +71,8 @@ static char *rcsid = "$OpenBSD: if.c,v 1.28 2002/01/17 21:34:58 mickey Exp $";
 #define	YES	1
 #define	NO	0
 
-static void sidewaysintpr __P((u_int, u_long));
-static void catchalarm __P((int));
+static void sidewaysintpr(u_int, u_long);
+static void catchalarm(int);
 
 /*
  * Print a description of the network interfaces.
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 118a5a97196..4c53d483109 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.55 2002/01/17 21:34:58 mickey Exp $	*/
+/*	$OpenBSD: inet.c,v 1.56 2002/02/16 21:27:50 millert Exp $	*/
 /*	$NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-static char *rcsid = "$OpenBSD: inet.c,v 1.55 2002/01/17 21:34:58 mickey Exp $";
+static char *rcsid = "$OpenBSD: inet.c,v 1.56 2002/02/16 21:27:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -92,13 +92,13 @@ struct	inpcb inpcb;
 struct	tcpcb tcpcb;
 struct	socket sockb;
 
-static void protopr0 __P((u_long, char *, int));
+static void protopr0(u_long, char *, int);
 
-char	*inetname __P((struct in_addr *));
-void	inetprint __P((struct in_addr *, int, char *, int));
+char	*inetname(struct in_addr *);
+void	inetprint(struct in_addr *, int, char *, int);
 #ifdef INET6
-char	*inet6name __P((struct in6_addr *));
-void	inet6print __P((struct in6_addr *, int, char *, int));
+char	*inet6name(struct in6_addr *);
+void	inet6print(struct in6_addr *, int, char *, int);
 #endif
 
 /*
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 9233e93f54e..538b597795d 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet6.c,v 1.17 2002/01/17 21:34:58 mickey Exp $	*/
+/*	$OpenBSD: inet6.c,v 1.18 2002/02/16 21:27:50 millert Exp $	*/
 /*	BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp	*/
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-/*__RCSID("$OpenBSD: inet6.c,v 1.17 2002/01/17 21:34:58 mickey Exp $");*/
+/*__RCSID("$OpenBSD: inet6.c,v 1.18 2002/02/16 21:27:50 millert Exp $");*/
 /*__RCSID("KAME Id: inet6.c,v 1.10 2000/02/09 10:49:31 itojun Exp");*/
 #endif
 #endif /* not lint */
@@ -79,8 +79,8 @@ static char sccsid[] = "@(#)inet.c	8.4 (Berkeley) 4/20/94";
 
 struct	socket sockb;
 
-char	*inet6name __P((struct in6_addr *));
-void	inet6print __P((struct in6_addr *, int, char *));
+char	*inet6name(struct in6_addr *);
+void	inet6print(struct in6_addr *, int, char *);
 
 static	char *ip6nh[] = {
 	"hop by hop",
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index b5b7e837000..bdfde5359bc 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx.c,v 1.9 2002/01/17 21:34:58 mickey Exp $	*/
+/*	$OpenBSD: ipx.c,v 1.10 2002/02/16 21:27:50 millert Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)ns.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: ipx.c,v 1.9 2002/01/17 21:34:58 mickey Exp $";
+static char *rcsid = "$OpenBSD: ipx.c,v 1.10 2002/02/16 21:27:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -77,8 +77,8 @@ struct	ipxpcb ipxpcb;
 struct	spxpcb spxpcb;
 struct	socket sockb;
 
-static char *ipx_prpr __P((struct ipx_addr *));
-static void ipx_erputil __P((int, int));
+static char *ipx_prpr(struct ipx_addr *);
+static void ipx_erputil(int, int);
 
 static	int first = 1;
 
diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c
index 55dc7880581..38f816e5c0a 100644
--- a/usr.bin/netstat/iso.c
+++ b/usr.bin/netstat/iso.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso.c,v 1.8 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: iso.c,v 1.9 2002/02/16 21:27:50 millert Exp $	*/
 /*	$NetBSD: iso.c,v 1.12 1995/10/03 21:42:38 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)iso.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: iso.c,v 1.8 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: iso.c,v 1.9 2002/02/16 21:27:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -111,10 +111,10 @@ SOFTWARE.
 #include <stdlib.h>
 #include "netstat.h"
 
-static void tprintstat __P((struct tp_stat *, int));
-static void isonetprint __P((struct sockaddr_iso *, int));
-static void hexprint __P((int, char *, char *));
-extern void inetprint __P((struct in_addr *, int, char *));
+static void tprintstat(struct tp_stat *, int);
+static void isonetprint(struct sockaddr_iso *, int);
+static void hexprint(int, char *, char *);
+extern void inetprint(struct in_addr *, int, char *);
 
 /*
  *	Dump esis stats
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 396eae51ba3..e7a9ddd41dd 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.29 2002/01/17 21:34:58 mickey Exp $	*/
+/*	$OpenBSD: main.c,v 1.30 2002/02/16 21:27:50 millert Exp $	*/
 /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)main.c	8.4 (Berkeley) 3/1/94";
 #else
-static char *rcsid = "$OpenBSD: main.c,v 1.29 2002/01/17 21:34:58 mickey Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.30 2002/02/16 21:27:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -275,10 +275,10 @@ struct protox *protoprotox[] = { protox, ipxprotox, nsprotox, isoprotox, atalkpr
 struct protox *protoprotox[] = { protox, ip6protox, ipxprotox, nsprotox, isoprotox, atalkprotox, NULL };
 #endif
 
-static void printproto __P((struct protox *, char *));
-static void usage __P((void));
-static struct protox *name2protox __P((char *));
-static struct protox *knownname __P((char *));
+static void printproto(struct protox *, char *);
+static void usage(void);
+static struct protox *name2protox(char *);
+static struct protox *knownname(char *);
 
 kvm_t *kvmd;
 
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index f6f3572b0f9..ffcd82ab76a 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netstat.h,v 1.19 2001/08/26 09:42:04 brian Exp $	*/
+/*	$OpenBSD: netstat.h,v 1.20 2002/02/16 21:27:50 millert Exp $	*/
 /*	$NetBSD: netstat.h,v 1.6 1996/05/07 02:55:05 thorpej Exp $	*/
 
 /*
@@ -66,90 +66,90 @@ int	af;		/* address family */
 extern	char *__progname; /* program name, from crt0.o */
 
 
-int	kread __P((u_long addr, char *buf, int size));
-char	*plural __P((int));
-char	*plurales __P((int));
+int	kread(u_long addr, char *buf, int size);
+char	*plural(int);
+char	*plurales(int);
 
-void	protopr __P((u_long, char *));
+void	protopr(u_long, char *);
 #ifdef INET6
-void	ip6protopr __P((u_long, char *));
+void	ip6protopr(u_long, char *);
 #endif
-void	tcp_stats __P((u_long, char *));
-void	udp_stats __P((u_long, char *));
-void	ip_stats __P((u_long, char *));
-void	icmp_stats __P((u_long, char *));
-void	igmp_stats __P((u_long, char *));
-void	ah_stats __P((u_long, char *));
-void	esp_stats __P((u_long, char *));
-void	ipip_stats __P((u_long, char *));
-void	etherip_stats __P((u_long, char *));
-void	protopr __P((u_long, char *));
-void	ipcomp_stats __P((u_long, char *));
+void	tcp_stats(u_long, char *);
+void	udp_stats(u_long, char *);
+void	ip_stats(u_long, char *);
+void	icmp_stats(u_long, char *);
+void	igmp_stats(u_long, char *);
+void	ah_stats(u_long, char *);
+void	esp_stats(u_long, char *);
+void	ipip_stats(u_long, char *);
+void	etherip_stats(u_long, char *);
+void	protopr(u_long, char *);
+void	ipcomp_stats(u_long, char *);
 
 void	mbpr(u_long, u_long, u_long);
 
-void	hostpr __P((u_long, u_long));
-void	impstats __P((u_long, u_long));
+void	hostpr(u_long, u_long);
+void	impstats(u_long, u_long);
 
-void	intpr __P((int, u_long));
+void	intpr(int, u_long);
 
-void	pr_rthdr __P((int));
-void	pr_encaphdr __P(());
-void	pr_family __P((int));
-void	rt_stats __P((u_long));
-char	*ns_phost __P((struct sockaddr *));
-char	*ipx_phost __P((struct sockaddr *));
-void	upHex __P((char *));
+void	pr_rthdr(int);
+void	pr_encaphdr();
+void	pr_family(int);
+void	rt_stats(u_long);
+char	*ns_phost(struct sockaddr *);
+char	*ipx_phost(struct sockaddr *);
+void	upHex(char *);
 
 #ifdef INET6
 struct in6_addr;
 struct sockaddr_in6;
-void	ip6protopr __P((u_long, char *));
-void	ip6_stats __P((u_long, char *));
-void	ip6_ifstats __P((char *));
-void	icmp6_stats __P((u_long, char *));
-void	icmp6_ifstats __P((char *));
-void	pim6_stats __P((u_long, char *));
-void	mroute6pr __P((u_long, u_long, u_long));
-void	mrt6_stats __P((u_long, u_long));
-char	*routename6 __P((struct sockaddr_in6 *));
-char	*netname6 __P((struct sockaddr_in6 *, struct in6_addr *));
+void	ip6protopr(u_long, char *);
+void	ip6_stats(u_long, char *);
+void	ip6_ifstats(char *);
+void	icmp6_stats(u_long, char *);
+void	icmp6_ifstats(char *);
+void	pim6_stats(u_long, char *);
+void	mroute6pr(u_long, u_long, u_long);
+void	mrt6_stats(u_long, u_long);
+char	*routename6(struct sockaddr_in6 *);
+char	*netname6(struct sockaddr_in6 *, struct in6_addr *);
 #endif /*INET6*/
 
-char	*routename __P((in_addr_t));
-char	*netname __P((in_addr_t, in_addr_t));
-char	*ns_print __P((struct sockaddr *));
-char	*ipx_print __P((struct sockaddr *));
-void	routepr __P((u_long));
-
-void	nsprotopr __P((u_long, char *));
-void	spp_stats __P((u_long, char *));
-void	idp_stats __P((u_long, char *));
-void	nserr_stats __P((u_long, char *));
-
-void	ipxprotopr __P((u_long, char *));
-void	spx_stats __P((u_long, char *));
-void	ipx_stats __P((u_long, char *));
-void	ipxerr_stats __P((u_long, char *));
-
-void	intpr __P((int, u_long));
-
-void	unixpr __P((u_long));
-
-void	esis_stats __P((u_long, char *));
-void	clnp_stats __P((u_long, char *));
-void	cltp_stats __P((u_long, char *));
-void	iso_protopr __P((u_long, char *));
-void	iso_protopr1 __P((u_long, int));
-void	tp_protopr __P((u_long, char *));
-void	tp_inproto __P((u_long));
-void	tp_stats __P((caddr_t, caddr_t));
-
-void	mroutepr __P((u_long, u_long, u_long, u_long));
-void	mrt_stats __P((u_long, u_long));
-
-void	atalkprotopr __P((u_long, char *));
-void	ddp_stats __P((u_long, char *));
-char	*atalk_print __P((const struct sockaddr *, int));
+char	*routename(in_addr_t);
+char	*netname(in_addr_t, in_addr_t);
+char	*ns_print(struct sockaddr *);
+char	*ipx_print(struct sockaddr *);
+void	routepr(u_long);
+
+void	nsprotopr(u_long, char *);
+void	spp_stats(u_long, char *);
+void	idp_stats(u_long, char *);
+void	nserr_stats(u_long, char *);
+
+void	ipxprotopr(u_long, char *);
+void	spx_stats(u_long, char *);
+void	ipx_stats(u_long, char *);
+void	ipxerr_stats(u_long, char *);
+
+void	intpr(int, u_long);
+
+void	unixpr(u_long);
+
+void	esis_stats(u_long, char *);
+void	clnp_stats(u_long, char *);
+void	cltp_stats(u_long, char *);
+void	iso_protopr(u_long, char *);
+void	iso_protopr1(u_long, int);
+void	tp_protopr(u_long, char *);
+void	tp_inproto(u_long);
+void	tp_stats(caddr_t, caddr_t);
+
+void	mroutepr(u_long, u_long, u_long, u_long);
+void	mrt_stats(u_long, u_long);
+
+void	atalkprotopr(u_long, char *);
+void	ddp_stats(u_long, char *);
+char	*atalk_print(const struct sockaddr *, int);
 char	*atalk_print2 __P((const struct sockaddr *,
 		const struct sockaddr *, int));
diff --git a/usr.bin/netstat/ns.c b/usr.bin/netstat/ns.c
index 011d46d6d72..5e5363d896c 100644
--- a/usr.bin/netstat/ns.c
+++ b/usr.bin/netstat/ns.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ns.c,v 1.6 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: ns.c,v 1.7 2002/02/16 21:27:50 millert Exp $	*/
 /*	$NetBSD: ns.c,v 1.8 1995/10/03 21:42:46 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)ns.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: ns.c,v 1.6 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: ns.c,v 1.7 2002/02/16 21:27:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -76,8 +76,8 @@ struct	nspcb nspcb;
 struct	sppcb sppcb;
 struct	socket sockb;
 
-static char *ns_prpr __P((struct ns_addr *));
-static void ns_erputil __P((int, int));
+static char *ns_prpr(struct ns_addr *);
+static void ns_erputil(int, int);
 
 static	int first = 1;
 
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 4ba13dcaaf0..d59228d025f 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.44 2002/01/17 21:34:58 mickey Exp $	*/
+/*	$OpenBSD: route.c,v 1.45 2002/02/16 21:27:50 millert Exp $	*/
 /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-static char *rcsid = "$OpenBSD: route.c,v 1.44 2002/01/17 21:34:58 mickey Exp $";
+static char *rcsid = "$OpenBSD: route.c,v 1.45 2002/02/16 21:27:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -127,15 +127,15 @@ struct	radix_mask rmask;
 
 int	NewTree = 0;
 
-static struct sockaddr *kgetsa __P((struct sockaddr *));
-static void p_tree __P((struct radix_node *));
-static void p_rtnode __P(());
-static void ntreestuff __P(());
-static void np_rtentry __P((struct rt_msghdr *));
-static void p_sockaddr __P((struct sockaddr *, struct sockaddr *, int, int));
-static void p_flags __P((int, char *));
-static void p_rtentry __P((struct rtentry *));
-static void encap_print __P((struct rtentry *));
+static struct sockaddr *kgetsa(struct sockaddr *);
+static void p_tree(struct radix_node *);
+static void p_rtnode();
+static void ntreestuff();
+static void np_rtentry(struct rt_msghdr *);
+static void p_sockaddr(struct sockaddr *, struct sockaddr *, int, int);
+static void p_flags(int, char *);
+static void p_rtentry(struct rtentry *);
+static void encap_print(struct rtentry *);
 
 /*
  * Print routing tables.
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 102e2981f83..63cc2c43014 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unix.c,v 1.7 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: unix.c,v 1.8 2002/02/16 21:27:50 millert Exp $	*/
 /*	$NetBSD: unix.c,v 1.13 1995/10/03 21:42:48 thorpej Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)unix.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: unix.c,v 1.7 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: unix.c,v 1.8 2002/02/16 21:27:50 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -66,7 +66,7 @@ struct proc;
 #include <kvm.h>
 #include "netstat.h"
 
-static	void unixdomainpr __P((struct socket *, caddr_t));
+static	void unixdomainpr(struct socket *, caddr_t);
 
 static struct	file *file, *fileNFILE;
 static int	nfiles;