From patchwork Fri Feb 2 13:10:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 868570 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iX5b3E6Q"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zXy7308hvz9sQm for ; Sat, 3 Feb 2018 00:11:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751856AbeBBNLh (ORCPT ); Fri, 2 Feb 2018 08:11:37 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:41316 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729AbeBBNLK (ORCPT ); Fri, 2 Feb 2018 08:11:10 -0500 Received: by mail-lf0-f66.google.com with SMTP id f136so31385652lff.8 for ; Fri, 02 Feb 2018 05:11:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=/fPSu7O4kXTx095oJ6ouSAmBjaYikb6Dq8r16SqEQS0=; b=iX5b3E6Q0Calmba0GUFVSzG9KgnmZeQQ7iNCu/TvVrI7X2CHr30vdWYDaahTvfPC82 ldmEoSRs28A2DRDpl/QJ1sAXNsrBCzGsaqA3WIAZHg56OS6F/25pzgzdQIGdD4upBzpm JIS6QNpHuUduIzC+HXdOM/rIuRmaRzrUBXiOeV0ah54BAWggVEqJdekfFFn9S4FcqN/l lCrpu/oSUYjn+58H3khTgNkJR7D2TJkpXYDSlcBtd0vQ3Eh4LmZDZSq4FrS+guxpXNOK G7BqtJhlzaHZXf5C+rtgKy5Fn7hrRKe/HF+6S2WHUrqpvEEgVssd55530doCjRXiyAGJ y8rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/fPSu7O4kXTx095oJ6ouSAmBjaYikb6Dq8r16SqEQS0=; b=EqFnjuANbVLSmL4SkDxPSCzImR3VXq9mR3/q/VR0a3lMrWyTFUjid+W/6VKtusDYXy whrcLDAh8FuQe8xxVE3ZuHgIOOqs1xdxOCICa4kU1L5y4JdFTRXZ1HystWteuPYF3WCF PutgAcJKj9obb6qH5S8pEUOIcnIPF9MeYLFIX+X9lW/eGSoJNcKLNhJP+ihcpQWD0Ws/ JY/Z/ODs6PwTpYerqSC51yY2539YVkPf5VIk7HWDnOxhFHvIZXPsBeeOoVCdDxR1kNU/ j3zWpEktvLFE/iNkGpdPacLh0RlnF9mcoDJdkadk5il3nRD3ohH5si1jTbjCxy3iUBRh Cmqw== X-Gm-Message-State: APf1xPBkh0oXdONi18nqWgGZSygMhJCXJ6dKCA39J4z1qVyTot2d/3Ft g8hcYQVkPSmyKhKPhzX7m5N0/Q== X-Google-Smtp-Source: AH8x226kcFxirbuiOJ6iDcs4caCIewd241hK/slDUoaKd9X4pyjzAEd1DEHb6acl7wHC47uY1NoorA== X-Received: by 10.25.72.203 with SMTP id v194mr3972933lfa.26.1517577067933; Fri, 02 Feb 2018 05:11:07 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id o188sm379121lff.5.2018.02.02.05.11.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Feb 2018 05:11:06 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2-next 1/6] ipaddress: Unify print_link_stats() and print_link_stats64() Date: Fri, 2 Feb 2018 15:10:50 +0200 Message-Id: <1517577055-23788-2-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1517577055-23788-1-git-send-email-serhe.popovych@gmail.com> References: <1517577055-23788-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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);