aboutsummaryrefslogtreecommitdiffstats
path: root/qjson.c
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2009-11-18 23:05:24 -0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-03 09:41:18 -0600
commit8ff5a7d346b932fbae49d08d8824d0cc15c3ed3c (patch)
treefc1ee23ae445b9b4db10417c1af648a49d5ced32 /qjson.c
parentb3a219883ebe21f55a8ee5e7e5b38b9eb309e9c0 (diff)
QJSON: Introduce qobject_from_jsonv()
It accepts a va_list and will be used by QError. Also simplifies the code a little, as the other qobject_from_() functions can use it. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qjson.c')
-rw-r--r--qjson.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/qjson.c b/qjson.c
index 7270909af..12e6cf0d0 100644
--- a/qjson.c
+++ b/qjson.c
@@ -34,10 +34,12 @@ static void parse_json(JSONMessageParser *parser, QList *tokens)
s->result = json_parser_parse(tokens, s->ap);
}
-QObject *qobject_from_json(const char *string)
+QObject *qobject_from_jsonv(const char *string, va_list *ap)
{
JSONParsingState state = {};
+ state.ap = ap;
+
json_message_parser_init(&state.parser, parse_json);
json_message_parser_feed(&state.parser, string, strlen(string));
json_message_parser_flush(&state.parser);
@@ -46,22 +48,21 @@ QObject *qobject_from_json(const char *string)
return state.result;
}
+QObject *qobject_from_json(const char *string)
+{
+ return qobject_from_jsonv(string, NULL);
+}
+
QObject *qobject_from_jsonf(const char *string, ...)
{
- JSONParsingState state = {};
+ QObject *obj;
va_list ap;
va_start(ap, string);
- state.ap = &ap;
-
- json_message_parser_init(&state.parser, parse_json);
- json_message_parser_feed(&state.parser, string, strlen(string));
- json_message_parser_flush(&state.parser);
- json_message_parser_destroy(&state.parser);
-
+ obj = qobject_from_jsonv(string, &ap);
va_end(ap);
- return state.result;
+ return obj;
}
typedef struct ToJsonIterState