From d1cfb8207d6ffbde8eb0a0cfa5d4f00b2c0ba59f Mon Sep 17 00:00:00 2001
From: Keith Sklower <sklower@ucbvax.Berkeley.EDU>
Date: Tue, 7 Jul 1992 23:57:26 -0800
Subject: [PATCH] not every value return in an nlist structure was being
 coerced to an (off_t) which was only being smashed back down to a (u_long) as
 an argument to kvm_read.  If you ask me nl.n_value ought to be a (void *) but
 since the type of nl.n_value and the second argument to kvm_read are the same
 I got fed up and changed all the off_t's to be that type (u_long).

SCCS-vsn: usr.bin/netstat/if.c 5.18
SCCS-vsn: usr.bin/netstat/inet.c 5.19
SCCS-vsn: usr.bin/netstat/iso.c 5.13
SCCS-vsn: usr.bin/netstat/main.c 5.30
SCCS-vsn: usr.bin/netstat/mbuf.c 5.12
SCCS-vsn: usr.bin/netstat/mroute.c 7.2
SCCS-vsn: usr.bin/netstat/netstat.h 5.4
SCCS-vsn: usr.bin/netstat/ns.c 5.16
SCCS-vsn: usr.bin/netstat/route.c 5.25
SCCS-vsn: usr.bin/netstat/unix.c 5.14
---
 usr/src/usr.bin/netstat/if.c      | 28 +++++++--------
 usr/src/usr.bin/netstat/inet.c    | 18 +++++-----
 usr/src/usr.bin/netstat/iso.c     | 32 ++++++++---------
 usr/src/usr.bin/netstat/main.c    | 20 +++++------
 usr/src/usr.bin/netstat/mbuf.c    |  4 +--
 usr/src/usr.bin/netstat/mroute.c  | 20 +++++------
 usr/src/usr.bin/netstat/netstat.h | 58 ++++++++++++++++---------------
 usr/src/usr.bin/netstat/ns.c      | 18 +++++-----
 usr/src/usr.bin/netstat/route.c   | 12 +++----
 usr/src/usr.bin/netstat/unix.c    | 13 +++----
 10 files changed, 113 insertions(+), 110 deletions(-)

