From bc211d112db9f0985b69000be7da3969da8a7602 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Mon, 24 Jan 2011 10:58:36 +0000 Subject: [PATCH] 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 --- usr.bin/netstat/netisr.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.bin/netstat/netisr.c b/usr.bin/netstat/netisr.c index 58f2902c9b3..25f341cc5dd 100644 --- a/usr.bin/netstat/netisr.c +++ b/usr.bin/netstat/netisr.c @@ -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);