DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blobmsg_json: let blobmsg_format_json_with_cb with list == true also format arrays

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2014-04-26 10:58:54 +02:00
parent ef918710c0
commit 131b3352d9
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
blobmsg_json.c
View file

@ -286,6 +286,7 @@ static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, i
char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_json_format_t cb, void *priv, int indent) char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_json_format_t cb, void *priv, int indent)
{ {
struct strbuf s; struct strbuf s;
bool array;
s.len = blob_len(attr); s.len = blob_len(attr);
s.buf = malloc(s.len); s.buf = malloc(s.len);
@ -299,8 +300,11 @@ char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_jso
s.indent_level = indent; s.indent_level = indent;
} }
array = blob_is_extended(attr) &&
blobmsg_type(attr) == BLOBMSG_TYPE_ARRAY;
if (list) if (list)
blobmsg_format_json_list(&s, blobmsg_data(attr), blobmsg_data_len(attr), false); blobmsg_format_json_list(&s, blobmsg_data(attr), blobmsg_data_len(attr), array);
else else
blobmsg_format_element(&s, attr, false, false); blobmsg_format_element(&s, attr, false, false);