From patchwork Tue Jul 10 21:05:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 942201 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=none (p=none dis=none) header.from=networkplumber.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="d6IZGso4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41QFKG4vqPz9s0W for ; Wed, 11 Jul 2018 07:12:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732463AbeGJVNl (ORCPT ); Tue, 10 Jul 2018 17:13:41 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:46694 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732272AbeGJVNl (ORCPT ); Tue, 10 Jul 2018 17:13:41 -0400 Received: by mail-pf0-f193.google.com with SMTP id l123-v6so16906060pfl.13 for ; Tue, 10 Jul 2018 14:12:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EL4SngQhmbaCd7oEXBKWX2E42Tb8d0i+HRdNzOaS3k0=; b=d6IZGso4bg6hwXtkwr4kWXfUlwLGBGwMOk20g+LDX25AWPKoIhMzT8Ooro6c4gkIaD ukBLVpitt7w8RQrCXkrfbFzHvgZY/SgKp1u43wTOtAm2sWnx3hXcUlsKTXwjlQwQpQyN 7EwRV5oumuB+ejXQjX9wcnLKskl3ahEVY9uH7YhrBnOg3hdo6kqXspZyoSwESTG3NeMs 9RWRC6HyOMoMQhBoYYMF3H4eFNh3aPY4iEBZ9E4F4RwhHyNMBzgx/pjf45FeVotu8KcD yVjjH1dc00imYsMYEW4dTVf1A83oWYysyM61REDVeadvpPmZZks3GVkwNbxNggzdvMQy xhSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EL4SngQhmbaCd7oEXBKWX2E42Tb8d0i+HRdNzOaS3k0=; b=Q2glycIq8mG3bDmj8pygm0FaoqxX3amty3oZ8jlf1v/c6zW7k7So6fGGBBu7GDMuiz rESV2O/zm7o/n36j2TWgRtuuLi+UWdH3xvRnAzEm4wYn/IZm0OwXsdZ7Gy54I9YfTd1G y7P3wC50gpjaq2pkp4EtVGZ4hUs6G8XrdDI3C3lEHsRAhymu4JXkxDJI++1Tg6uehd0P BFsi5UrnRznaaR1pE3ARTEVWviwaOL+3S/gHKNrAeXPymuNB8JUbwz5ZlL7NGnoJ5SzF 1hLQH+mSTuuG1jrP90yXjeUckJMELoE1tyTjWTZzCCcYt7DPCTxNyYzcCbeThDc1J1Ed 9X2g== X-Gm-Message-State: APt69E245KRvnOlasFIZkpABGNtYQ6+mbOkn+gaG0wHL76czAHGNfft6 auav/ZllTgSwMCrPQ8Ls/HUbJ10vwgo= X-Google-Smtp-Source: AAOMgpc4VKaTTuvg70XMQZU+6hdYLBD3RXwpdvx8rxQJZV6E59vrs3Fqd4FYqm/l5n6TMqS+7C+wDA== X-Received: by 2002:a63:5c10:: with SMTP id q16-v6mr24054820pgb.452.1531256772794; Tue, 10 Jul 2018 14:06:12 -0700 (PDT) Received: from xeon-e3.wavecable.com (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id e82-v6sm42996409pfd.40.2018.07.10.14.06.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 14:06:11 -0700 (PDT) From: Stephen Hemminger To: netdev@vger.kernel.org Cc: Stephen Hemminger , Stephen Hemminger Subject: [PATCH v2 iproute2-next 07/31] tc/red: use new JSON helpers Date: Tue, 10 Jul 2018 14:05:34 -0700 Message-Id: <20180710210558.20278-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180710210558.20278-1-stephen@networkplumber.org> References: <20180710210558.20278-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Stephen Hemminger Now have simplier way to print size. Signed-off-by: Stephen Hemminger --- tc/q_red.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tc/q_red.c b/tc/q_red.c index 49fd4ac80513..9e4124befdb7 100644 --- a/tc/q_red.c +++ b/tc/q_red.c @@ -163,10 +163,6 @@ static int red_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) struct tc_red_qopt *qopt; __u32 max_P = 0; - SPRINT_BUF(b1); - SPRINT_BUF(b2); - SPRINT_BUF(b3); - if (opt == NULL) return 0; @@ -182,12 +178,9 @@ static int red_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) RTA_PAYLOAD(tb[TCA_RED_MAX_P]) >= sizeof(__u32)) max_P = rta_getattr_u32(tb[TCA_RED_MAX_P]); - print_uint(PRINT_JSON, "limit", NULL, qopt->limit); - print_string(PRINT_FP, NULL, "limit %s ", sprint_size(qopt->limit, b1)); - print_uint(PRINT_JSON, "min", NULL, qopt->qth_min); - print_string(PRINT_FP, NULL, "min %s ", sprint_size(qopt->qth_min, b2)); - print_uint(PRINT_JSON, "max", NULL, qopt->qth_max); - print_string(PRINT_FP, NULL, "max %s ", sprint_size(qopt->qth_max, b3)); + print_size("limit", "limit %s ", qopt->limit); + print_size("min", "min %s ", qopt->qth_min); + print_size("max", "max %s ", qopt->qth_max); if (qopt->flags & TC_RED_ECN) print_bool(PRINT_ANY, "ecn", "ecn ", true);