From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 6 Sep 2018 13:15:36 +0000 (+0100)
Subject: bridge: use print_json for some outputs
X-Git-Tag: v4.19.0~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ed82667b8dcc65fd14727dcf365821d63bd2c75;p=thirdparty%2Fiproute2.git

bridge: use print_json for some outputs

Rather than using is_json_context(), use the print_string functions
which handle both cases.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/bridge/mdb.c b/bridge/mdb.c
index 9bdef0262..cc1b45478 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));