From: Donald Sharp Date: Tue, 7 Sep 2021 13:40:12 +0000 (-0400) Subject: bgpd: Fix usage of JSON_C_TO_STRING_NOSLASHESCAPE X-Git-Tag: base_8.1~90^2~1 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=192422ef3b2e0bc533a25ca276f22f36a14265ef;p=mirror%2Ffrr.git bgpd: Fix usage of JSON_C_TO_STRING_NOSLASHESCAPE The usage of json_object_to_json_string_ext is mean for generation of output string and returns a `char *` pointer to the `formatted` output. Just calling it does nothing and it's expensive to boot. Modify the code in bgpd to just output with the NOSLASHESCAPE when outputting. Signed-off-by: Donald Sharp --- diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index 2bda5dbf9a..867efb6099 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -396,8 +396,6 @@ static void display_l3vni(struct vty *vty, struct bgp *bgp_vrf, originator_ip, sizeof(originator_ip))); json_object_string_add(json, "advertiseGatewayMacip", "n/a"); json_object_string_add(json, "advertiseSviMacIp", "n/a"); - json_object_to_json_string_ext(json, - JSON_C_TO_STRING_NOSLASHESCAPE); json_object_string_add(json, "advertisePip", bgp_vrf->evpn_info->advertise_pip ? "Enabled" : "Disabled"); @@ -967,8 +965,6 @@ static void show_l3vni_entry(struct vty *vty, struct bgp *bgp, json_object_string_add(json_vni, "advertiseGatewayMacip", "n/a"); json_object_string_add(json_vni, "advertiseSviMacIp", "n/a"); - json_object_to_json_string_ext(json_vni, - JSON_C_TO_STRING_NOSLASHESCAPE); json_object_string_add( json_vni, "advertisePip", bgp->evpn_info->advertise_pip ? "Enabled" : "Disabled"); @@ -4413,8 +4409,11 @@ DEFUN(show_bgp_l2vpn_evpn_vni, } if (uj) { - vty_out(vty, "%s\n", json_object_to_json_string_ext( - json, JSON_C_TO_STRING_PRETTY)); + vty_out(vty, "%s\n", + json_object_to_json_string_ext( + json, + JSON_C_TO_STRING_PRETTY + | JSON_C_TO_STRING_NOSLASHESCAPE)); json_object_free(json); }