bridge: print_vlan: add missing check for json instance

Also initialize vlan_flags

Fixes: d82a49ce85 ("bridge: add json support for bridge vlan show")
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
This commit is contained in:
Roopa Prabhu 2016-08-02 23:07:05 -07:00 committed by Stephen Hemminger
parent 6d54c41580
commit 39c64df1c7

View File

@ -188,7 +188,7 @@ static int print_vlan(const struct sockaddr_nl *who,
struct ifinfomsg *ifm = NLMSG_DATA(n);
int len = n->nlmsg_len;
struct rtattr *tb[IFLA_MAX+1];
bool vlan_flags;
bool vlan_flags = false;
if (n->nlmsg_type != RTM_NEWLINK) {
fprintf(stderr, "Not RTM_NEWLINK: %08x %08x %08x\n",
@ -276,7 +276,7 @@ static int print_vlan(const struct sockaddr_nl *who,
fprintf(fp, " Egress Untagged");
}
}
if (vlan_flags) {
if (jw_global && vlan_flags) {
jsonw_end_array(jw_global);
vlan_flags = false;
}