Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Set defaultbranch to chinook in gitreview
[src/app-framework-main.git]
/
src
/
utils-json.c
diff --git
a/src/utils-json.c
b/src/utils-json.c
index
088dc40
..
74df9a9
100644
(file)
--- a/
src/utils-json.c
+++ b/
src/utils-json.c
@@
-1,5
+1,5
@@
/*
/*
- Copyright 2015 IoT.bzh
+ Copyright 2015
, 2016
IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
author: José Bollo <jose.bollo@iot.bzh>
@@
-95,7
+95,10
@@
int j_integer_at(struct json_object *obj, const char *key, int defval)
int j_add(struct json_object *obj, const char *key, struct json_object *val)
{
int j_add(struct json_object *obj, const char *key, struct json_object *val)
{
- json_object_object_add(obj, key, val);
+ if (key)
+ json_object_object_add(obj, key, val);
+ else
+ json_object_array_add(obj, val);
return 1;
}
return 1;
}