avl: add AVL_TREE macro to define an initialized struct avl_tree

[project/libubox.git] / blobmsg_json.c

diff --git a/blobmsg_json.c b/blobmsg_json.c
index 7e6fca4f0c3a1ab47fa0c0aff0a9450c33c2c85a..c84fd93df47d5cdb572d6caf5ecfee5cefadf651 100644 (file)
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -129,14 +129,11 @@ static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
 static void add_separator(struct strbuf *s)
 {
        static char indent_chars[17] = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-       static const char indent_space = ' ';
        int indent;
        char *start;
 
-       if (!s->indent) {
-               blobmsg_puts(s, &indent_space, 1);
+       if (!s->indent)
                return;
-       }
 
        indent = s->indent_level;
        if (indent > 16)
@@ -151,11 +148,12 @@ static void add_separator(struct strbuf *s)
 
 static void blobmsg_format_string(struct strbuf *s, const char *str)
 {
-       const char *p, *last = str, *end = str + strlen(str);
+       const unsigned char *p, *last, *end;
        char buf[8] = "\\u00";
 
+       end = (unsigned char *) str + strlen(str);
        blobmsg_puts(s, "\"", 1);
-       for (p = str; *p; p++) {
+       for (p = (unsigned char *) str, last = p; *p; p++) {
                char escape = '\0';
                int len;
 
@@ -187,7 +185,7 @@ static void blobmsg_format_string(struct strbuf *s, const char *str)
                        continue;
 
                if (p > last)
-                       blobmsg_puts(s, last, p - last);
+                       blobmsg_puts(s, (char *) last, p - last);
                last = p + 1;
                buf[1] = escape;
 
@@ -200,7 +198,7 @@ static void blobmsg_format_string(struct strbuf *s, const char *str)
                blobmsg_puts(s, buf, len);
        }
 
-       blobmsg_puts(s, last, end - last);
+       blobmsg_puts(s, (char *) last, end - last);
        blobmsg_puts(s, "\"", 1);
 }
 
@@ -218,20 +216,16 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
 
        if (!array && blobmsg_name(attr)[0]) {
                blobmsg_format_string(s, blobmsg_name(attr));
-               blobmsg_puts(s, ": ", 2);
+               blobmsg_puts(s, ": ", s->indent ? 2 : 1);
        }
-       if (head) {
-               data = blob_data(attr);
-               len = blob_len(attr);
-       } else {
-               data = blobmsg_data(attr);
-               len = blobmsg_data_len(attr);
-
-               if (s->custom_format) {
-                       data_str = s->custom_format(s->priv, attr);
-                       if (data_str)
-                               goto out;
-               }
+
+       data = blobmsg_data(attr);
+       len = blobmsg_data_len(attr);
+
+       if (!head && s->custom_format) {
+               data_str = s->custom_format(s->priv, attr);
+               if (data_str)
+                       goto out;
        }
 
        data_str = buf;
@@ -246,7 +240,7 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
                sprintf(buf, "%d", be16_to_cpu(*(uint16_t *)data));
                break;
        case BLOBMSG_TYPE_INT32:
-               sprintf(buf, "%d", be32_to_cpu(*(uint32_t *)data));
+               sprintf(buf, "%d", (int32_t) be32_to_cpu(*(uint32_t *)data));
                break;
        case BLOBMSG_TYPE_INT64:
                sprintf(buf, "%lld", (long long int) be64_to_cpu(*(uint64_t *)data));
@@ -306,7 +300,7 @@ char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_jso
        }
 
        if (list)
-               blobmsg_format_json_list(&s, blob_data(attr), blob_len(attr), false);
+               blobmsg_format_json_list(&s, blobmsg_data(attr), blobmsg_data_len(attr), false);
        else
                blobmsg_format_element(&s, attr, false, false);