From owner-svn-src-all@freebsd.org  Wed Nov  4 15:05:17 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45AEBA26635;
 Wed,  4 Nov 2015 15:05:17 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 10987104A;
 Wed,  4 Nov 2015 15:05:16 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA4F5G7M051553;
 Wed, 4 Nov 2015 15:05:16 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA4F5GGH051552;
 Wed, 4 Nov 2015 15:05:16 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201511041505.tA4F5GGH051552@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Wed, 4 Nov 2015 15:05:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290368 - head/usr.bin/netstat
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Nov 2015 15:05:17 -0000

Author: ume
Date: Wed Nov  4 15:05:15 2015
New Revision: 290368
URL: https://svnweb.freebsd.org/changeset/base/290368

Log:
  Unify AF_INET case and AF_INET6 case.

Modified:
  head/usr.bin/netstat/if.c

Modified: head/usr.bin/netstat/if.c
==============================================================================
--- head/usr.bin/netstat/if.c	Wed Nov  4 14:57:46 2015	(r290367)
+++ head/usr.bin/netstat/if.c	Wed Nov  4 15:05:15 2015	(r290368)
@@ -366,22 +366,9 @@ intpr(void (*pfunc)(char *), int af)
 			xo_emit("{:address/%-15.15s} ", "none");
 			break;
 		case AF_INET:
-			if (Wflag) {
-				xo_emit("{t:network/%-13s} ",
-				    netname(ifa->ifa_addr, ifa->ifa_netmask));
-				xo_emit("{t:address/%-17s} ",
-				    routename(ifa->ifa_addr, numeric_addr));
-			} else {
-				xo_emit("{t:network/%-13.13s} ",
-				    netname(ifa->ifa_addr, ifa->ifa_netmask));
-				xo_emit("{t:address/%-17.17s} ",
-				    routename(ifa->ifa_addr, numeric_addr));
-			}
-
-			network = true;
-			break;
 #ifdef INET6
 		case AF_INET6:
+#endif /* INET6 */
 			if (Wflag) {
 				xo_emit("{t:network/%-13s} ",
 				    netname(ifa->ifa_addr, ifa->ifa_netmask));
@@ -396,7 +383,6 @@ intpr(void (*pfunc)(char *), int af)
 
 			network = true;
 			break;
-#endif /* INET6 */
 		case AF_LINK:
 		    {
 			struct sockaddr_dl *sdl;