#include "blobmsg.h"
#include "blobmsg_json.h"
+#ifdef JSONC
+ #include <json.h>
+#else
+ #include <json/json.h>
+#endif
+
bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
{
json_object_object_foreach(obj, key, val) {
bool ret = true;
void *c;
- if (!obj)
- return false;
-
switch (json_object_get_type(obj)) {
case json_type_object:
c = blobmsg_open_table(b, name);
case json_type_int:
blobmsg_add_u32(b, name, json_object_get_int(obj));
break;
+ case json_type_null:
+ blobmsg_add_field(b, BLOBMSG_TYPE_UNSPEC, name, NULL, 0);
+ break;
default:
return false;
}
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";
- int indent;
- char *start;
+ const char *indent_chars = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+ int len;
if (!s->indent)
return;
- indent = s->indent_level;
- if (indent > 16)
- indent = 16;
+ len = s->indent_level + 1;
+ if (len > strlen(indent_chars))
+ len = strlen(indent_chars);
- start = &indent_chars[sizeof(indent_chars) - indent - 1];
- *start = '\n';
- blobmsg_puts(s, start, indent + 1);
- *start = '\t';
+ blobmsg_puts(s, indent_chars, len);
}