From 47d5be7160e33966f5ded484232d10dcc220f172 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Fri, 6 Mar 2015 17:46:04 +0100
Subject: json 0.12 fixes Signed-off-by: John Crispin <blogic@openwrt.org>

---
 service/validate.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'service')

diff --git a/service/validate.c b/service/validate.c
index a33a48e..6a449f4 100644
--- a/service/validate.c
+++ b/service/validate.c
@@ -13,7 +13,7 @@
 
 #include <libubox/blobmsg_json.h>
 #include <libubox/avl-cmp.h>
-#include <json/json.h>
+#include <json-c/json.h>
 
 #include "../procd.h"
 
@@ -53,12 +53,12 @@ service_validate_dump_all(struct blob_buf *b, char *p, char *s)
 		if (s && strcmp(s, v->type))
 			continue;
 
-		o = json_object_object_get(r, v->package);
+		json_object_object_get_ex(r, v->package, &o);
 		if (!o) {
 			o = json_object_new_object();
 			json_object_object_add(r, v->package, o);
 		}
-		t = json_object_object_get(o, v->type);
+		json_object_object_get_ex(o, v->type, &t);
 		if (!t) {
 			t = json_object_new_object();
 			json_object_object_add(o, v->type, t);
-- 
cgit v1.2.3