Permalink
Browse files

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>
  • Loading branch information...
1 parent b3a2198 commit 8ff5a7d346b932fbae49d08d8824d0cc15c3ed3c Luiz Capitulino committed with Anthony Liguori Nov 19, 2009
Showing with 13 additions and 10 deletions.
  1. +11 −10 qjson.c
  2. +2 −0 qjson.h
View
21 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
View
@@ -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);

0 comments on commit 8ff5a7d

Please sign in to comment.