Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.openwrt.org/project/libubox.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-05-29 14:14:40 +0400
committerFelix Fietkau <nbd@openwrt.org>2013-05-29 14:14:48 +0400
commit54a0b49326904fc3281c72cd9d9f1fe950e39d05 (patch)
treeebbf9531e88cf097f6f29d8072b753d696c07cc9 /blobmsg_json.c
parentc4b79e4b5448abcd04c1848e212a237e8b17c3de (diff)
blobmsg_json: add blobmsg_add_json_from_file
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'blobmsg_json.c')
-rw-r--r--blobmsg_json.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/blobmsg_json.c b/blobmsg_json.c
index f166358..7a4ab7b 100644
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -71,12 +71,10 @@ bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
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;
@@ -90,6 +88,16 @@ out:
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;