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 9bdef0262c546c7938e54ba0800b80f95d1fbef8..cc1b4547865c1d63c6bbaff6ae1acf2e8b05e09f 100644 (file)
--- 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));