matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: use vty_json()

Browse source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2021-11-17 12:05:12 +01:00
parent 2c4dfddb01
commit ad9df66ce2
4 changed files with 4 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ferr.c
View file

@ -157,13 +157,7 @@ void log_ref_display(struct vty *vty, uint32_t code, bool json)
} }
} }
if (json) { vty_json(vty, top);
const char *str = json_object_to_json_string_ext(
top, JSON_C_TO_STRING_PRETTY);
vty_out(vty, "%s\n", str);
json_object_free(top);
}
list_delete(&errlist); list_delete(&errlist);
} }

9
lib/filter.c
View file

@ -589,14 +589,7 @@ static int filter_show(struct vty *vty, const char *name, afi_t afi,
} }
} }
if (json) { return vty_json(vty, json);
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
return CMD_SUCCESS;
} }
/* show MAC access list - this only has MAC filters for now*/ /* show MAC access list - this only has MAC filters for now*/

9
lib/plist.c
View file

@ -1127,14 +1127,7 @@ static int vty_show_prefix_list(struct vty *vty, afi_t afi, const char *name,
master, dtype, seqnum); master, dtype, seqnum);
} }
if (uj) { return vty_json(vty, json);
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
return CMD_SUCCESS;
} }
static int vty_show_prefix_list_prefix(struct vty *vty, afi_t afi, static int vty_show_prefix_list_prefix(struct vty *vty, afi_t afi,

9
lib/routemap.c
View file

@ -1026,14 +1026,7 @@ static int vty_show_route_map(struct vty *vty, const char *name, bool use_json)
list_delete(&maplist); list_delete(&maplist);
} }
if (use_json) { return vty_json(vty, json);
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
json_object_free(json);
}
return CMD_SUCCESS;
} }
/* Unused route map details */ /* Unused route map details */