revert removal of warning and K&R support

Requested by: bde

1 files changed, 48 insertions, 23 deletions

diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 2a7a96f..8a33d60 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -144,7 +144,8 @@ char *netname6 __P((struct sockaddr_in6 *, struct in6_addr *));
  * Print routing tables.
  */
 void
-routepr(u_long rtree)
+routepr(rtree)
+	u_long rtree;
 {
 	struct radix_node_head *rnh, head;
 	int i;
@@ -183,7 +184,8 @@ routepr(u_long rtree)
  * Print address family header before a section of the routing table.
  */
 void
-pr_family(int af)
+pr_family(af)
+	int af;
 {
 	char *afname;
 
@@ -243,7 +245,8 @@ pr_family(int af)
  * Print header for routing table columns.
  */
 void
-pr_rthdr(int af)
+pr_rthdr(af)
+	int af;
 {
 
 	if (Aflag)
@@ -269,7 +272,8 @@ pr_rthdr(int af)
 }
 
 static struct sockaddr *
-kgetsa(struct sockaddr *dst)
+kgetsa(dst)
+	register struct sockaddr *dst;
 {
 
 	kget(dst, pt_u.u_sa);
@@ -279,7 +283,8 @@ kgetsa(struct sockaddr *dst)
 }
 
 static void
-p_tree(struct radix_node *rn)
+p_tree(rn)
+	struct radix_node *rn;
 {
 
 again:
@@ -317,7 +322,7 @@ again:
 char	nbuf[20];
 
 static void
-p_rtnode(void)
+p_rtnode()
 {
 	struct radix_mask *rm = rnode.rn_mklist;
 
@@ -354,7 +359,7 @@ p_rtnode(void)
 }
 
 static void
-ntreestuff(void)
+ntreestuff()
 {
 	size_t needed;
 	int mib[6];
@@ -385,7 +390,8 @@ ntreestuff(void)
 }
 
 static void
-np_rtentry(struct rt_msghdr *rtm)
+np_rtentry(rtm)
+	register struct rt_msghdr *rtm;
 {
 	register struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
 #ifdef notdef
@@ -424,7 +430,9 @@ np_rtentry(struct rt_msghdr *rtm)
 }
 
 static void
-p_sockaddr(struct sockaddr *sa, struct sockaddr *mask, int flags, int width)
+p_sockaddr(sa, mask, flags, width)
+	struct sockaddr *sa, *mask;
+	int flags, width;
 {
 	char workbuf[128], *cplim;
 	register char *cp = workbuf;
@@ -565,7 +573,9 @@ p_sockaddr(struct sockaddr *sa, struct sockaddr *mask, int flags, int width)
 }
 
 static void
-p_flags(int f, char *format)
+p_flags(f, format)
+	register int f;
+	char *format;
 {
 	char name[33], *flags;
 	register struct bits *p = bits;
@@ -578,7 +588,8 @@ p_flags(int f, char *format)
 }
 
 static void
-p_rtentry(struct rtentry *rt)
+p_rtentry(rt)
+	register struct rtentry *rt;
 {
 	static struct ifnet ifnet, *lastif;
 	struct rtentry parent;
@@ -645,7 +656,8 @@ ifandkey:;
 }
 
 char *
-routename(u_long in)
+routename(in)
+	u_long in;
 {
 	register char *cp;
 	static char line[MAXHOSTNAMELEN];
@@ -673,7 +685,8 @@ routename(u_long in)
 }
 
 static u_long
-forgemask(u_long a)
+forgemask(a)
+	u_long a;
 {
 	u_long m;
 
@@ -687,7 +700,9 @@ forgemask(u_long a)
 }
 
 static void
-domask(char *dst, u_long addr, u_long mask)
+domask(dst, addr, mask)
+	char *dst;
+	u_long addr, mask;
 {
 	register int b, i;
 
@@ -719,7 +734,8 @@ domask(char *dst, u_long addr, u_long mask)
  * The address is assumed to be that of a net or subnet, not a host.
  */
 char *
-netname(u_long in, u_long mask)
+netname(in, mask)
+	u_long in, mask;
 {
 	char *cp = 0;
 	static char line[MAXHOSTNAMELEN];
@@ -775,7 +791,9 @@ netname(u_long in, u_long mask)
 
 #ifdef INET6
 char *
-netname6(struct sockaddr_in6 *sa6, struct in6_addr *mask)
+netname6(sa6, mask)
+	struct sockaddr_in6 *sa6;
+	struct in6_addr *mask;
 {
 	static char line[MAXHOSTNAMELEN];
 	u_char *p = (u_char *)mask;
@@ -837,7 +855,8 @@ netname6(struct sockaddr_in6 *sa6, struct in6_addr *mask)
 }
 
 char *
-routename6(struct sockaddr_in6 *sa6)
+routename6(sa6)
+	struct sockaddr_in6 *sa6;
 {
 	static char line[MAXHOSTNAMELEN];
 	int flag = NI_WITHSCOPEID;
@@ -861,7 +880,8 @@ routename6(struct sockaddr_in6 *sa6)
  * Print routing statistics
  */
 void
-rt_stats(u_long off)
+rt_stats(off)
+	u_long off;
 {
 	struct rtstat rtstat;
 
@@ -884,7 +904,8 @@ rt_stats(u_long off)
 }
 
 char *
-ipx_print(struct sockaddr *sa)
+ipx_print(sa)
+	register struct sockaddr *sa;
 {
 	u_short port;
 	struct servent *sp = 0;
@@ -953,7 +974,8 @@ ipx_print(struct sockaddr *sa)
 }
 
 char *
-ipx_phost(struct sockaddr *sa)
+ipx_phost(sa)
+	struct sockaddr *sa;
 {
 	register struct sockaddr_ipx *sipx = (struct sockaddr_ipx *)sa;
 	struct sockaddr_ipx work;
@@ -977,7 +999,8 @@ short ns_nullh[] = {0,0,0};
 short ns_bh[] = {-1,-1,-1};
 
 char *
-ns_print(struct sockaddr *sa)
+ns_print(sa)
+	register struct sockaddr *sa;
 {
 	register struct sockaddr_ns *sns = (struct sockaddr_ns*)sa;
 	struct ns_addr work;
@@ -1023,7 +1046,8 @@ ns_print(struct sockaddr *sa)
 }
 
 char *
-ns_phost(struct sockaddr *sa)
+ns_phost(sa)
+	struct sockaddr *sa;
 {
 	register struct sockaddr_ns *sns = (struct sockaddr_ns *)sa;
 	struct sockaddr_ns work;
@@ -1042,7 +1066,8 @@ ns_phost(struct sockaddr *sa)
 #endif
 
 void
-upHex(char *p0)
+upHex(p0)
+	char *p0;
 {
 	register char *p = p0;