From patchwork Thu Nov 12 20:42:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/9] QJSON: Introduce qobject_from_json_va() From: Luiz Capitulino X-Patchwork-Id: 38278 Message-Id: <1258058554-22872-2-git-send-email-lcapitulino@redhat.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, kraxel@redhat.com, armbru@redhat.com Date: Thu, 12 Nov 2009 18:42:26 -0200 Accepts a va_list, will be used by QError. Signed-off-by: Luiz Capitulino --- qjson.c | 14 ++++++++++++++ qjson.h | 2 ++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/qjson.c b/qjson.c index 7270909..491b61e 100644 --- a/qjson.c +++ b/qjson.c @@ -64,6 +64,20 @@ QObject *qobject_from_jsonf(const char *string, ...) return state.result; } +QObject *qobject_from_json_va(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); + json_message_parser_destroy(&state.parser); + + return state.result; +} + typedef struct ToJsonIterState { int count; diff --git a/qjson.h b/qjson.h index 7fce742..8b89e41 100644 --- a/qjson.h +++ b/qjson.h @@ -14,12 +14,14 @@ #ifndef QJSON_H #define QJSON_H +#include #include "qobject.h" #include "qstring.h" QObject *qobject_from_json(const char *string); QObject *qobject_from_jsonf(const char *string, ...) __attribute__((__format__ (__printf__, 1, 2))); +QObject *qobject_from_json_va(const char *string, va_list *ap); QString *qobject_to_json(const QObject *obj);