summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2016-12-02 20:39:24 -0500
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-01-17 18:46:24 -0500
commit2047fdb5e741c5e645c0bad2ec43c5eafa8b947f (patch)
treef5a94674321641b7ef36a9e1618be4fffda0319b
parentdd3415b74b503f117039e3f18c2bf362e0cfda4c (diff)
lib: Allow json to work across different versions.
The json_object_object_get_ex function is not fully available across all versions of json. Write a wrapper to allow it to work. Ticket: CM-13872 Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
-rw-r--r--lib/json.c15
-rw-r--r--lib/json.h4
2 files changed, 19 insertions, 0 deletions
diff --git a/lib/json.c b/lib/json.c
index 3edd146a8f..ccbecb726a 100644
--- a/lib/json.c
+++ b/lib/json.c
@@ -87,3 +87,18 @@ 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
diff --git a/lib/json.h b/lib/json.h
index bacc799519..7e98614280 100644
--- a/lib/json.h
+++ b/lib/json.h
@@ -32,6 +32,10 @@
* so let's just turn it back to the original usage.
*/
#define json_object_to_json_string_ext(A, B) json_object_to_json_string (A)
+
+extern int json_object_object_get_ex(struct json_object *obj,
+ const char *key,
+ struct json_object **value);
#endif
#include "command.h"