utils: fix build error with g++

[project/libubox.git] / examples / blobmsg-example.c

diff --git a/examples/blobmsg-example.c b/examples/blobmsg-example.c
index 6eec16d..1c86017 100644 (file)
--- a/examples/blobmsg-example.c
+++ b/examples/blobmsg-example.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
+#include <inttypes.h>
 
 #include "blobmsg.h"
+#include "blobmsg_json.h"
 
 static const char *indent_str = "\t\t\t\t\t\t\t\t\t\t\t\t\t";
 
@@ -10,63 +12,52 @@ static const char *indent_str = "\t\t\t\t\t\t\t\t\t\t\t\t\t";
        fprintf(stderr, __VA_ARGS__); \
 } 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
-dump_array(struct blob_attr *head, int len, int indent)
+dump_table(struct blob_attr *head, int len, int indent, bool array)
 {
        struct blob_attr *attr;
-
-       indent_printf(indent, "{\n");
-       __blob_for_each_attr(attr, head, len) {
-               dump_attr_data(blob_data(attr), blob_len(attr), blob_id(attr), indent + 1, indent + 1);
-       }
-       indent_printf(indent, "}\n");
-}
-
-static void
-dump_table(struct blob_attr *head, int len, int indent)
-{
-       struct blob_attr *attr, *last_attr;
        struct blobmsg_hdr *hdr;
 
        indent_printf(indent, "{\n");
        __blob_for_each_attr(attr, head, len) {
                hdr = blob_data(attr);
-               indent_printf(indent + 1, "%s : ", hdr->name);
-               dump_attr_data(blobmsg_data(attr), blobmsg_data_len(attr), blob_id(attr), 0, indent + 1);
-               last_attr = attr;
+               if (!array)
+                       indent_printf(indent + 1, "%s : ", hdr->name);
+               dump_attr_data(attr, 0, indent + 1);
        }
        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) {
        case BLOBMSG_TYPE_STRING:
-               indent_printf(indent, "%s\n", (char *) data);
+               indent_printf(indent, "%s\n", blobmsg_get_string(data));
                break;
        case BLOBMSG_TYPE_INT8:
-               indent_printf(indent, "%d\n", *(uint8_t *)data);
+               indent_printf(indent, "%d\n", blobmsg_get_u8(data));
                break;
        case BLOBMSG_TYPE_INT16:
-               indent_printf(indent, "%d\n", *(uint16_t *)data);
+               indent_printf(indent, "%d\n", blobmsg_get_u16(data));
                break;
        case BLOBMSG_TYPE_INT32:
-               indent_printf(indent, "%d\n", *(uint32_t *)data);
+               indent_printf(indent, "%d\n", blobmsg_get_u32(data));
                break;
        case BLOBMSG_TYPE_INT64:
-               indent_printf(indent, "%lld\n", *(uint64_t *)data);
+               indent_printf(indent, "%"PRIu64"\n", blobmsg_get_u64(data));
                break;
-       case BLOBMSG_TYPE_TABLE:
-               if (!indent)
-                       indent_printf(indent, "\n");
-               dump_table(data, len, next_indent);
+       case BLOBMSG_TYPE_DOUBLE:
+               indent_printf(indent, "%lf\n", blobmsg_get_double(data));
                break;
+       case BLOBMSG_TYPE_TABLE:
        case BLOBMSG_TYPE_ARRAY:
                if (!indent)
                        indent_printf(indent, "\n");
-               dump_array(data, len, next_indent);
+               dump_table(blobmsg_data(data), blobmsg_data_len(data),
+                          next_indent, type == BLOBMSG_TYPE_ARRAY);
                break;
        }
 }
@@ -109,11 +100,11 @@ static void dump_message(struct blob_buf *buf)
 
        if (tb[FOO_LIST]) {
                fprintf(stderr, "List: ");
-               dump_array(blobmsg_data(tb[FOO_LIST]), blob_len(tb[FOO_LIST]), 0);
+               dump_table(blobmsg_data(tb[FOO_LIST]), blobmsg_data_len(tb[FOO_LIST]), 0, true);
        }
        if (tb[FOO_TESTDATA]) {
                fprintf(stderr, "Testdata: ");
-               dump_table(blobmsg_data(tb[FOO_TESTDATA]), blob_len(tb[FOO_TESTDATA]), 0);
+               dump_table(blobmsg_data(tb[FOO_TESTDATA]), blobmsg_data_len(tb[FOO_TESTDATA]), 0, false);
        }
 }
 
@@ -124,15 +115,17 @@ fill_message(struct blob_buf *buf)
 
        blobmsg_add_string(buf, "message", "Hello, world!");
 
+       tbl = blobmsg_open_table(buf, "testdata");
+       blobmsg_add_double(buf, "double", 1.337e2);
+       blobmsg_add_u32(buf, "hello", 1);
+       blobmsg_add_string(buf, "world", "2");
+       blobmsg_close_table(buf, tbl);
+
        tbl = blobmsg_open_array(buf, "list");
        blobmsg_add_u32(buf, NULL, 0);
        blobmsg_add_u32(buf, NULL, 1);
        blobmsg_add_u32(buf, NULL, 2);
-       blobmsg_close_table(buf, tbl);
-
-       tbl = blobmsg_open_table(buf, "testdata");
-       blobmsg_add_u32(buf, "hello", 1);
-       blobmsg_add_string(buf, "world", "2");
+       blobmsg_add_double(buf, "double", 1.337e2);
        blobmsg_close_table(buf, tbl);
 }
 
@@ -143,6 +136,7 @@ int main(int argc, char **argv)
        blobmsg_buf_init(&buf);
        fill_message(&buf);
        dump_message(&buf);
+       fprintf(stderr, "json: %s\n", blobmsg_format_json(buf.head, true));
 
        if (buf.buf)
                free(buf.buf);