From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 23 Sep 2014 10:02:31 +0000 (+0200)
Subject: avoid using the deprecated is_error() function from json-c
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=c8fc0897cdfff6393919030e24809e938ee5076f

avoid using the deprecated is_error() function from json-c

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/blobmsg_json.c b/blobmsg_json.c
index 8f208e0..5aa528b 100644
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -76,7 +76,7 @@ static bool __blobmsg_add_json(struct blob_buf *b, json_object *obj)
 {
 	bool ret = false;
 
-	if (is_error(obj))
+	if (!obj)
 		return false;
 
 	if (json_object_get_type(obj) != json_type_object)
diff --git a/jshn.c b/jshn.c
index cec48a0..e7e02d1 100644
--- a/jshn.c
+++ b/jshn.c
@@ -164,7 +164,7 @@ static int jshn_parse(const char *str)
 	json_object *obj;
 
 	obj = json_tokener_parse(str);
-	if (is_error(obj) || json_object_get_type(obj) != json_type_object) {
+	if (!obj || json_object_get_type(obj) != json_type_object) {
 		fprintf(stderr, "Failed to parse message data\n");
 		return 1;
 	}