From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Kicinski Subject: [PATCH iproute2-next] tc: jsonify output of q_fifo Date: Thu, 4 Oct 2018 17:08:34 -0700 Message-ID: <20181005000834.24364-1-jakub.kicinski@netronome.com> Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski To: dsahern@gmail.com Return-path: Received: from mail-qk1-f195.google.com ([209.85.222.195]:33233 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727215AbeJEHEo (ORCPT ); Fri, 5 Oct 2018 03:04:44 -0400 Received: by mail-qk1-f195.google.com with SMTP id 84-v6so6936878qkf.0 for ; Thu, 04 Oct 2018 17:08:46 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Print limits correctly in JSON context. Signed-off-by: Jakub Kicinski --- tc/q_fifo.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tc/q_fifo.c b/tc/q_fifo.c index cb86a404d4de..61493fbbc5bc 100644 --- a/tc/q_fifo.c +++ b/tc/q_fifo.c @@ -69,9 +69,12 @@ static int fifo_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) qopt = RTA_DATA(opt); if (strcmp(qu->id, "bfifo") == 0) { SPRINT_BUF(b1); - fprintf(f, "limit %s", sprint_size(qopt->limit, b1)); - } else - fprintf(f, "limit %up", qopt->limit); + print_uint(PRINT_JSON, "limit", NULL, qopt->limit); + print_string(PRINT_FP, NULL, "limit %s", + sprint_size(qopt->limit, b1)); + } else { + print_uint(PRINT_ANY, "limit", "limit %up", qopt->limit); + } return 0; } -- 2.17.1