Fixed printf format errors.

6 files changed, 112 insertions, 97 deletions

diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 6308e73..90ed87d 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)atalk.c	1.1 (Whistle) 6/6/96";
 */
 static const char rcsid[] =
-	"$Id: atalk.c,v 1.9 1997/02/22 19:56:20 peter Exp $";
+	"$Id: atalk.c,v 1.10 1997/07/29 06:51:39 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -240,8 +240,8 @@ atalkprotopr(off, name)
 			first = 0;
 		}
 		if (Aflag)
-			printf("%8x ", ppcb);
-		printf("%-5.5s %6d %6d ", name, sockb.so_rcv.sb_cc,
+			printf("%8lx ", ppcb);
+		printf("%-5.5s %6lu %6lu ", name, sockb.so_rcv.sb_cc,
 			sockb.so_snd.sb_cc);
 		printf(Aflag?" %-18.18s":" %-22.22s", atalk_print(
 					(struct sockaddr *)&ddpcb.ddp_lsat,7));
@@ -250,8 +250,9 @@ atalkprotopr(off, name)
 		putchar('\n');
 	}
 }
+
 #define ANY(x,y,z) \
-	((x) ? printf("\t%d %s%s%s\n",x,y,plural(x),z) : 0)
+	((x) ? printf("\t%lu %s%s%s\n",x,y,plural(x),z) : 0)
 
 /*
  * Dump DDP statistics structure.
@@ -278,6 +279,3 @@ ddp_stats(off, name)
 	ANY(ddpstat.ddps_cantforward, "packet", " rcvd for unreachable dest ");
 	ANY(ddpstat.ddps_nosockspace, "packet", " dropped due to no socket space ");
 }
-#undef ANY
-
-
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index ca12cda..d483118 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-	"$Id$";
+	"$Id: if.c,v 1.23 1997/02/22 19:56:21 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -196,7 +196,7 @@ intpr(interval, ifnetaddr)
 				char netnum[10];
 
 				*(union ipx_net *) &net = sipx->sipx_addr.x_net;
-				sprintf(netnum, "%lx", ntohl(net));
+				sprintf(netnum, "%lx", (u_long)ntohl(net));
 				printf("ipx:%-8s ", netnum);
 /*				printf("ipx:%-8s ", netname(net, 0L)); */
 				printf("%-15s ",
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 417f7db..314ada5 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 */
 static const char rcsid[] =
-	"$Id: inet.c,v 1.28 1998/05/19 16:00:55 pb Exp $";
+	"$Id: inet.c,v 1.29 1998/06/09 04:13:01 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -239,8 +239,12 @@ tcp_stats(off, name)
 
 #define	p(f, m) if (tcpstat.f || sflag <= 1) \
     printf(m, tcpstat.f, plural(tcpstat.f))
+#define	p1a(f, m) if (tcpstat.f || sflag <= 1) \
+    printf(m, tcpstat.f)
 #define	p2(f1, f2, m) if (tcpstat.f1 || tcpstat.f2 || sflag <= 1) \
     printf(m, tcpstat.f1, plural(tcpstat.f1), tcpstat.f2, plural(tcpstat.f2))
+#define	p2a(f1, f2, m) if (tcpstat.f1 || tcpstat.f2 || sflag <= 1) \
+    printf(m, tcpstat.f1, plural(tcpstat.f1), tcpstat.f2)
 #define	p3(f, m) if (tcpstat.f || sflag <= 1) \
     printf(m, tcpstat.f, plurales(tcpstat.f))
 
@@ -250,7 +254,7 @@ tcp_stats(off, name)
 	p2(tcps_sndrexmitpack, tcps_sndrexmitbyte,
 		"\t\t%lu data packet%s (%lu byte%s) retransmitted\n");
 	p(tcps_mturesent, "\t\t%lu resend%s initiated by MTU discovery\n");
-	p2(tcps_sndacks, tcps_delack,
+	p2a(tcps_sndacks, tcps_delack,
 		"\t\t%lu ack-only packet%s (%lu delayed)\n");
 	p(tcps_sndurg, "\t\t%lu URG only packet%s\n");
 	p(tcps_sndprobe, "\t\t%lu window probe packet%s\n");
@@ -276,7 +280,7 @@ tcp_stats(off, name)
 	p(tcps_rcvafterclose, "\t\t%lu packet%s received after close\n");
 	p(tcps_rcvbadsum, "\t\t%lu discarded for bad checksum%s\n");
 	p(tcps_rcvbadoff, "\t\t%lu discarded for bad header offset field%s\n");
-	p(tcps_rcvshort, "\t\t%lu discarded because packet too short\n");
+	p1a(tcps_rcvshort, "\t\t%lu discarded because packet too short\n");
 	p(tcps_connattempt, "\t%lu connection request%s\n");
 	p(tcps_accepts, "\t%lu connection accept%s\n");
 	p(tcps_badsyn, "\t%lu bad connection attempt%s\n");
@@ -302,7 +306,9 @@ tcp_stats(off, name)
 	p(tcps_predack, "\t%lu correct ACK header prediction%s\n");
 	p(tcps_preddat, "\t%lu correct data packet header prediction%s\n");
 #undef p
+#undef p1a
 #undef p2
+#undef p2a
 #undef p3
 }
 
@@ -326,14 +332,17 @@ udp_stats(off, name)
 	printf("%s:\n", name);
 #define	p(f, m) if (udpstat.f || sflag <= 1) \
     printf(m, udpstat.f, plural(udpstat.f))
+#define	p1a(f, m) if (udpstat.f || sflag <= 1) \
+    printf(m, udpstat.f)
 	p(udps_ipackets, "\t%lu datagram%s received\n");
-	p(udps_hdrops, "\t%lu with incomplete header\n");
-	p(udps_badlen, "\t%lu with bad data length field\n");
-	p(udps_badsum, "\t%lu with bad checksum\n");
-	p(udps_noport, "\t%lu dropped due to no socket\n");
-	p(udps_noportbcast, "\t%lu broadcast/multicast datagram%s dropped due to no socket\n");
-	p(udps_fullsock, "\t%lu dropped due to full socket buffers\n");
-	p(udpps_pcbhashmiss, "\t%lu not for hashed pcb\n");
+	p1a(udps_hdrops, "\t%lu with incomplete header\n");
+	p1a(udps_badlen, "\t%lu with bad data length field\n");
+	p1a(udps_badsum, "\t%lu with bad checksum\n");
+	p1a(udps_noport, "\t%lu dropped due to no socket\n");
+	p(udps_noportbcast,
+	    "\t%lu broadcast/multicast datagram%s dropped due to no socket\n");
+	p1a(udps_fullsock, "\t%lu dropped due to full socket buffers\n");
+	p1a(udpps_pcbhashmiss, "\t%lu not for hashed pcb\n");
 	delivered = udpstat.udps_ipackets -
 		    udpstat.udps_hdrops -
 		    udpstat.udps_badlen -
@@ -345,6 +354,7 @@ udp_stats(off, name)
 		printf("\t%lu delivered\n", delivered);
 	p(udps_opackets, "\t%lu datagram%s output\n");
 #undef p
+#undef p1a
 }
 
 /*
@@ -367,15 +377,17 @@ ip_stats(off, name)
 
 #define	p(f, m) if (ipstat.f || sflag <= 1) \
     printf(m, ipstat.f, plural(ipstat.f))
+#define	p1a(f, m) if (ipstat.f || sflag <= 1) \
+    printf(m, ipstat.f)
 
 	p(ips_total, "\t%lu total packet%s received\n");
 	p(ips_badsum, "\t%lu bad header checksum%s\n");
-	p(ips_toosmall, "\t%lu with size smaller than minimum\n");
-	p(ips_tooshort, "\t%lu with data size < data length\n");
-	p(ips_badhlen, "\t%lu with header length < data size\n");
-	p(ips_badlen, "\t%lu with data length < header length\n");
-	p(ips_badoptions, "\t%lu with bad options\n");
-	p(ips_badvers, "\t%lu with incorrect version number\n");
+	p1a(ips_toosmall, "\t%lu with size smaller than minimum\n");
+	p1a(ips_tooshort, "\t%lu with data size < data length\n");
+	p1a(ips_badhlen, "\t%lu with header length < data size\n");
+	p1a(ips_badlen, "\t%lu with data length < header length\n");
+	p1a(ips_badoptions, "\t%lu with bad options\n");
+	p1a(ips_badvers, "\t%lu with incorrect version number\n");
 	p(ips_fragments, "\t%lu fragment%s received\n");
 	p(ips_fragdropped, "\t%lu fragment%s dropped (dup or out of space)\n");
 	p(ips_fragtimeout, "\t%lu fragment%s dropped after timeout\n");
@@ -399,6 +411,7 @@ ip_stats(off, name)
 	p(ips_ofragments, "\t%lu fragment%s created\n");
 	p(ips_cantfrag, "\t%lu datagram%s that can't be fragmented\n");
 #undef p
+#undef p1a
 }
 
 static	char *icmpnames[] = {
@@ -450,6 +463,8 @@ icmp_stats(off, name)
 
 #define	p(f, m) if (icmpstat.f || sflag <= 1) \
     printf(m, icmpstat.f, plural(icmpstat.f))
+#define	p1a(f, m) if (icmpstat.f || sflag <= 1) \
+    printf(m, icmpstat.f)
 
 	p(icps_error, "\t%lu call%s to icmp_error\n");
 	p(icps_oldicmp,
@@ -467,8 +482,8 @@ icmp_stats(off, name)
 	p(icps_tooshort, "\t%lu message%s < minimum length\n");
 	p(icps_checksum, "\t%lu bad checksum%s\n");
 	p(icps_badlen, "\t%lu message%s with bad length\n");
-	p(icps_bmcastecho, "\t%lu multicast echo requests ignored\n");
-	p(icps_bmcasttstamp, "\t%lu multicast timestamp requests ignored\n");
+	p1a(icps_bmcastecho, "\t%lu multicast echo requests ignored\n");
+	p1a(icps_bmcasttstamp, "\t%lu multicast timestamp requests ignored\n");
 	for (first = 1, i = 0; i < ICMP_MAXTYPE + 1; i++)
 		if (icmpstat.icps_inhist[i] != 0) {
 			if (first) {
@@ -480,6 +495,7 @@ icmp_stats(off, name)
 		}
 	p(icps_reflect, "\t%lu message response%s generated\n");
 #undef p
+#undef p1a
 	mib[3] = ICMPCTL_MASKREPL;
 	len = sizeof i;
 	if (sysctl(mib, 4, &i, &len, (void *)0, 0) < 0)
@@ -588,8 +604,8 @@ inetname(inp)
 		line[sizeof(line) - 1] = '\0';
 	} else {
 		inp->s_addr = ntohl(inp->s_addr);
-#define C(x)	((x) & 0xff)
-		sprintf(line, "%lu.%lu.%lu.%lu", C(inp->s_addr >> 24),
+#define C(x)	((u_int)((x) & 0xff))
+		sprintf(line, "%u.%u.%u.%u", C(inp->s_addr >> 24),
 		    C(inp->s_addr >> 16), C(inp->s_addr >> 8), C(inp->s_addr));
 	}
 	return (line);
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index d68eae9..215cbd0 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ns.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: ipx.c,v 1.8 1997/05/10 10:03:41 jhay Exp $";
+	"$Id: ipx.c,v 1.9 1997/07/29 06:51:39 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -153,6 +153,7 @@ ipxprotopr(off, name)
 }
 
 #define ANY(x,y,z) (printf("\t%u %s%s%s\n",x,y,plural(x),z))
+#define ANYl(x,y,z) (printf("\t%lu %s%s%s\n",x,y,plural(x),z))
 
 /*
  * Dump SPX statistics structure.
@@ -181,58 +182,57 @@ spx_stats(off, name)
 	ANY(spx_istat.bdreas, "packet", " dropped out of sequence");
 	ANY(spx_istat.lstdup, "packet", " duplicating the highest packet");
 	ANY(spx_istat.notyet, "packet", " refused as exceeding allocation");
-	ANY(spxstat.spxs_connattempt, "connection", " initiated");
-	ANY(spxstat.spxs_accepts, "connection", " accepted");
-	ANY(spxstat.spxs_connects, "connection", " established");
-	ANY(spxstat.spxs_drops, "connection", " dropped");
-	ANY(spxstat.spxs_conndrops, "embryonic connection", " dropped");
-	ANY(spxstat.spxs_closed, "connection", " closed (includes drops)");
-	ANY(spxstat.spxs_segstimed, "packet", " where we tried to get rtt");
-	ANY(spxstat.spxs_rttupdated, "time", " we got rtt");
-	ANY(spxstat.spxs_delack, "delayed ack", " sent");
-	ANY(spxstat.spxs_timeoutdrop, "connection", " dropped in rxmt timeout");
-	ANY(spxstat.spxs_rexmttimeo, "retransmit timeout", "");
-	ANY(spxstat.spxs_persisttimeo, "persist timeout", "");
-	ANY(spxstat.spxs_keeptimeo, "keepalive timeout", "");
-	ANY(spxstat.spxs_keepprobe, "keepalive probe", " sent");
-	ANY(spxstat.spxs_keepdrops, "connection", " dropped in keepalive");
-	ANY(spxstat.spxs_sndtotal, "total packet", " sent");
-	ANY(spxstat.spxs_sndpack, "data packet", " sent");
-	ANY(spxstat.spxs_sndbyte, "data byte", " sent");
-	ANY(spxstat.spxs_sndrexmitpack, "data packet", " retransmitted");
-	ANY(spxstat.spxs_sndrexmitbyte, "data byte", " retransmitted");
-	ANY(spxstat.spxs_sndacks, "ack-only packet", " sent");
-	ANY(spxstat.spxs_sndprobe, "window probe", " sent");
-	ANY(spxstat.spxs_sndurg, "packet", " sent with URG only");
-	ANY(spxstat.spxs_sndwinup, "window update-only packet", " sent");
-	ANY(spxstat.spxs_sndctrl, "control (SYN|FIN|RST) packet", " sent");
-	ANY(spxstat.spxs_sndvoid, "request", " to send a non-existant packet");
-	ANY(spxstat.spxs_rcvtotal, "total packet", " received");
-	ANY(spxstat.spxs_rcvpack, "packet", " received in sequence");
-	ANY(spxstat.spxs_rcvbyte, "byte", " received in sequence");
-	ANY(spxstat.spxs_rcvbadsum, "packet", " received with ccksum errs");
-	ANY(spxstat.spxs_rcvbadoff, "packet", " received with bad offset");
-	ANY(spxstat.spxs_rcvshort, "packet", " received too short");
-	ANY(spxstat.spxs_rcvduppack, "duplicate-only packet", " received");
-	ANY(spxstat.spxs_rcvdupbyte, "duplicate-only byte", " received");
-	ANY(spxstat.spxs_rcvpartduppack, "packet", " with some duplicate data");
-	ANY(spxstat.spxs_rcvpartdupbyte, "dup. byte", " in part-dup. packet");
-	ANY(spxstat.spxs_rcvoopack, "out-of-order packet", " received");
-	ANY(spxstat.spxs_rcvoobyte, "out-of-order byte", " received");
-	ANY(spxstat.spxs_rcvpackafterwin, "packet", " with data after window");
-	ANY(spxstat.spxs_rcvbyteafterwin, "byte", " rcvd after window");
-	ANY(spxstat.spxs_rcvafterclose, "packet", " rcvd after 'close'");
-	ANY(spxstat.spxs_rcvwinprobe, "rcvd window probe packet", "");
-	ANY(spxstat.spxs_rcvdupack, "rcvd duplicate ack", "");
-	ANY(spxstat.spxs_rcvacktoomuch, "rcvd ack", " for unsent data");
-	ANY(spxstat.spxs_rcvackpack, "rcvd ack packet", "");
-	ANY(spxstat.spxs_rcvackbyte, "byte", " acked by rcvd acks");
-	ANY(spxstat.spxs_rcvwinupd, "rcvd window update packet", "");
+	ANYl(spxstat.spxs_connattempt, "connection", " initiated");
+	ANYl(spxstat.spxs_accepts, "connection", " accepted");
+	ANYl(spxstat.spxs_connects, "connection", " established");
+	ANYl(spxstat.spxs_drops, "connection", " dropped");
+	ANYl(spxstat.spxs_conndrops, "embryonic connection", " dropped");
+	ANYl(spxstat.spxs_closed, "connection", " closed (includes drops)");
+	ANYl(spxstat.spxs_segstimed, "packet", " where we tried to get rtt");
+	ANYl(spxstat.spxs_rttupdated, "time", " we got rtt");
+	ANYl(spxstat.spxs_delack, "delayed ack", " sent");
+	ANYl(spxstat.spxs_timeoutdrop, "connection",
+	    " dropped in rxmt timeout");
+	ANYl(spxstat.spxs_rexmttimeo, "retransmit timeout", "");
+	ANYl(spxstat.spxs_persisttimeo, "persist timeout", "");
+	ANYl(spxstat.spxs_keeptimeo, "keepalive timeout", "");
+	ANYl(spxstat.spxs_keepprobe, "keepalive probe", " sent");
+	ANYl(spxstat.spxs_keepdrops, "connection", " dropped in keepalive");
+	ANYl(spxstat.spxs_sndtotal, "total packet", " sent");
+	ANYl(spxstat.spxs_sndpack, "data packet", " sent");
+	ANYl(spxstat.spxs_sndbyte, "data byte", " sent");
+	ANYl(spxstat.spxs_sndrexmitpack, "data packet", " retransmitted");
+	ANYl(spxstat.spxs_sndrexmitbyte, "data byte", " retransmitted");
+	ANYl(spxstat.spxs_sndacks, "ack-only packet", " sent");
+	ANYl(spxstat.spxs_sndprobe, "window probe", " sent");
+	ANYl(spxstat.spxs_sndurg, "packet", " sent with URG only");
+	ANYl(spxstat.spxs_sndwinup, "window update-only packet", " sent");
+	ANYl(spxstat.spxs_sndctrl, "control (SYN|FIN|RST) packet", " sent");
+	ANYl(spxstat.spxs_sndvoid, "request", " to send a non-existant packet");
+	ANYl(spxstat.spxs_rcvtotal, "total packet", " received");
+	ANYl(spxstat.spxs_rcvpack, "packet", " received in sequence");
+	ANYl(spxstat.spxs_rcvbyte, "byte", " received in sequence");
+	ANYl(spxstat.spxs_rcvbadsum, "packet", " received with ccksum errs");
+	ANYl(spxstat.spxs_rcvbadoff, "packet", " received with bad offset");
+	ANYl(spxstat.spxs_rcvshort, "packet", " received too short");
+	ANYl(spxstat.spxs_rcvduppack, "duplicate-only packet", " received");
+	ANYl(spxstat.spxs_rcvdupbyte, "duplicate-only byte", " received");
+	ANYl(spxstat.spxs_rcvpartduppack, "packet",
+	    " with some duplicate data");
+	ANYl(spxstat.spxs_rcvpartdupbyte, "dup. byte", " in part-dup. packet");
+	ANYl(spxstat.spxs_rcvoopack, "out-of-order packet", " received");
+	ANYl(spxstat.spxs_rcvoobyte, "out-of-order byte", " received");
+	ANYl(spxstat.spxs_rcvpackafterwin, "packet", " with data after window");
+	ANYl(spxstat.spxs_rcvbyteafterwin, "byte", " rcvd after window");
+	ANYl(spxstat.spxs_rcvafterclose, "packet", " rcvd after 'close'");
+	ANYl(spxstat.spxs_rcvwinprobe, "rcvd window probe packet", "");
+	ANYl(spxstat.spxs_rcvdupack, "rcvd duplicate ack", "");
+	ANYl(spxstat.spxs_rcvacktoomuch, "rcvd ack", " for unsent data");
+	ANYl(spxstat.spxs_rcvackpack, "rcvd ack packet", "");
+	ANYl(spxstat.spxs_rcvackbyte, "byte", " acked by rcvd acks");
+	ANYl(spxstat.spxs_rcvwinupd, "rcvd window update packet", "");
 }
 
-#undef ANY
-#define ANY(x,y,z)  (printf("\t%u %s%s%s\n",x,y,plural(x),z))
-
 /*
  * Dump IPX statistics structure.
  */
