From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: [PATCH iproute2 2/3] bridge: use print_json for some outputs Date: Thu, 6 Sep 2018 16:30:56 +0100 Message-ID: <20180906153057.5379-2-stephen@networkplumber.org> References: <20180906153057.5379-1-stephen@networkplumber.org> Cc: Stephen Hemminger To: netdev@vger.kernel.org Return-path: Received: from mail-wr1-f65.google.com ([209.85.221.65]:38318 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730190AbeIFUHH (ORCPT ); Thu, 6 Sep 2018 16:07:07 -0400 Received: by mail-wr1-f65.google.com with SMTP id w11-v6so11884238wrc.5 for ; Thu, 06 Sep 2018 08:31:04 -0700 (PDT) In-Reply-To: <20180906153057.5379-1-stephen@networkplumber.org> Sender: netdev-owner@vger.kernel.org List-ID: Rather than using is_json_context(), use the print_string functions which handle both cases. Signed-off-by: Stephen Hemminger --- bridge/mdb.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/bridge/mdb.c b/bridge/mdb.c index 9bdef0262c54..cc1b4547865c 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -131,15 +131,8 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e, if (n->nlmsg_type == RTM_DELMDB) print_bool(PRINT_ANY, "deleted", "Deleted ", true); - - if (is_json_context()) { - print_int(PRINT_JSON, "index", NULL, ifindex); - print_string(PRINT_JSON, "dev", NULL, dev); - } else { - fprintf(f, "%u: ", ifindex); - color_fprintf(f, COLOR_IFNAME, "%s ", dev); - } - + print_int(PRINT_ANY, "index", "%u: ", ifindex); + print_color_string(PRINT_ANY, COLOR_IFNAME, "dev", "%s ", dev); print_string(PRINT_ANY, "port", " %s ", ll_index_to_name(e->ifindex)); -- 2.17.1