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

blobmsg_example: fix output

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2014-07-03 12:56:40 +02:00
parent db8e7060e0
commit 8cee1e552a
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/blobmsg-example.c
View file

@ -11,7 +11,7 @@ static const char *indent_str = "\t\t\t\t\t\t\t\t\t\t\t\t\t";
fprintf(stderr, __VA_ARGS__); \ fprintf(stderr, __VA_ARGS__); \
} while(0) } while(0)
static void dump_attr_data(void *data, int len, int type, int indent, int next_indent); static void dump_attr_data(struct blob_attr *data, int indent, int next_indent);
static void static void
dump_table(struct blob_attr *head, int len, int indent, bool array) dump_table(struct blob_attr *head, int len, int indent, bool array)
@ -24,34 +24,36 @@ dump_table(struct blob_attr *head, int len, int indent, bool array)
hdr = blob_data(attr); hdr = blob_data(attr);
if (!array) if (!array)
indent_printf(indent + 1, "%s : ", hdr->name); indent_printf(indent + 1, "%s : ", hdr->name);
dump_attr_data(blobmsg_data(attr), blobmsg_data_len(attr), blob_id(attr), 0, indent + 1); dump_attr_data(attr, 0, indent + 1);
} }
indent_printf(indent, "}\n"); indent_printf(indent, "}\n");
} }
static void dump_attr_data(void *data, int len, int type, int indent, int next_indent) static void dump_attr_data(struct blob_attr *data, int indent, int next_indent)
{ {
int type = blobmsg_type(data);
switch(type) { switch(type) {
case BLOBMSG_TYPE_STRING: case BLOBMSG_TYPE_STRING:
indent_printf(indent, "%s\n", (char *) data); indent_printf(indent, "%s\n", blobmsg_data(data));
break; break;
case BLOBMSG_TYPE_INT8: case BLOBMSG_TYPE_INT8:
indent_printf(indent, "%d\n", *(uint8_t *)data); indent_printf(indent, "%d\n", blobmsg_get_u8(data));
break; break;
case BLOBMSG_TYPE_INT16: case BLOBMSG_TYPE_INT16:
indent_printf(indent, "%d\n", *(uint16_t *)data); indent_printf(indent, "%d\n", blobmsg_get_u16(data));
break; break;
case BLOBMSG_TYPE_INT32: case BLOBMSG_TYPE_INT32:
indent_printf(indent, "%d\n", *(uint32_t *)data); indent_printf(indent, "%d\n", blobmsg_get_u32(data));
break; break;
case BLOBMSG_TYPE_INT64: case BLOBMSG_TYPE_INT64:
indent_printf(indent, "%"PRIu64"\n", *(uint64_t *)data); indent_printf(indent, "%"PRIu64"\n", blobmsg_get_u64(data));
break; break;
case BLOBMSG_TYPE_TABLE: case BLOBMSG_TYPE_TABLE:
case BLOBMSG_TYPE_ARRAY: case BLOBMSG_TYPE_ARRAY:
if (!indent) if (!indent)
indent_printf(indent, "\n"); indent_printf(indent, "\n");
dump_table(data, len, next_indent, type == BLOBMSG_TYPE_ARRAY); dump_table(blobmsg_data(data), blobmsg_data_len(data),
next_indent, type == BLOBMSG_TYPE_ARRAY);
break; break;
} }
} }
@ -128,7 +130,7 @@ int main(int argc, char **argv)
blobmsg_buf_init(&buf); blobmsg_buf_init(&buf);
fill_message(&buf); fill_message(&buf);
dump_message(&buf); dump_message(&buf);
fprintf(stderr, "json: %s\n", blobmsg_format_json(buf.head, false)); fprintf(stderr, "json: %s\n", blobmsg_format_json(buf.head, true));
if (buf.buf) if (buf.buf)
free(buf.buf); free(buf.buf);