From mboxrd@z Thu Jan 1 00:00:00 1970 From: Phil Sutter Subject: [iproute PATCH v2 14/18] ss: Get rid of single-fielded struct snmpstat Date: Fri, 2 Dec 2016 11:39:58 +0100 Message-ID: <20161202104002.17310-15-phil@nwl.cc> References: <20161202104002.17310-1-phil@nwl.cc> Cc: netdev@vger.kernel.org To: Stephen Hemminger Return-path: Received: from orbyte.nwl.cc ([151.80.46.58]:44812 "EHLO mail.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934360AbcLBKmI (ORCPT ); Fri, 2 Dec 2016 05:42:08 -0500 In-Reply-To: <20161202104002.17310-1-phil@nwl.cc> Sender: netdev-owner@vger.kernel.org List-ID: A struct with only a single field does not make much sense. Besides that, it was used by print_summary() only. Signed-off-by: Phil Sutter --- misc/ss.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index ec71c21ce6a4a..c7818eadf9e75 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -3661,10 +3661,6 @@ static int handle_follow_request(struct filter *f) return ret; } -struct snmpstat { - int tcp_estab; -}; - static int get_snmp_int(char *proto, char *key, int *result) { char buf[1024]; @@ -3785,11 +3781,11 @@ static int get_sockstat(struct ssummary *s) static int print_summary(void) { struct ssummary s; - struct snmpstat sn; + int tcp_estab; if (get_sockstat(&s) < 0) perror("ss: get_sockstat"); - if (get_snmp_int("Tcp:", "CurrEstab", &sn.tcp_estab) < 0) + if (get_snmp_int("Tcp:", "CurrEstab", &tcp_estab) < 0) perror("ss: get_snmpstat"); get_slabstat(&slabstat); @@ -3798,7 +3794,7 @@ static int print_summary(void) printf("TCP: %d (estab %d, closed %d, orphaned %d, synrecv %d, timewait %d/%d), ports %d\n", s.tcp_total + slabstat.tcp_syns + s.tcp_tws, - sn.tcp_estab, + tcp_estab, s.tcp_total - (s.tcp4_hashed+s.tcp6_hashed-s.tcp_tws), s.tcp_orphans, slabstat.tcp_syns, -- 2.10.0