diff options
author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-21 21:27:49 +0200 |
---|---|---|
committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-21 21:27:49 +0200 |
commit | 39e92c066f210b0b550489e98d3b767ee1553e52 (patch) | |
tree | 70928b277635d25cb717b8ceb103dd1d5e26f732 /lib/json.c | |
parent | lib: Clean up some bgp show functions (diff) | |
parent | vtysh: handle case if there is no match in "write terminal $daemon" (diff) | |
download | frr-39e92c066f210b0b550489e98d3b767ee1553e52.tar.xz frr-39e92c066f210b0b550489e98d3b767ee1553e52.zip |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
bgpd/bgp_encap.c
bgpd/bgp_route.c
lib/command.c
lib/command.h
ospf6d/ospf6d.c
vtysh/vtysh.c
Diffstat (limited to 'lib/json.c')
-rw-r--r-- | lib/json.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/json.c b/lib/json.c index 1d22180e1..966d24f00 100644 --- a/lib/json.c +++ b/lib/json.c @@ -55,6 +55,12 @@ json_object_int_add(struct json_object* obj, const char *key, int32_t i) } void +json_object_long_add(struct json_object* obj, const char *key, int64_t i) +{ + json_object_object_add(obj, key, json_object_new_int64(i)); +} + +void json_object_boolean_false_add(struct json_object* obj, const char *key) { json_object_object_add(obj, key, json_object_new_boolean(0)); |