blobmsg_json: export blobmsg_add_object

[project/libubox.git] / blobmsg_json.c

diff --git a/blobmsg_json.c b/blobmsg_json.c
index 3053fa3..f629d76 100644 (file)
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -1,22 +1,22 @@
 /*
- * blobmsg - library for generating/parsing structured blob messages
+ * Copyright (C) 2010-2012 Felix Fietkau <nbd@openwrt.org>
  *
- * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
 #include "blobmsg.h"
 #include "blobmsg_json.h"
 
-static bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
+bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
 {
        json_object_object_foreach(obj, key, val) {
                if (!blobmsg_add_json_element(b, key, val))
@@ -231,11 +231,14 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
        case BLOBMSG_TYPE_BOOL:
                sprintf(buf, "%s", *(uint8_t *)data ? "true" : "false");
                break;
+       case BLOBMSG_TYPE_INT16:
+               sprintf(buf, "%d", be16_to_cpu(*(uint16_t *)data));
+               break;
        case BLOBMSG_TYPE_INT32:
-               sprintf(buf, "%d", *(uint32_t *)data);
+               sprintf(buf, "%d", be32_to_cpu(*(uint32_t *)data));
                break;
        case BLOBMSG_TYPE_INT64:
-               sprintf(buf, "%lld", (long long int) *(uint64_t *)data);
+               sprintf(buf, "%lld", (long long int) be64_to_cpu(*(uint64_t *)data));
                break;
        case BLOBMSG_TYPE_STRING:
                blobmsg_format_string(s, data);