summaryrefslogtreecommitdiffstats
path: root/lib/json.h
diff options
context:
space:
mode:
authorDon Slice <dslice@cumulusnetworks.com>2018-08-29 14:19:54 +0200
committerDon Slice <dslice@cumulusnetworks.com>2018-08-30 14:40:18 +0200
commit9f049418bc2fe2500a4c7dbba11d1eefa9c1408c (patch)
treef92eaaecf3885a43bb7cd392b7e4b6f546c1570f /lib/json.h
parentMerge pull request #2930 from donaldsharp/pim_debug (diff)
downloadfrr-9f049418bc2fe2500a4c7dbba11d1eefa9c1408c.tar.xz
frr-9f049418bc2fe2500a4c7dbba11d1eefa9c1408c.zip
bgpd/ospfd: make bgp and ospf json response a bit more consistent
Problem reported that some bgp and ospf json commands did not return any json output at all if the bgp/ospf instance did not exist. Additionally, some bgp and ospf json commands did not return any json output if the instance existed but no neighbors were defined. This fix makes these commands more consistent in returning empty braces for json output and issue a message if not using json output. Additionally, made the flag "use_json" a bool to make it consistent since previously, it had been defined as an int, char, u_char, and bool at various places. Ticket: CM-21040 Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
Diffstat (limited to 'lib/json.h')
-rw-r--r--lib/json.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/json.h b/lib/json.h
index 788d1d6ef..d34916230 100644
--- a/lib/json.h
+++ b/lib/json.h
@@ -52,7 +52,7 @@ extern int json_object_object_get_ex(struct json_object *obj, const char *key,
#include "command.h"
-extern int use_json(const int argc, struct cmd_token *argv[]);
+extern bool use_json(const int argc, struct cmd_token *argv[]);
extern void json_object_string_add(struct json_object *obj, const char *key,
const char *s);
extern void json_object_int_add(struct json_object *obj, const char *key,