From owner-svn-src-all@FreeBSD.ORG  Sun Oct 18 15:58:57 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A7CF8106566C;
	Sun, 18 Oct 2009 15:58:57 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9749A8FC16;
	Sun, 18 Oct 2009 15:58:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9IFwvDq073108;
	Sun, 18 Oct 2009 15:58:57 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9IFwvk5073106;
	Sun, 18 Oct 2009 15:58:57 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200910181558.n9IFwvk5073106@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 18 Oct 2009 15:58:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198209 - stable/8/usr.bin/netstat
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Oct 2009 15:58:57 -0000

Author: rwatson
Date: Sun Oct 18 15:58:57 2009
New Revision: 198209
URL: http://svn.freebsd.org/changeset/base/198209

Log:
  Merge r198118 from head to stable/8:
  
    Print routing statistics as unsigned short rather than unsigned int,
    otherwise sign extension leads to unlikely values when in the negative
    range of the signed short structure fields that hold the statistics.
    The type used to hold routing statistics is arguably also incorrect.
  
  Approved by:	re (bz)

Modified:
  stable/8/usr.bin/netstat/   (props changed)
  stable/8/usr.bin/netstat/route.c

Modified: stable/8/usr.bin/netstat/route.c
==============================================================================
--- stable/8/usr.bin/netstat/route.c	Sun Oct 18 15:21:48 2009	(r198208)
+++ stable/8/usr.bin/netstat/route.c	Sun Oct 18 15:58:57 2009	(r198209)
@@ -1008,11 +1008,11 @@ rt_stats(u_long rtsaddr, u_long rttaddr)
 #define	p(f, m) if (rtstat.f || sflag <= 1) \
 	printf(m, rtstat.f, plural(rtstat.f))
 
-	p(rts_badredirect, "\t%u bad routing redirect%s\n");
-	p(rts_dynamic, "\t%u dynamically created route%s\n");
-	p(rts_newgateway, "\t%u new gateway%s due to redirects\n");
-	p(rts_unreach, "\t%u destination%s found unreachable\n");
-	p(rts_wildcard, "\t%u use%s of a wildcard route\n");
+	p(rts_badredirect, "\t%hu bad routing redirect%s\n");
+	p(rts_dynamic, "\t%hu dynamically created route%s\n");
+	p(rts_newgateway, "\t%hu new gateway%s due to redirects\n");
+	p(rts_unreach, "\t%hu destination%s found unreachable\n");
+	p(rts_wildcard, "\t%hu use%s of a wildcard route\n");
 #undef p
 
 	if (rttrash || sflag <= 1)