Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Nov 2015 15:05:16 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r290368 - head/usr.bin/netstat
Message-ID:  <201511041505.tA4F5GGH051552@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511041505.tA4F5GGH051552>