From mboxrd@z Thu Jan 1 00:00:00 1970 From: Serhey Popovych Subject: [RFC][PATCH iproute2-next 1/6] ipaddress: Unify print_link_stats() and print_link_stats64() Date: Thu, 1 Feb 2018 21:40:53 +0200 Message-ID: <1517514058-23596-2-git-send-email-serhe.popovych@gmail.com> References: <1517514058-23596-1-git-send-email-serhe.popovych@gmail.com> To: netdev@vger.kernel.org Return-path: Received: from mail-lf0-f66.google.com ([209.85.215.66]:34186 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754595AbeBATlV (ORCPT ); Thu, 1 Feb 2018 14:41:21 -0500 Received: by mail-lf0-f66.google.com with SMTP id k19so28029119lfj.1 for ; Thu, 01 Feb 2018 11:41:20 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id v197sm57571lfa.25.2018.02.01.11.41.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2018 11:41:18 -0800 (PST) In-Reply-To: <1517514058-23596-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: To show real differences between these two variants adjust whitespace intendation and use print_uint() instead of print_int() as all members in both @struct rtnl_link_stats and @struct rtnl_link_stats64 are unsigned. Signed-off-by: Serhey Popovych --- ip/ipaddress.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/ip/ipaddress.c b/ip/ipaddress.c index b18b6f4..ae419f0 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -610,8 +610,7 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s, print_uint(PRINT_JSON, "multicast", NULL, s->multicast); if (s->rx_compressed) print_uint(PRINT_JSON, - "compressed", - NULL, s->rx_compressed); + "compressed", NULL, s->rx_compressed); /* RX error stats */ if (show_stats > 1) { @@ -648,8 +647,7 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s, print_uint(PRINT_JSON, "collisions", NULL, s->collisions); if (s->tx_compressed) print_uint(PRINT_JSON, - "compressed", - NULL, s->tx_compressed); + "compressed", NULL, s->tx_compressed); /* TX error stats */ if (show_stats > 1) { @@ -669,9 +667,9 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s, print_uint(PRINT_JSON, "carrier_changes", NULL, rta_getattr_u32(carrier_changes)); } + close_json_object(); close_json_object(); - } else { /* RX stats */ fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s", @@ -692,7 +690,6 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s, fprintf(fp, "%s", _SL_); fprintf(fp, " RX errors: length crc frame fifo missed%s%s", s->rx_nohandler ? " nohandler" : "", _SL_); - fprintf(fp, " "); print_num(fp, 8, s->rx_length_errors); print_num(fp, 7, s->rx_crc_errors); @@ -701,7 +698,6 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s, print_num(fp, 7, s->rx_missed_errors); if (s->rx_nohandler) print_num(fp, 7, s->rx_nohandler); - } fprintf(fp, "%s", _SL_); @@ -754,9 +750,8 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s, print_uint(PRINT_JSON, "over_errors", NULL, s->rx_over_errors); print_uint(PRINT_JSON, "multicast", NULL, s->multicast); if (s->rx_compressed) - print_int(PRINT_JSON, - "compressed", - NULL, s->rx_compressed); + print_uint(PRINT_JSON, + "compressed", NULL, s->rx_compressed); /* RX error stats */ if (show_stats > 1) { @@ -776,9 +771,8 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s, "missed_errors", NULL, s->rx_missed_errors); if (s->rx_nohandler) - print_int(PRINT_JSON, - "nohandler", - NULL, s->rx_nohandler); + print_uint(PRINT_JSON, + "nohandler", NULL, s->rx_nohandler); } close_json_object(); @@ -793,9 +787,8 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s, NULL, s->tx_carrier_errors); print_uint(PRINT_JSON, "collisions", NULL, s->collisions); if (s->tx_compressed) - print_int(PRINT_JSON, - "compressed", - NULL, s->tx_compressed); + print_uint(PRINT_JSON, + "compressed", NULL, s->tx_compressed); /* TX error stats */ if (show_stats > 1) { @@ -812,9 +805,7 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s, "heartbeat_errors", NULL, s->tx_heartbeat_errors); if (carrier_changes) - print_uint(PRINT_JSON, - "carrier_changes", - NULL, + print_uint(PRINT_JSON, "carrier_changes", NULL, rta_getattr_u32(carrier_changes)); } @@ -825,7 +816,6 @@ static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s, fprintf(fp, " RX: bytes packets errors dropped overrun mcast %s%s", s->rx_compressed ? "compressed" : "", _SL_); - fprintf(fp, " "); print_num(fp, 10, s->rx_bytes); print_num(fp, 8, s->rx_packets); -- 1.7.10.4