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.

1 files changed, 72 insertions, 72 deletions

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));