X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg_json.h;h=9dfc02dcd02f02f143adbc7fc4e28137e0a486e6;hp=9374f42027d4cefca3aca33b146febfd1428af7c;hb=ace64897d47b9bc7af277d8a3f8a0ff67976cba8;hpb=7e9712363b23faf80ba207793fcbcc94bc4bd053

diff --git a/blobmsg_json.h b/blobmsg_json.h
index 9374f42..9dfc02d 100644
--- a/blobmsg_json.h
+++ b/blobmsg_json.h
@@ -1,12 +1,59 @@
+/*
+ * Copyright (C) 2010-2012 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.
+ *
+ * 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.
+ */
 #ifndef __BLOBMSG_JSON_H
 #define __BLOBMSG_JSON_H
 
-#include <json/json.h>
-#include <stdbool.h>
+struct json_object;
 
-struct blob_buf;
+#include <stdbool.h>
+#include "blobmsg.h"
 
-bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object *obj);
+bool blobmsg_add_object(struct blob_buf *b, struct json_object *obj);
+bool blobmsg_add_json_element(struct blob_buf *b, const char *name, struct json_object *obj);
 bool blobmsg_add_json_from_string(struct blob_buf *b, const char *str);
+bool blobmsg_add_json_from_file(struct blob_buf *b, const char *file);
+
+typedef const char *(*blobmsg_json_format_t)(void *priv, struct blob_attr *attr);
+
+char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list,
+				  blobmsg_json_format_t cb, void *priv,
+				  int indent);
+
+static inline char *blobmsg_format_json(struct blob_attr *attr, bool list)
+{
+	return blobmsg_format_json_with_cb(attr, list, NULL, NULL, -1);
+}
+
+static inline char *blobmsg_format_json_indent(struct blob_attr *attr, bool list, int indent)
+{
+	return blobmsg_format_json_with_cb(attr, list, NULL, NULL, indent);
+}
+
+char *blobmsg_format_json_value_with_cb(struct blob_attr *attr,
+					blobmsg_json_format_t cb, void *priv,
+					int indent);
+
+static inline char *blobmsg_format_json_value(struct blob_attr *attr)
+{
+	return blobmsg_format_json_value_with_cb(attr, NULL, NULL, -1);
+}
+
+static inline char *blobmsg_format_json_value_indent(struct blob_attr *attr, int indent)
+{
+	return blobmsg_format_json_value_with_cb(attr, NULL, NULL, indent);
+}
 
 #endif