return ret;
}
-bool blobmsg_add_json_from_string(struct blob_buf *b, const char *str)
+static bool __blobmsg_add_json(struct blob_buf *b, json_object *obj)
{
- json_object *obj;
bool ret = false;
- obj = json_tokener_parse(str);
if (is_error(obj))
return false;
return ret;
}
+bool blobmsg_add_json_from_file(struct blob_buf *b, const char *file)
+{
+ return __blobmsg_add_json(b, json_object_from_file(file));
+}
+
+bool blobmsg_add_json_from_string(struct blob_buf *b, const char *str)
+{
+ return __blobmsg_add_json(b, json_tokener_parse(str));
+}
+
struct strbuf {
int len;
return true;
if (s->pos + len >= s->len) {
- s->len += 16;
+ s->len += 16 + len;
s->buf = realloc(s->buf, s->len);
if (!s->buf)
return false;
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;
continue;
if (p > last)
- blobmsg_puts(s, last, p - last);
+ blobmsg_puts(s, (char *) last, p - last);
last = p + 1;
buf[1] = escape;
if (escape == 'u') {
sprintf(buf + 4, "%02x", (unsigned char) *p);
- len = 4;
+ len = 6;
} else {
len = 2;
}
blobmsg_puts(s, buf, len);
}
- blobmsg_puts(s, last, end - last);
+ blobmsg_puts(s, (char *) last, end - last);
blobmsg_puts(s, "\"", 1);
}
data_str = buf;
switch(blob_id(attr)) {
+ case BLOBMSG_TYPE_UNSPEC:
+ sprintf(buf, "null");
+ break;
case BLOBMSG_TYPE_BOOL:
sprintf(buf, "%s", *(uint8_t *)data ? "true" : "false");
break;