diff --git a/usr/src/usr.bin/netstat/if.c b/usr/src/usr.bin/netstat/if.c
index ac8585ccb6..0828ad3f7e 100644
--- a/usr/src/usr.bin/netstat/if.c
+++ b/usr/src/usr.bin/netstat/if.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)if.c	5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)if.c	5.18 (Berkeley) %G%";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -31,7 +31,7 @@ static char sccsid[] = "@(#)if.c	5.17 (Berkeley) %G%";
 #define	YES	1
 #define	NO	0
 
-static void sidewaysintpr __P((unsigned, off_t));
+static void sidewaysintpr __P((unsigned, u_long));
 static void catchalarm __P(());
 
 /*
@@ -40,7 +40,7 @@ static void catchalarm __P(());
 void
 intpr(interval, ifnetaddr)
 	int interval;
-	off_t ifnetaddr;
+	u_long ifnetaddr;
 {
 	struct ifnet ifnet;
 	union {
@@ -49,7 +49,7 @@ intpr(interval, ifnetaddr)
 		struct ns_ifaddr ns;
 		struct iso_ifaddr iso;
 	} ifaddr;
-	off_t ifaddraddr;
+	u_long ifaddraddr;
 	struct sockaddr *sa;
 	char name[16];
 
@@ -80,10 +80,10 @@ intpr(interval, ifnetaddr)
 
 		if (ifaddraddr == 0) {
 			if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet) ||
-			    kread((off_t)ifnet.if_name, name, 16))
+			    kread((u_long)ifnet.if_name, name, 16))
 				return;
 			name[15] = '\0';
-			ifnetaddr = (off_t) ifnet.if_next;
+			ifnetaddr = (u_long) ifnet.if_next;
 			if (interface != 0 &&
 			    (strcmp(name, interface) != 0 || unit != ifnet.if_unit))
 				continue;
@@ -92,7 +92,7 @@ intpr(interval, ifnetaddr)
 			if ((ifnet.if_flags&IFF_UP) == 0)
 				*cp++ = '*';
 			*cp = '\0';
-			ifaddraddr = (off_t)ifnet.if_addrlist;
+			ifaddraddr = (u_long)ifnet.if_addrlist;
 		}
 		printf("%-5.5s %-5d ", name, ifnet.if_mtu);
 		if (ifaddraddr == 0) {
@@ -168,7 +168,7 @@ intpr(interval, ifnetaddr)
 					putchar(' ');
 				break;
 			}
-			ifaddraddr = (off_t)ifaddr.ifa.ifa_next;
+			ifaddraddr = (u_long)ifaddr.ifa.ifa_next;
 		}
 		printf("%8d %5d %8d %5d %5d",
 		    ifnet.if_ipackets, ifnet.if_ierrors,
@@ -204,16 +204,16 @@ u_char	signalled;			/* set if alarm goes off "early" */
 static void
 sidewaysintpr(interval, off)
 	unsigned interval;
-	off_t off;
+	u_long off;
 {
 	struct ifnet ifnet;
-	off_t firstifnet;
+	u_long firstifnet;
 	register struct iftot *ip, *total;
 	register int line;
 	struct iftot *lastif, *sum, *interesting;
 	int oldmask;
 
-	if (kread(off, (char *)&firstifnet, sizeof (off_t)))
+	if (kread(off, (char *)&firstifnet, sizeof (u_long)))
 		return;
 	lastif = iftot;
 	sum = iftot + MAXIF - 1;
@@ -225,7 +225,7 @@ sidewaysintpr(interval, off)
 		if (kread(off, (char *)&ifnet, sizeof ifnet))
 			break;
 		ip->ift_name[0] = '(';
-		if (kread((off_t)ifnet.if_name, ip->ift_name + 1, 15))
+		if (kread((u_long)ifnet.if_name, ip->ift_name + 1, 15))
 			break;
 		if (interface && strcmp(ip->ift_name + 1, interface) == 0 &&
 		    unit == ifnet.if_unit)
@@ -236,7 +236,7 @@ sidewaysintpr(interval, off)
 		ip++;
 		if (ip >= iftot + MAXIF - 2)
 			break;
-		off = (off_t) ifnet.if_next;
+		off = (u_long) ifnet.if_next;
 	}
 	lastif = ip;
 
@@ -306,7 +306,7 @@ loop:
 		sum->ift_oe += ip->ift_oe;
 		sum->ift_co += ip->ift_co;
 		sum->ift_dr += ip->ift_dr;
-		off = (off_t) ifnet.if_next;
+		off = (u_long) ifnet.if_next;
 	}
 	if (lastif - iftot > 0) {
 		printf("  %8d %5d %8d %5d %5d",
diff --git a/usr/src/usr.bin/netstat/inet.c b/usr/src/usr.bin/netstat/inet.c
index c0f8e17e07..3e5d251109 100644
--- a/usr/src/usr.bin/netstat/inet.c
+++ b/usr/src/usr.bin/netstat/inet.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)inet.c	5.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)inet.c	5.19 (Berkeley) %G%";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -56,7 +56,7 @@ void	inetprint __P((struct in_addr *, int, char *));
  */
 void
 protopr(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct inpcb cb;
@@ -74,7 +74,7 @@ protopr(off, name)
 		return;
 	while (inpcb.inp_next != (struct inpcb *)off) {
 		next = inpcb.inp_next;
-		kread((off_t)next, (char *)&inpcb, sizeof (inpcb));
+		kread((u_long)next, (char *)&inpcb, sizeof (inpcb));
 		if (inpcb.inp_prev != prev) {
 			printf("???\n");
 			break;
@@ -84,9 +84,9 @@ protopr(off, name)
 			prev = next;
 			continue;
 		}
-		kread((off_t)inpcb.inp_socket, (char *)&sockb, sizeof (sockb));
+		kread((u_long)inpcb.inp_socket, (char *)&sockb, sizeof (sockb));
 		if (istcp) {
-			kread((off_t)inpcb.inp_ppcb,
+			kread((u_long)inpcb.inp_ppcb,
 			    (char *)&tcpcb, sizeof (tcpcb));
 		}
 		if (first) {
@@ -128,7 +128,7 @@ protopr(off, name)
  */
 void
 tcp_stats(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct tcpstat tcpstat;
@@ -197,7 +197,7 @@ tcp_stats(off, name)
  */
 void
 udp_stats(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct udpstat udpstat;
@@ -225,7 +225,7 @@ udp_stats(off, name)
  */
 void
 ip_stats(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct ipstat ipstat;
@@ -281,7 +281,7 @@ static	char *icmpnames[] = {
  */
 void
 icmp_stats(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct icmpstat icmpstat;
diff --git a/usr/src/usr.bin/netstat/iso.c b/usr/src/usr.bin/netstat/iso.c
index c097929246..5fae490fd0 100644
--- a/usr/src/usr.bin/netstat/iso.c
+++ b/usr/src/usr.bin/netstat/iso.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)iso.c	5.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)iso.c	5.13 (Berkeley) %G%";
 #endif /* not lint */
 
 /*
@@ -91,7 +91,7 @@ extern void inetprint __P((struct in_addr *, int, char *));
  */
 void
 esis_stats(off, name)
-	off_t	off;
+	u_long	off;
 	char	*name;
 {
 	struct esis_stat esis_stat;
@@ -120,7 +120,7 @@ esis_stats(off, name)
  */
 void
 clnp_stats(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct clnp_stat clnp_stat;
@@ -155,7 +155,7 @@ clnp_stats(off, name)
  */
 void
 cltp_stats(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct cltpstat cltpstat;
@@ -179,7 +179,7 @@ union	{
 	char	data[128];
 } laddr, faddr;
 #define kget(o, p) \
-	(kread((off_t)(o), (char *)&p, sizeof (p)))
+	(kread((u_long)(o), (char *)&p, sizeof (p)))
 
 static	int first = 1;
 
@@ -191,7 +191,7 @@ static	int first = 1;
  */
 void
 iso_protopr(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct isopcb cb;
@@ -220,7 +220,7 @@ iso_protopr(off, name)
 			break;
 		}
 		kget(isopcb.isop_socket, sockb);
-		iso_protopr1((off_t)next, 0);
+		iso_protopr1((u_long)next, 0);
 		putchar('\n');
 		prev = next;
 	}
@@ -228,7 +228,7 @@ iso_protopr(off, name)
 
 void
 iso_protopr1(kern_addr, istp)
-	off_t kern_addr;
+	u_long kern_addr;
 	int istp;
 {
 	if (first) {
@@ -279,7 +279,7 @@ iso_protopr1(kern_addr, istp)
 
 void
 tp_protopr(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct tp_ref *tpr, *tpr_base;
@@ -291,7 +291,7 @@ tp_protopr(off, name)
 	tpr_base = (struct tp_ref *)malloc(size);
 	if (tpr_base == 0)
 		return;
-	kread((off_t)(tpkerninfo.tpr_base), (char *)tpr_base, size);
+	kread((u_long)(tpkerninfo.tpr_base), (char *)tpr_base, size);
 	for (tpr = tpr_base; tpr < tpr_base + tpkerninfo.tpr_size; tpr++) {
 		if (tpr->tpr_pcb == 0)
 			continue;
@@ -307,11 +307,11 @@ tp_protopr(off, name)
 		kget(tpcb.tp_sock, sockb);
 		if (tpcb.tp_npcb) switch(tpcb.tp_netservice) {
 			case IN_CLNS:
-				tp_inproto((off_t)tpkerninfo.tpr_base);
+				tp_inproto((u_long)tpkerninfo.tpr_base);
 				break;
 			default:
 				kget(tpcb.tp_npcb, isopcb);
-				iso_protopr1((off_t)tpcb.tp_npcb, 1);
+				iso_protopr1((u_long)tpcb.tp_npcb, 1);
 				break;
 		}
 		if (tpcb.tp_state >= tp_NSTATES)
@@ -324,7 +324,7 @@ tp_protopr(off, name)
 
 void
 tp_inproto(pcb)
-	off_t pcb;
+	u_long pcb;
 {
 	struct inpcb inpcb;
 	kget(tpcb.tp_npcb, inpcb);
@@ -436,7 +436,7 @@ isonetprint(iso, sufx, sufxlen, islocal)
 #ifdef notdef
 static void
 x25_protopr(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	static char *xpcb_states[] = {
@@ -460,12 +460,12 @@ x25_protopr(off, name)
 		return;
 	while (xpcb.x_next != (struct isopcb *)off) {
 		next = isopcb.isop_next;
-		kread((off_t)next, &xpcb, sizeof (struct x25_pcb));
+		kread((u_long)next, &xpcb, sizeof (struct x25_pcb));
 		if (xpcb.x_prev != prev) {
 			printf("???\n");
 			break;
 		}
-		kread((off_t)xpcb.x_socket, &sockb, sizeof (sockb));
+		kread((u_long)xpcb.x_socket, &sockb, sizeof (sockb));
 
 		if (!aflag &&
 			xpcb.x_state == LISTENING ||
diff --git a/usr/src/usr.bin/netstat/main.c b/usr/src/usr.bin/netstat/main.c
index fb91e0d1f3..5832f69b93 100644
--- a/usr/src/usr.bin/netstat/main.c
+++ b/usr/src/usr.bin/netstat/main.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)main.c	5.29 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c	5.30 (Berkeley) %G%";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -330,7 +330,7 @@ main(argc, argv)
 		exit(1);
 	}
 	if (mflag) {
-		mbpr((off_t)nl[N_MBSTAT].n_value);
+		mbpr(nl[N_MBSTAT].n_value);
 		exit(0);
 	}
 	if (pflag) {
@@ -357,19 +357,19 @@ main(argc, argv)
 	}
 	if (rflag) {
 		if (sflag)
-			rt_stats((off_t)nl[N_RTSTAT].n_value);
+			rt_stats(nl[N_RTSTAT].n_value);
 		else
-			routepr((off_t)nl[N_RTREE].n_value);
+			routepr(nl[N_RTREE].n_value);
 		exit(0);
 	}
 	if (Bflag) {
 		if (sflag)
-			mrt_stats((off_t)nl[N_MRTPROTO].n_value,
-			    (off_t)nl[N_MRTSTAT].n_value);
+			mrt_stats(nl[N_MRTPROTO].n_value,
+			    nl[N_MRTSTAT].n_value);
 		else
-			mroutepr((off_t)nl[N_MRTPROTO].n_value,
-			    (off_t)nl[N_MRTTABLE].n_value,
-			    (off_t)nl[N_VIFTABLE].n_value);
+			mroutepr(nl[N_MRTPROTO].n_value,
+			    nl[N_MRTTABLE].n_value,
+			    nl[N_VIFTABLE].n_value);
 		exit(0);
 	}
 
@@ -389,7 +389,7 @@ main(argc, argv)
  */
 int
 kread(addr, buf, size)
-	off_t addr;
+	u_long addr;
 	char *buf;
 	int size;
 {
diff --git a/usr/src/usr.bin/netstat/mbuf.c b/usr/src/usr.bin/netstat/mbuf.c
index 44e8854815..bb79d1e38c 100644
--- a/usr/src/usr.bin/netstat/mbuf.c
+++ b/usr/src/usr.bin/netstat/mbuf.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)mbuf.c	5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)mbuf.c	5.12 (Berkeley) %G%";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -51,7 +51,7 @@ bool seen[256];			/* "have we seen this type yet?" */
  */
 void
 mbpr(mbaddr)
-	off_t mbaddr;
+	u_long mbaddr;
 {
 	register int totmem, totfree, totmbufs;
 	register int i;
diff --git a/usr/src/usr.bin/netstat/mroute.c b/usr/src/usr.bin/netstat/mroute.c
index c9bd0181e8..adbe335b10 100644
--- a/usr/src/usr.bin/netstat/mroute.c
+++ b/usr/src/usr.bin/netstat/mroute.c
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)mroute.c	7.1 (Berkeley) %G%
+ *	@(#)mroute.c	7.2 (Berkeley) %G%
  */
 
 /*
@@ -34,7 +34,7 @@
 
 void
 mroutepr(mrpaddr, mrtaddr, vifaddr)
-	off_t mrpaddr, mrtaddr, vifaddr;
+	u_long mrpaddr, mrtaddr, vifaddr;
 {
 	u_int mrtproto;
 	struct mrt *mrttable[MRTHASHSIZ];
@@ -53,7 +53,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
 		return;
 	}
 
-	kread((off_t)mrpaddr, (char *)&mrtproto, sizeof(mrtproto));
+	kread(mrpaddr, (char *)&mrtproto, sizeof(mrtproto));
 	switch (mrtproto) {
 
 	case 0:
@@ -80,7 +80,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
 	saved_nflag = nflag;
 	nflag = 1;
 
-	kread((off_t)vifaddr, (char *)&viftable, sizeof(viftable));
+	kread(vifaddr, (char *)&viftable, sizeof(viftable));
 	banner_printed = 0;
 	for (vifi = 0, v = viftable; vifi < MAXVIFS; ++vifi, ++v) {
 		if (v->v_lcl_addr.s_addr == 0)
@@ -104,7 +104,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
 			printf("v_lcl_grps_n: malloc failed\n");
 			return;
 		}
-		kread((off_t)v->v_lcl_grps, (caddr_t)grp, n * sizeof(*grp));
+		kread((u_long)v->v_lcl_grps, (caddr_t)grp, n * sizeof(*grp));
 		for (i = 0; i < n; ++i)
 			printf("%51s %-15.15s\n",
 			    "", routename((grp++)->s_addr));
@@ -113,7 +113,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
 	if (!banner_printed)
 		printf("\nVirtual Interface Table is empty\n");
 
-	kread((off_t)mrtaddr, (char *)&mrttable, sizeof(mrttable));
+	kread(mrtaddr, (char *)&mrttable, sizeof(mrttable));
 	banner_printed = 0;
 	for (i = 0; i < MRTHASHSIZ; ++i) {
 		for (mrt = mrttable[i]; mrt != NULL; mrt = mrt->mrt_next) {
@@ -123,7 +123,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
 				banner_printed = 1;
 			}
 
-			kread((off_t)mrt, (char *)&smrt, sizeof(*mrt));
+			kread((u_long)mrt, (char *)&smrt, sizeof(*mrt));
 			mrt = &smrt;
 			printf(" %3u   %-15.15s  %2u   ",
 			    i, netname(mrt->mrt_origin.s_addr,
@@ -148,7 +148,7 @@ mroutepr(mrpaddr, mrtaddr, vifaddr)
 
 void
 mrt_stats(mrpaddr, mstaddr)
-	off_t mrpaddr, mstaddr;
+	u_long mrpaddr, mstaddr;
 {
 	u_int mrtproto;
 	struct mrtstat mrtstat;
@@ -158,7 +158,7 @@ mrt_stats(mrpaddr, mstaddr)
 		return;
 	}
 
-	kread((off_t)mrpaddr, (char *)&mrtproto, sizeof(mrtproto));
+	kread(mrpaddr, (char *)&mrtproto, sizeof(mrtproto));
 	switch (mrtproto) {
 	    case 0:
 		printf("no multicast routing compiled into this system\n");
@@ -177,7 +177,7 @@ mrt_stats(mrpaddr, mstaddr)
 		return;
 	}
 
-	kread((off_t)mstaddr, (char *)&mrtstat, sizeof(mrtstat));
+	kread(mstaddr, (char *)&mrtstat, sizeof(mrtstat));
 	printf("multicast routing:\n");
 	printf(" %10u multicast route lookup%s\n",
 	  mrtstat.mrts_mrt_lookups, plural(mrtstat.mrts_mrt_lookups));
diff --git a/usr/src/usr.bin/netstat/netstat.h b/usr/src/usr.bin/netstat/netstat.h
index 913a7decc9..0f7f2bdde0 100644
--- a/usr/src/usr.bin/netstat/netstat.h
+++ b/usr/src/usr.bin/netstat/netstat.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)netstat.h	5.3 (Berkeley) %G%
+ *	@(#)netstat.h	5.4 (Berkeley) %G%
  */
 
 #include <sys/cdefs.h>
@@ -32,50 +32,52 @@ int	af;		/* address family */
 char	*prog;		/* program name */
 
 
-int	kread __P((off_t addr, char *buf, int size));
+int	kread __P((u_long addr, char *buf, int size));
 char	*plural __P((int));
 char	*plurales __P((int));
 
-void	protopr __P((off_t, char *));
-void	tcp_stats __P((off_t, char *));
-void	udp_stats __P((off_t, char *));
-void	ip_stats __P((off_t, char *));
-void	icmp_stats __P((off_t, char *));
-void	protopr __P((off_t, char *));
+void	protopr __P((u_long, char *));
+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	protopr __P((u_long, char *));
 
-void	mbpr(off_t);
+void	mbpr(u_long);
 
-void	hostpr __P((off_t, off_t));
-void	impstats __P((off_t, off_t));
+void	hostpr __P((u_long, u_long));
+void	impstats __P((u_long, u_long));
+
+void	intpr __P((int, u_long));
 
 void	pr_rthdr __P(());
 void	pr_family __P((int));
-void	rt_stats __P((off_t));
+void	rt_stats __P((u_long));
 char	*ns_phost __P((struct sockaddr *));
 void	upHex __P((char *));
 
 char	*routename __P((u_long));
 char	*netname __P((u_long, u_long));
 char	*ns_print __P((struct sockaddr *));
-void	routepr __P((off_t));
+void	routepr __P((u_long));
 
-void	nsprotopr __P((off_t, char *));
-void	spp_stats __P((off_t, char *));
-void	idp_stats __P((off_t, char *));
-void	nserr_stats __P((off_t, char *));
+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	intpr __P((int, off_t));
+void	intpr __P((int, u_long));
 
-void	unixpr __P((struct protosw *));
+void	unixpr __P((u_long));
 
-void	esis_stats __P((off_t, char *));
-void	clnp_stats __P((off_t, char *));
-void	cltp_stats __P((off_t, char *));
-void	iso_protopr __P((off_t, char *));
-void	iso_protopr1 __P((off_t, int));
-void	tp_protopr __P((off_t, char *));
-void	tp_inproto __P((off_t));
+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((off_t, off_t, off_t));
-void	mrt_stats __P((off_t, off_t));
+void	mroutepr __P((u_long, u_long, u_long));
+void	mrt_stats __P((u_long, u_long));
diff --git a/usr/src/usr.bin/netstat/ns.c b/usr/src/usr.bin/netstat/ns.c
index 178a52ffc0..18835358aa 100644
--- a/usr/src/usr.bin/netstat/ns.c
+++ b/usr/src/usr.bin/netstat/ns.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)ns.c	5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)ns.c	5.16 (Berkeley) %G%";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -56,7 +56,7 @@ static	int first = 1;
 
 void
 nsprotopr(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct nspcb cb;
@@ -72,10 +72,10 @@ nsprotopr(off, name)
 	if (nspcb.nsp_next == (struct nspcb *)off)
 		return;
 	for (;nspcb.nsp_next != (struct nspcb *)off; prev = next) {
-		off_t ppcb;
+		u_long ppcb;
 
 		next = nspcb.nsp_next;
-		kread((off_t)next, (char *)&nspcb, sizeof (nspcb));
+		kread((u_long)next, (char *)&nspcb, sizeof (nspcb));
 		if (nspcb.nsp_prev != prev) {
 			printf("???\n");
 			break;
@@ -83,9 +83,9 @@ nsprotopr(off, name)
 		if (!aflag && ns_nullhost(nspcb.nsp_faddr) ) {
 			continue;
 		}
-		kread((off_t)nspcb.nsp_socket,
+		kread((u_long)nspcb.nsp_socket,
 				(char *)&sockb, sizeof (sockb));
-		ppcb = (off_t) nspcb.nsp_pcb;
+		ppcb = (u_long) nspcb.nsp_pcb;
 		if (ppcb) {
 			if (isspp) {
 				kread(ppcb, (char *)&sppcb, sizeof (sppcb));
@@ -131,7 +131,7 @@ nsprotopr(off, name)
  */
 void
 spp_stats(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct spp_istat spp_istat;
@@ -209,7 +209,7 @@ spp_stats(off, name)
  */
 void
 idp_stats(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct idpstat idpstat;
@@ -245,7 +245,7 @@ static	struct {
 /*ARGSUSED*/
 void
 nserr_stats(off, name)
-	off_t off;
+	u_long off;
 	char *name;
 {
 	struct ns_errstat ns_errstat;
diff --git a/usr/src/usr.bin/netstat/route.c b/usr/src/usr.bin/netstat/route.c
index 84b4d323e8..6bf5de884d 100644
--- a/usr/src/usr.bin/netstat/route.c
+++ b/usr/src/usr.bin/netstat/route.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)route.c	5.24 (Berkeley) %G%";
+static char sccsid[] = "@(#)route.c	5.25 (Berkeley) %G%";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#)route.c	5.24 (Berkeley) %G%";
 #include <unistd.h>
 #include "netstat.h"
 
-#define kget(p, d) (kread((off_t)(p), (char *)&(d), sizeof (d)))
+#define kget(p, d) (kread((u_long)(p), (char *)&(d), sizeof (d)))
 
 /*
  * Definitions for showing gateway flags.
@@ -85,7 +85,7 @@ static void p_rtentry __P((struct rtentry *));
  */
 void
 routepr(rtree)
-	off_t rtree;
+	u_long rtree;
 {
 	struct radix_node_head *rnh, head;
 	int i;
@@ -178,7 +178,7 @@ kgetsa(dst)
 
 	kget(dst, pt_u.u_sa);
 	if (pt_u.u_sa.sa_len > sizeof (pt_u.u_sa))
-		kread((off_t)dst, (char *)pt_u.u_data, pt_u.u_sa.sa_len);
+		kread((u_long)dst, (char *)pt_u.u_data, pt_u.u_sa.sa_len);
 	return (&pt_u.u_sa);
 }
 
@@ -417,7 +417,7 @@ p_rtentry(rt)
 	if (rt->rt_ifp) {
 		if (rt->rt_ifp != lastif) {
 			kget(rt->rt_ifp, ifnet);
-			kread((off_t)ifnet.if_name, name, 16);
+			kread((u_long)ifnet.if_name, name, 16);
 			lastif = rt->rt_ifp;
 		}
 		printf(" %.15s%d%s", name, ifnet.if_unit,
@@ -529,7 +529,7 @@ netname(in, mask)
  */
 void
 rt_stats(off)
-	off_t off;
+	u_long off;
 {
 	struct rtstat rtstat;
 
diff --git a/usr/src/usr.bin/netstat/unix.c b/usr/src/usr.bin/netstat/unix.c
index f9c7519715..33152217d6 100644
--- a/usr/src/usr.bin/netstat/unix.c
+++ b/usr/src/usr.bin/netstat/unix.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)unix.c	5.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)unix.c	5.14 (Berkeley) %G%";
 #endif /* not lint */
 
 /*
@@ -39,12 +39,13 @@ int	nfiles;
 extern	kvm_t *kvmd;
 
 void
-unixpr(unixsw)
-	struct protosw *unixsw;
+unixpr(off)
+	u_long	off;
 {
 	register struct file *fp;
 	struct socket sock, *so = &sock;
 	char *filebuf;
+	struct protosw *unixsw = (struct protosw *)off;
 
 	filebuf = (char *)kvm_getfiles(kvmd, KINFO_FILE, 0, &nfiles);
 	if (filebuf == 0) {
@@ -56,7 +57,7 @@ unixpr(unixsw)
 	for (fp = file; fp < fileNFILE; fp++) {
 		if (fp->f_count == 0 || fp->f_type != DTYPE_SOCKET)
 			continue;
-		if (kread((off_t)fp->f_data, (char *)so, sizeof (*so)))
+		if (kread((u_long)fp->f_data, (char *)so, sizeof (*so)))
 			continue;
 		/* kludge */
 		if (so->so_proto >= unixsw && so->so_proto <= unixsw + 2)
@@ -78,11 +79,11 @@ unixdomainpr(so, soaddr)
 	struct sockaddr_un *sa;
 	static int first = 1;
 
-	if (kread((off_t)so->so_pcb, (char *)unp, sizeof (*unp)))
+	if (kread((u_long)so->so_pcb, (char *)unp, sizeof (*unp)))
 		return;
 	if (unp->unp_addr) {
 		m = &mbuf;
-		if (kread((off_t)unp->unp_addr, (char *)m, sizeof (*m)))
+		if (kread((u_long)unp->unp_addr, (char *)m, sizeof (*m)))
 			m = (struct mbuf *)0;
 		sa = (struct sockaddr_un *)(m->m_dat);
 	} else
-- 
2.20.1