summaryrefslogtreecommitdiff
path: root/lib/json.c
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2019-10-11 16:15:38 +0000
committerQuentin Young <qlyoung@cumulusnetworks.com>2019-10-11 16:16:37 +0000
commit7bdafd3b41e6fbcfdf74f3329f2daf797604ecee (patch)
tree1d8ad333bb542109fbfef34dc471ab47b5e4a1ea /lib/json.c
parentca9e5ab31616da31d81ec3ee7c9f84d601a8c00b (diff)
lib: require json-c
We have unsigned 4 byte integrals in the codebase that end up in json output, so we need to force a json library that can handle these. Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'lib/json.c')
-rw-r--r--lib/json.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/json.c b/lib/json.c
index efc3794040..991240639a 100644
--- a/lib/json.c
+++ b/lib/json.c
@@ -47,11 +47,7 @@ void json_object_string_add(struct json_object *obj, const char *key,
void json_object_int_add(struct json_object *obj, const char *key, int64_t i)
{
-#if defined(HAVE_JSON_C_JSON_H)
json_object_object_add(obj, key, json_object_new_int64(i));
-#else
- json_object_object_add(obj, key, json_object_new_int((int)i));
-#endif
}
void json_object_boolean_false_add(struct json_object *obj, const char *key)
@@ -78,16 +74,3 @@ void json_object_free(struct json_object *obj)
{
json_object_put(obj);
}
-
-#if !defined(HAVE_JSON_C_JSON_H)
-int json_object_object_get_ex(struct json_object *obj, const char *key,
- struct json_object **value)
-{
- *value = json_object_object_get(obj, key);
-
- if (*value)
- return 1;
-
- return 0;
-}
-#endif