@@ -247,17 +247,17 @@ ipx_stats(off, name)
 		return;
 	kread(off, (char *)&ipxstat, sizeof (ipxstat));
 	printf("%s:\n", name);
-	ANY(ipxstat.ipxs_total, "total packet", " received");
-	ANY(ipxstat.ipxs_badsum, "packet", " with bad checksums");
-	ANY(ipxstat.ipxs_tooshort, "packet", " smaller than advertised");
-	ANY(ipxstat.ipxs_toosmall, "packet", " smaller than a header");
-	ANY(ipxstat.ipxs_forward, "packet", " forwarded");
-	ANY(ipxstat.ipxs_cantforward, "packet", " not forwardable");
-	ANY(ipxstat.ipxs_delivered, "packet", " for this host");
-	ANY(ipxstat.ipxs_localout, "packet", " sent from this host");
-	ANY(ipxstat.ipxs_odropped, "packet", " dropped due to no bufs, etc.");
-	ANY(ipxstat.ipxs_noroute, "packet", " discarded due to no route");
-	ANY(ipxstat.ipxs_mtutoosmall, "packet", " too big");
+	ANYl(ipxstat.ipxs_total, "total packet", " received");
+	ANYl(ipxstat.ipxs_badsum, "packet", " with bad checksums");
+	ANYl(ipxstat.ipxs_tooshort, "packet", " smaller than advertised");
+	ANYl(ipxstat.ipxs_toosmall, "packet", " smaller than a header");
+	ANYl(ipxstat.ipxs_forward, "packet", " forwarded");
+	ANYl(ipxstat.ipxs_cantforward, "packet", " not forwardable");
+	ANYl(ipxstat.ipxs_delivered, "packet", " for this host");
+	ANYl(ipxstat.ipxs_localout, "packet", " sent from this host");
+	ANYl(ipxstat.ipxs_odropped, "packet", " dropped due to no bufs, etc.");
+	ANYl(ipxstat.ipxs_noroute, "packet", " discarded due to no route");
+	ANYl(ipxstat.ipxs_mtutoosmall, "packet", " too big");
 }
 
 static	struct {
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 1e6d860..5ea7423 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mbuf.c,v 1.10 1998/04/24 04:30:27 dg Exp $";
+	"$Id: mbuf.c,v 1.11 1998/05/15 20:19:18 wollman Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -130,7 +130,7 @@ mbpr()
 	totmbufs = 0;
 	for (mp = mbtypes; mp->mt_name; mp++)
 		totmbufs += mbstat.m_mtypes[mp->mt_type];
-	printf("%u/%u mbufs in use:\n", totmbufs, mbstat.m_mbufs);
+	printf("%u/%lu mbufs in use:\n", totmbufs, mbstat.m_mbufs);
 	for (mp = mbtypes; mp->mt_name; mp++)
 		if (mbstat.m_mtypes[mp->mt_type]) {
 			seen[mp->mt_type] = YES;
@@ -143,8 +143,9 @@ mbpr()
 			printf("\t%u mbufs allocated to <mbuf type %d>\n",
 			    mbstat.m_mtypes[i], i);
 		}
-	printf("%lu/%lu/%lu mbuf clusters in use (current/peak/max)\n",
-		mbstat.m_clusters - mbstat.m_clfree, mbstat.m_clusters, nmbclusters);
+	printf("%lu/%lu/%u mbuf clusters in use (current/peak/max)\n",
+		mbstat.m_clusters - mbstat.m_clfree, mbstat.m_clusters,
+		nmbclusters);
 	totmem = mbstat.m_mbufs * MSIZE + mbstat.m_clusters * MCLBYTES;
 	totfree = mbstat.m_clfree * MCLBYTES + 
 		MSIZE * (mbstat.m_mbufs - totmbufs);
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 136a1b6..5f11ba9 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unix.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unix.c,v 1.7 1998/05/16 08:31:49 ache Exp $";
+	"$Id: unix.c,v 1.8 1998/05/16 18:04:00 wollman Exp $";
 #endif /* not lint */
 
 /*
@@ -154,7 +154,7 @@ unixdomainpr(xunp, so)
 	       (long)unp->unp_refs.lh_first, (long)unp->unp_reflink.le_next);
 	if (sa)
 		printf(" %.*s",
-		    sa->sun_len - offsetof(struct sockaddr_un, sun_path),
+		    (int)(sa->sun_len - offsetof(struct sockaddr_un, sun_path)),
 		    sa->sun_path);
 	putchar('\n');
 }