blobmsg: make arrays structually the same as tables - simplifies library user code

diff --git a/blobmsg.c b/blobmsg.c
index b16510bcc88cb89d116131f1f4e940bc6ac7ae39..bdc5ef74b54b3c334e6bf183aa3e9df30fa919be 100644 (file)
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -94,18 +94,20 @@ static void blobmsg_format_string(struct strbuf *s, char *str)
 
 static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, int len, bool array);
 
-static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, bool array)
+static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, bool array, bool head)
 {
        char buf[32];
        void *data;
        int len;
 
-       if (array) {
-               data = blob_data(attr);
-               len  = blob_len(attr);
-       } else {
+       if (!array) {
                blobmsg_format_string(s, blobmsg_name(attr));
                blobmsg_puts(s, ":", 1);
+       }
+       if (head) {
+               data = blob_data(attr);
+               len = blob_len(attr);
+       } else {
                data = blobmsg_data(attr);
                len = blobmsg_data_len(attr);
        }
@@ -147,7 +149,7 @@ static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, i
                if (!first)
                        blobmsg_puts(s, ", ", 2);
 
-               blobmsg_format_element(s, pos, array);
+               blobmsg_format_element(s, pos, array, false);
                first = false;
        }
        blobmsg_puts(s, (array ? " ]" : " }"), 2);
@@ -161,7 +163,7 @@ char *blobmsg_format_json(struct blob_attr *attr)
        s.buf = malloc(s.len);
        s.pos = 0;
 
-       blobmsg_format_element(&s, attr, false);
+       blobmsg_format_element(&s, attr, true, true);
 
        if (!s.len)
                return NULL;
@@ -244,14 +246,8 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
        struct blobmsg_hdr *hdr;
        int attrlen, namelen;
 
-       if (blob_id(buf->head) == BLOBMSG_TYPE_ARRAY && !name) {
-               attr = blob_new(buf, type, payload_len);
-               *data = blob_data(attr);
-               return attr;
-       }
-
-       if (blob_id(buf->head) != BLOBMSG_TYPE_TABLE || !name)
-               return NULL;
+       if (!name)
+               name = "";
 
        namelen = strlen(name);
        attrlen = blobmsg_hdrlen(namelen) + payload_len;
@@ -282,17 +278,13 @@ blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
        unsigned long offset = attr_to_offset(buf, buf->head);
        void *data;
 
-       if (blob_id(head) == BLOBMSG_TYPE_ARRAY && !name)
-               return blob_nest_start(buf, type);
-
-       if (blob_id(head) == BLOBMSG_TYPE_TABLE && name) {
-               head = blobmsg_new(buf, type, name, 0, &data);
-               blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blobmsg_hdrlen(strlen(name)));
-               buf->head = head;
-               return (void *)offset;
-       }
+       if (!name)
+               name = "";
 
-       return NULL;
+       head = blobmsg_new(buf, type, name, 0, &data);
+       blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blobmsg_hdrlen(strlen(name)));
+       buf->head = head;
+       return (void *)offset;
 }
 
 int

diff --git a/blobmsg.h b/blobmsg.h
index c64cedbf831c5d66e9a45e94ad30ddce7de8fd49..95732e31a07a53971b8425d4815671848e0a0356 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -35,7 +35,7 @@ enum blobmsg_type {
 };
 
 struct blobmsg_hdr {
-       uint8_t namelen;
+       uint16_t namelen;
        uint8_t name[];
 } __packed;
 
@@ -58,7 +58,7 @@ static inline void *blobmsg_name(struct blob_attr *attr)
 static inline void *blobmsg_data(struct blob_attr *attr)
 {
        struct blobmsg_hdr *hdr = blob_data(attr);
-       return &hdr->name[blobmsg_hdrlen(hdr->namelen) - 1];
+       return (char *) hdr + blobmsg_hdrlen(hdr->namelen);
 }
 
 static inline int blobmsg_data_len(struct blob_attr *attr)

diff --git a/examples/blobmsg-example.c b/examples/blobmsg-example.c
index 6eec16db81ee9e87827f9ba63525b0d8fa7b983a..3630208be16b3937f2fb7b07d835d46dad3474b4 100644 (file)
--- a/examples/blobmsg-example.c
+++ b/examples/blobmsg-example.c
@@ -13,19 +13,7 @@ static const char *indent_str = "\t\t\t\t\t\t\t\t\t\t\t\t\t";
 static void dump_attr_data(void *data, int len, int type, int indent, int next_indent);
 
 static void
-dump_array(struct blob_attr *head, int len, int indent)
-{
-       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)
+dump_table(struct blob_attr *head, int len, int indent, bool array)
 {
        struct blob_attr *attr, *last_attr;
        struct blobmsg_hdr *hdr;
@@ -33,7 +21,8 @@ dump_table(struct blob_attr *head, int len, int indent)
        indent_printf(indent, "{\n");
        __blob_for_each_attr(attr, head, len) {
                hdr = blob_data(attr);
-               indent_printf(indent + 1, "%s : ", hdr->name);
+               if (!array)
+                       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;
        }
@@ -59,14 +48,10 @@ static void dump_attr_data(void *data, int len, int type, int indent, int next_i
                indent_printf(indent, "%lld\n", *(uint64_t *)data);
                break;
        case BLOBMSG_TYPE_TABLE:
-               if (!indent)
-                       indent_printf(indent, "\n");
-               dump_table(data, len, next_indent);
-               break;
        case BLOBMSG_TYPE_ARRAY:
                if (!indent)
                        indent_printf(indent, "\n");
-               dump_array(data, len, next_indent);
+               dump_table(data, len, next_indent, type == BLOBMSG_TYPE_ARRAY);
                break;
        }
 }
@@ -109,11 +94,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]), blob_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]), blob_len(tb[FOO_TESTDATA]), 0, false);
        }
 }
 
@@ -124,16 +109,16 @@ fill_message(struct blob_buf *buf)
 
        blobmsg_add_string(buf, "message", "Hello, world!");
 
+       tbl = blobmsg_open_table(buf, "testdata");
+       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_close_table(buf, tbl);
 }
 
 int main(int argc, char **argv)
@@ -143,6 +128,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));
 
        if (buf.buf)
                free(buf.buf);