OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

QJSON: Introduce qobject_from_jsonv()

Browse Source 
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>
This commit is contained in:
Luiz Capitulino 2009-11-18 23:05:24 -02:00 committed by Anthony Liguori
parent b3a219883e
commit 8ff5a7d346
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qjson.c
View File

@ -34,10 +34,12 @@ static void parse_json(JSONMessageParser *parser, QList *tokens)
s->result = json_parser_parse(tokens, s->ap); 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 = {}; JSONParsingState state = {};
state.ap = ap;
json_message_parser_init(&state.parser, parse_json); json_message_parser_init(&state.parser, parse_json);
json_message_parser_feed(&state.parser, string, strlen(string)); json_message_parser_feed(&state.parser, string, strlen(string));
json_message_parser_flush(&state.parser); json_message_parser_flush(&state.parser);
@ -46,22 +48,21 @@ QObject *qobject_from_json(const char *string)
return state.result; return state.result;
} }
QObject *qobject_from_json(const char *string)
{
return qobject_from_jsonv(string, NULL);
}
QObject *qobject_from_jsonf(const char *string, ...) QObject *qobject_from_jsonf(const char *string, ...)
{ {
JSONParsingState state = {}; QObject *obj;
va_list ap; va_list ap;
va_start(ap, string); va_start(ap, string);
state.ap = &ap; obj = qobject_from_jsonv(string, &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);
va_end(ap); va_end(ap);
return state.result; return obj;
} }
typedef struct ToJsonIterState typedef struct ToJsonIterState

2
qjson.h
View File

@ -14,12 +14,14 @@
#ifndef QJSON_H #ifndef QJSON_H
#define QJSON_H #define QJSON_H
#include <stdarg.h>
#include "qobject.h" #include "qobject.h"
#include "qstring.h" #include "qstring.h"
QObject *qobject_from_json(const char *string); QObject *qobject_from_json(const char *string);
QObject *qobject_from_jsonf(const char *string, ...) QObject *qobject_from_jsonf(const char *string, ...)
__attribute__((__format__ (__printf__, 1, 2))); __attribute__((__format__ (__printf__, 1, 2)));
QObject *qobject_from_jsonv(const char *string, va_list *ap);
QString *qobject_to_json(const QObject *obj); QString *qobject_to_json(const QObject *obj);