diff options
author | John Crispin <blogic@openwrt.org> | 2015-03-11 09:32:37 +0100 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2015-03-11 09:32:37 +0100 |
commit | ae3fe30b6a1d4a45a34b3a896e9a4997c5da500f (patch) | |
tree | f3380868382942a16524574b159dc0803182df90 /ubus.c | |
parent | db79faae848e9ca5ed1c5b62cdd9d01650687fff (diff) |
fixes for json 0.12
Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'ubus.c')
-rw-r--r-- | ubus.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -192,16 +192,16 @@ static void uh_ubus_send_response(struct client *cl) static void uh_ubus_init_response(struct client *cl) { struct dispatch_ubus *du = &cl->dispatch.ubus; - struct json_object *obj = du->jsobj_cur; + struct json_object *obj = du->jsobj_cur, *obj2 = NULL; blob_buf_init(&buf, 0); blobmsg_add_string(&buf, "jsonrpc", "2.0"); if (obj) - obj = json_object_object_get(obj, "id"); + json_object_object_get_ex(obj, "id", &obj2); - if (obj) - blobmsg_add_json_element(&buf, "id", obj); + if (obj2) + blobmsg_add_json_element(&buf, "id", obj2); else blobmsg_add_field(&buf, BLOBMSG_TYPE_UNSPEC, "id", NULL, 0); } |