CVS commit: [matt-nb5-mips64] src/usr.bin/netstat

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Tue May 11 21:03:20 UTC 2010

Modified Files:
        src/usr.bin/netstat [matt-nb5-mips64]: route.c show.c

Log Message:
Fixup for u_quad_t route changes.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.71.10.1 src/usr.bin/netstat/route.c
cvs rdiff -u -r1.6 -r1.6.24.1 src/usr.bin/netstat/show.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/netstat/route.c
diff -u src/usr.bin/netstat/route.c:1.71 src/usr.bin/netstat/route.c:1.71.10.1
--- src/usr.bin/netstat/route.c:1.71	Wed Apr 23 15:35:37 2008
+++ src/usr.bin/netstat/route.c	Tue May 11 21:03:20 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.71 2008/04/23 15:35:37 thorpej Exp $	*/
+/*	$NetBSD: route.c,v 1.71.10.1 2010/05/11 21:03:20 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-__RCSID("$NetBSD: route.c,v 1.71 2008/04/23 15:35:37 thorpej Exp $");
+__RCSID("$NetBSD: route.c,v 1.71.10.1 2010/05/11 21:03:20 matt Exp $");
 #endif
 #endif /* not lint */
 
@@ -272,7 +272,7 @@
 	p_flags(rt->rt_flags, "%-6.6s ");
 	printf("%6d %8lu ", rt->rt_refcnt, rt->rt_use);
 	if (rt->rt_rmx.rmx_mtu)
-		printf("%6lu", rt->rt_rmx.rmx_mtu); 
+		printf("%6"PRIu64, rt->rt_rmx.rmx_mtu); 
 	else
 		printf("%6s", "-");
 	putchar((rt->rt_rmx.rmx_locks & RTV_MTU) ? 'L' : ' ');
@@ -286,23 +286,23 @@
 	}
 	putchar('\n');
  	if (vflag) {
- 		printf("\texpire   %10lu%c  recvpipe %10ld%c  "
-		       "sendpipe %10ld%c\n",
+ 		printf("\texpire   %10"PRIu64"%c  recvpipe %10"PRId64"%c  "
+		       "sendpipe %10"PRId64"%c\n",
  			rt->rt_rmx.rmx_expire, 
  			(rt->rt_rmx.rmx_locks & RTV_EXPIRE) ? 'L' : ' ',
  			rt->rt_rmx.rmx_recvpipe,
  			(rt->rt_rmx.rmx_locks & RTV_RPIPE) ? 'L' : ' ',
  			rt->rt_rmx.rmx_sendpipe,
  			(rt->rt_rmx.rmx_locks & RTV_SPIPE) ? 'L' : ' ');
- 		printf("\tssthresh %10lu%c  rtt      %10ld%c  "
-		       "rttvar   %10ld%c\n",
+ 		printf("\tssthresh %10"PRIu64"%c  rtt      %10"PRId64"%c  "
+		       "rttvar   %10"PRId64"%c\n",
  			rt->rt_rmx.rmx_ssthresh, 
  			(rt->rt_rmx.rmx_locks & RTV_SSTHRESH) ? 'L' : ' ',
  			rt->rt_rmx.rmx_rtt, 
  			(rt->rt_rmx.rmx_locks & RTV_RTT) ? 'L' : ' ',
  			rt->rt_rmx.rmx_rttvar, 
 			(rt->rt_rmx.rmx_locks & RTV_RTTVAR) ? 'L' : ' ');
- 		printf("\thopcount %10lu%c\n",
+ 		printf("\thopcount %10"PRIu64"%c\n",
  			rt->rt_rmx.rmx_hopcount, 
 			(rt->rt_rmx.rmx_locks & RTV_HOPCOUNT) ? 'L' : ' ');
  	}

Index: src/usr.bin/netstat/show.c
diff -u src/usr.bin/netstat/show.c:1.6 src/usr.bin/netstat/show.c:1.6.24.1
--- src/usr.bin/netstat/show.c:1.6	Sat Dec 23 11:05:14 2006
+++ src/usr.bin/netstat/show.c	Tue May 11 21:03:20 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: show.c,v 1.6 2006/12/23 11:05:14 jdc Exp $	*/
+/*	$NetBSD: show.c,v 1.6.24.1 2010/05/11 21:03:20 matt Exp $	*/
 /*	$OpenBSD: show.c,v 1.1 2006/05/27 19:16:37 claudio Exp $	*/
 
 /*
@@ -254,13 +254,13 @@
 	    WID_GW(sa->sa_family));
 	p_flags(rtm->rtm_flags, "%-6.6s ");
 #ifdef notyet /* XXX: elad */
-	printf("%6d %8ld ", (int)rtm->rtm_rmx.rmx_refcnt,
+	printf("%6d %8"PRId64" ", (int)rtm->rtm_rmx.rmx_refcnt,
 	    rtm->rtm_rmx.rmx_pksent);
 #else
 	printf("%6s %8s ", "-", "-");
 #endif
 	if (rtm->rtm_rmx.rmx_mtu)
-		printf("%6ld", rtm->rtm_rmx.rmx_mtu);
+		printf("%6"PRId64, rtm->rtm_rmx.rmx_mtu);
 	else
 		printf("%6s", "-");
 	putchar((rtm->rtm_rmx.rmx_locks & RTV_MTU) ? 'L' : ' ');