From owner-svn-src-all@FreeBSD.ORG  Mon Jan 24 10:58:36 2011
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 CB2A21065670;
	Mon, 24 Jan 2011 10:58:36 +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 BA96D8FC0C;
	Mon, 24 Jan 2011 10:58:36 +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 p0OAwawY088496;
	Mon, 24 Jan 2011 10:58:36 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OAwa4A088494;
	Mon, 24 Jan 2011 10:58:36 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201101241058.p0OAwa4A088494@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 24 Jan 2011 10:58:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217776 - head/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: Mon, 24 Jan 2011 10:58:36 -0000

Author: rwatson
Date: Mon Jan 24 10:58:36 2011
New Revision: 217776
URL: http://svn.freebsd.org/changeset/base/217776

Log:
  While printing out the WSID and CPU ID only the first time it appears for
  each workstream, rather than on every protocol, is prettier, it makes
  machine-parsing of netstat -Q output a lot harder.  Repeat the information
  and hope that the user forgives us slightly dense formatting.
  
  MFC after:	3 days
  Reported by:	bz
  Sponsored by:	Juniper Networks

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

Modified: head/usr.bin/netstat/netisr.c
==============================================================================
--- head/usr.bin/netstat/netisr.c	Mon Jan 24 10:54:09 2011	(r217775)
+++ head/usr.bin/netstat/netisr.c	Mon Jan 24 10:58:36 2011	(r217776)
@@ -436,20 +436,14 @@ static void
 netisr_print_workstream(struct sysctl_netisr_workstream *snwsp)
 {
 	struct sysctl_netisr_work *snwp;
-	int first;
 	u_int i;
 
-	first = 1;
 	for (i = 0; i < work_array_len; i++) {
 		snwp = &work_array[i];
 		if (snwp->snw_wsid != snwsp->snws_wsid)
 			continue;
-		if (first) {
-			printf("%4u ", snwsp->snws_wsid);
-			printf("%3u ", snwsp->snws_cpu);
-			first = 0;
-		} else
-			printf("%4s %3s ", "", "");
+		printf("%4u ", snwsp->snws_wsid);
+		printf("%3u ", snwsp->snws_cpu);
 		printf("%2s", "");
 		printf("%-6s", netisr_proto2name(snwp->snw_proto));
 		printf(" %5u", snwp->snw_len);