matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Stephen Hemminger 2018-09-06 14:15:36 +01:00
parent f5fc738736
commit 2ed82667b8
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bridge/mdb.c
View File

@ -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) if (n->nlmsg_type == RTM_DELMDB)
print_bool(PRINT_ANY, "deleted", "Deleted ", true); print_bool(PRINT_ANY, "deleted", "Deleted ", true);
print_int(PRINT_ANY, "index", "%u: ", ifindex);
if (is_json_context()) { print_color_string(PRINT_ANY, COLOR_IFNAME, "dev", "%s ", dev);
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_string(PRINT_ANY, "port", " %s ", print_string(PRINT_ANY, "port", " %s ",
ll_index_to_name(e->ifindex)); ll_index_to_name(e->ifindex));