Luiz Capitulino wrote:
Accepts a va_list, will be used by QError.
Signed-off-by: Luiz Capitulino <lcapitul...@redhat.com>
---
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;
+}
+
qobject_from_jsonf() should just call qobject_from_json_va().
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 <stdarg.h>
qemu-common.h is a better way to get stdarg.h
#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);
Regards,
Anthony Liguori
