rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge libubox with the version 2016.02.26 from its git.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-02-26 23:13:29 +01:00
parent 6d5f11268b
commit 737ecc15d0
39 changed files with 2971 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
3P/libubox/blobmsg_json.c
View File

@@ -17,6 +17,12 @@
#include "blobmsg.h"
#include "blobmsg_json.h"
#ifdef JSONC
#include <json.h>
#else
#include <json/json.h>
#endif
bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
{
json_object_object_foreach(obj, key, val) {
@@ -43,9 +49,6 @@ bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
bool ret = true;
void *c;
if (!obj)
return false;
switch (json_object_get_type(obj)) {
case json_type_object:
c = blobmsg_open_table(b, name);
@@ -66,6 +69,9 @@ bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
case json_type_int:
blobmsg_add_u32(b, name, json_object_get_int(obj));
break;
case json_type_null:
blobmsg_add_field(b, BLOBMSG_TYPE_UNSPEC, name, NULL, 0);
break;
default:
return false;
}
@@ -76,7 +82,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)