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 (file)
--- 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;
 
 {
        bool ret = false;
 

-       if (is_error(obj))
+       if (!obj)

                return false;
 
        if (json_object_get_type(obj) != json_type_object)
                return false;
 
        if (json_object_get_type(obj) != json_type_object)

diff --git a/jshn.c b/jshn.c
index cec48a0..e7e02d1 100644 (file)
--- 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);
        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;
        }
                fprintf(stderr, "Failed to parse message data\n");
                return 1;
        }