[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/10] QJSON: Introduce qobject_from_jsonv()
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 01/10] QJSON: Introduce qobject_from_jsonv() |
Date: |
Tue, 17 Nov 2009 17:43:48 -0200 |
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 <address@hidden>
---
qjson.c | 21 +++++++++++----------
qjson.h | 2 ++
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/qjson.c b/qjson.c
index 7270909..12e6cf0 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 = ≈
-
- 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
diff --git a/qjson.h b/qjson.h
index 7fce742..7afec2e 100644
--- a/qjson.h
+++ b/qjson.h
@@ -14,12 +14,14 @@
#ifndef QJSON_H
#define QJSON_H
+#include <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_jsonv(const char *string, va_list *ap);
QString *qobject_to_json(const QObject *obj);
--
1.6.5.2.180.gc5b3e
- [Qemu-devel] [PATCH 00/10]: QError v4, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 01/10] QJSON: Introduce qobject_from_jsonv(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 02/10] QString: Introduce qstring_append_chr(), Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 03/10] QString: Introduce qstring_append_int(), Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 04/10] QString: Introduce qstring_from_substr(), Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 05/10] utests: Add qstring_append_chr() unit-test, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 06/10] utests: Add qstring_from_substr() unit-test, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 07/10] Introduce QError, Luiz Capitulino, 2009/11/17