move json formatting to the blobmsg_json library

[project/libubox.git] / blobmsg.c

diff --git a/blobmsg.c b/blobmsg.c
index a77f158..570be4c 100644 (file)
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -15,166 +15,6 @@
 
 #include "blobmsg.h"
 
-struct strbuf {
-       int len;
-       int pos;
-       char *buf;
-};
-
-static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
-{
-       if (len <= 0)
-               return true;
-
-       if (s->pos + len >= s->len) {
-               s->len += 16;
-               s->buf = realloc(s->buf, s->len);
-               if (!s->buf)
-                       return false;
-       }
-       memcpy(s->buf + s->pos, c, len);
-       s->pos += len;
-       return true;
-}
-
-static void blobmsg_format_string(struct strbuf *s, const char *str)
-{
-       const char *p, *last = str, *end = str + strlen(str);
-       char buf[8] = "\\u00";
-
-       blobmsg_puts(s, "\"", 1);
-       for (p = str; *p; p++) {
-               char escape = '\0';
-               int len;
-
-               switch(*p) {
-               case '\b':
-                       escape = 'b';
-                       break;
-               case '\n':
-                       escape = 'n';
-                       break;
-               case '\t':
-                       escape = 't';
-                       break;
-               case '\r':
-                       escape = 'r';
-                       break;
-               case '"':
-               case '\\':
-               case '/':
-                       escape = *p;
-                       break;
-               default:
-                       if (*p < ' ')
-                               escape = 'u';
-                       break;
-               }
-
-               if (!escape)
-                       continue;
-
-               if (p > last)
-                       blobmsg_puts(s, last, p - last);
-               last = p + 1;
-               buf[1] = escape;
-
-               if (escape == 'u') {
-                       sprintf(buf + 4, "%02x", (unsigned char) *p);
-                       len = 4;
-               } else {
-                       len = 2;
-               }
-               blobmsg_puts(s, buf, len);
-       }
-
-       blobmsg_puts(s, last, end - last);
-       blobmsg_puts(s, "\"", 1);
-}
-
-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, bool head)
-{
-       char buf[32];
-       void *data;
-       int len;
-
-       if (!array && blobmsg_name(attr)[0]) {
-               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);
-       }
-
-       switch(blob_id(attr)) {
-       case BLOBMSG_TYPE_INT8:
-               sprintf(buf, "%d", *(uint8_t *)data);
-               break;
-       case BLOBMSG_TYPE_INT16:
-               sprintf(buf, "%d", *(uint16_t *)data);
-               break;
-       case BLOBMSG_TYPE_INT32:
-               sprintf(buf, "%d", *(uint32_t *)data);
-               break;
-       case BLOBMSG_TYPE_INT64:
-               sprintf(buf, "%lld", *(uint64_t *)data);
-               break;
-       case BLOBMSG_TYPE_STRING:
-               blobmsg_format_string(s, data);
-               return;
-       case BLOBMSG_TYPE_ARRAY:
-               blobmsg_format_json_list(s, data, len, true);
-               return;
-       case BLOBMSG_TYPE_TABLE:
-               blobmsg_format_json_list(s, data, len, false);
-               return;
-       }
-       blobmsg_puts(s, buf, strlen(buf));
-}
-
-static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, int len, bool array)
-{
-       struct blob_attr *pos;
-       bool first = true;
-       int rem = len;
-
-       blobmsg_puts(s, (array ? "[ " : "{ "), 2);
-       __blob_for_each_attr(pos, attr, rem) {
-               if (!first)
-                       blobmsg_puts(s, ", ", 2);
-
-               blobmsg_format_element(s, pos, array, false);
-               first = false;
-       }
-       blobmsg_puts(s, (array ? " ]" : " }"), 2);
-}
-
-char *blobmsg_format_json(struct blob_attr *attr, bool list)
-{
-       struct strbuf s;
-
-       s.len = blob_len(attr);
-       s.buf = malloc(s.len);
-       s.pos = 0;
-
-       if (list)
-               blobmsg_format_json_list(&s, blob_data(attr), blob_len(attr), false);
-       else
-               blobmsg_format_element(&s, attr, false, false);
-
-       if (!s.len)
-               return NULL;
-
-       s.buf = realloc(s.buf, s.pos + 1);
-       return s.buf;
-}
-
 static const int blob_type[__BLOBMSG_TYPE_LAST] = {
        [BLOBMSG_TYPE_INT8] = BLOB_ATTR_INT8,
        [BLOBMSG_TYPE_INT16] = BLOB_ATTR_INT16,