CVS commit: [matt-nb5-mips64] src/sbin/route

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Tue May 11 21:02:43 UTC 2010

Modified Files:
        src/sbin/route [matt-nb5-mips64]: route.c

Log Message:
Fixup for u_quad_t change for route interface.


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.118.6.1 src/sbin/route/route.c

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


Modified files:

Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.118 src/sbin/route/route.c:1.118.6.1
--- src/sbin/route/route.c:1.118	Wed Sep 10 01:56:22 2008
+++ src/sbin/route/route.c	Tue May 11 21:02:43 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.118 2008/09/10 01:56:22 dyoung Exp $	*/
+/*	$NetBSD: route.c,v 1.118.6.1 2010/05/11 21:02:43 matt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)route.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: route.c,v 1.118 2008/09/10 01:56:22 dyoung Exp $");
+__RCSID("$NetBSD: route.c,v 1.118.6.1 2010/05/11 21:02:43 matt Exp $");
 #endif
 #endif /* not lint */
 
@@ -744,7 +744,7 @@
 set_metric(const char *value, int key)
 {
 	int flag = 0;
-	u_long noval, *valp = &noval;
+	u_quad_t noval, *valp = &noval;
 
 	switch (key) {
 #define caseof(x, y, z)	case x: valp = &rt_metrics.z; flag = y; break
@@ -1422,7 +1422,7 @@
 
 #define NEXTADDR(w, u) \
 	if (rtm_addrs & (w)) {\
-	    l = ROUNDUP(u.sa.sa_len); memmove(cp, &(u), l); cp += l;\
+	    l = RT_ROUNDUP(u.sa.sa_len); memmove(cp, &(u), l); cp += l;\
 	    if (verbose && ! shortoutput) sodump(&(u),#u);\
 	}
 
@@ -1539,7 +1539,7 @@
 #endif /* SMALL */
 }
 
-const char *msgtypes[] = {
+const char * const msgtypes[] = {
 	"",
 	"RTM_ADD: Add Route",
 	"RTM_DELETE: Delete Route",
@@ -1823,16 +1823,16 @@
 	if (! shortoutput) {
 		(void)printf("\n%s\n", "\
  recvpipe  sendpipe  ssthresh  rtt,msec    rttvar  hopcount      mtu     expire");
-		printf("%8ld%c ", rtm->rtm_rmx.rmx_recvpipe, lock(RPIPE));
-		printf("%8ld%c ", rtm->rtm_rmx.rmx_sendpipe, lock(SPIPE));
-		printf("%8ld%c ", rtm->rtm_rmx.rmx_ssthresh, lock(SSTHRESH));
-		printf("%8ld%c ", msec(rtm->rtm_rmx.rmx_rtt), lock(RTT));
-		printf("%8ld%c ", msec(rtm->rtm_rmx.rmx_rttvar), lock(RTTVAR));
-		printf("%8ld%c ", rtm->rtm_rmx.rmx_hopcount, lock(HOPCOUNT));
-		printf("%8ld%c ", rtm->rtm_rmx.rmx_mtu, lock(MTU));
+		printf("%8qd%c ", rtm->rtm_rmx.rmx_recvpipe, lock(RPIPE));
+		printf("%8qd%c ", rtm->rtm_rmx.rmx_sendpipe, lock(SPIPE));
+		printf("%8qd%c ", rtm->rtm_rmx.rmx_ssthresh, lock(SSTHRESH));
+		printf("%8qd%c ", msec(rtm->rtm_rmx.rmx_rtt), lock(RTT));
+		printf("%8qd%c ", msec(rtm->rtm_rmx.rmx_rttvar), lock(RTTVAR));
+		printf("%8qd%c ", rtm->rtm_rmx.rmx_hopcount, lock(HOPCOUNT));
+		printf("%8qd%c ", rtm->rtm_rmx.rmx_mtu, lock(MTU));
 		if (rtm->rtm_rmx.rmx_expire)
 			rtm->rtm_rmx.rmx_expire -= time(0);
-		printf("%8ld%c\n", rtm->rtm_rmx.rmx_expire, lock(EXPIRE));
+		printf("%8qd%c\n", rtm->rtm_rmx.rmx_expire, lock(EXPIRE));
 	}
 #undef lock
 #undef msec