* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <inttypes.h>
#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;
}
{
bool ret = false;
- if (is_error(obj))
+ if (!obj)
return false;
if (json_object_get_type(obj) != json_type_object)
static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
{
+ size_t new_len;
+ char *new_buf;
+
if (len <= 0)
return true;
if (s->pos + len >= s->len) {
- s->len += 16 + len;
- s->buf = realloc(s->buf, s->len);
- if (!s->buf)
+ new_len = s->len + 16 + len;
+ new_buf = realloc(s->buf, new_len);
+ if (!new_buf)
return false;
+
+ s->len = new_len;
+ s->buf = new_buf;
}
+
memcpy(s->buf + s->pos, c, len);
s->pos += len;
return true;
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);
}
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));
+ sprintf(buf, "%" PRId64, (int64_t) be64_to_cpu(*(uint64_t *)data));
break;
case BLOBMSG_TYPE_STRING:
blobmsg_format_string(s, data);
char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_json_format_t cb, void *priv, int indent)
{
struct strbuf s;
+ bool array;
+ char *ret;
s.len = blob_len(attr);
- s.buf = malloc(s.len);
s.pos = 0;
s.custom_format = cb;
s.priv = priv;
s.indent = false;
+ s.buf = malloc(s.len);
+ if (!s.buf)
+ return NULL;
+
if (indent >= 0) {
s.indent = true;
s.indent_level = indent;
}
+ array = blob_is_extended(attr) &&
+ blobmsg_type(attr) == BLOBMSG_TYPE_ARRAY;
+
if (list)
- blobmsg_format_json_list(&s, blobmsg_data(attr), blobmsg_data_len(attr), false);
+ blobmsg_format_json_list(&s, blobmsg_data(attr), blobmsg_data_len(attr), array);
else
blobmsg_format_element(&s, attr, false, false);
return NULL;
}
- s.buf = realloc(s.buf, s.pos + 1);
- s.buf[s.pos] = 0;
+ ret = realloc(s.buf, s.pos + 1);
+ if (!ret) {
+ free(s.buf);
+ return NULL;
+ }
- return s.buf;
+ ret[s.pos] = 0;
+
+ return ret;
}