From ef749d07e717ca38b7d8b525c81d6b04db5f16ed Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 1 Jun 2011 12:14:50 -0500 Subject: json-parser: propagate error from parser Signed-off-by: Michael Roth Signed-off-by: Anthony Liguori --- json-parser.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'json-parser.c') diff --git a/json-parser.c b/json-parser.c index 6c06ef9..ac4063a 100644 --- a/json-parser.c +++ b/json-parser.c @@ -22,9 +22,11 @@ #include "qbool.h" #include "json-parser.h" #include "json-lexer.h" +#include "qerror.h" typedef struct JSONParserContext { + Error *err; } JSONParserContext; #define BUG_ON(cond) assert(!(cond)) @@ -95,11 +97,15 @@ static void GCC_FMT_ATTR(3, 4) parse_error(JSONParserContext *ctxt, QObject *token, const char *msg, ...) { va_list ap; + char message[1024]; va_start(ap, msg); - fprintf(stderr, "parse error: "); - vfprintf(stderr, msg, ap); - fprintf(stderr, "\n"); + vsnprintf(message, sizeof(message), msg, ap); va_end(ap); + if (ctxt->err) { + error_free(ctxt->err); + ctxt->err = NULL; + } + error_set(&ctxt->err, QERR_JSON_PARSE_ERROR, message); } /** @@ -565,6 +571,11 @@ static QObject *parse_value(JSONParserContext *ctxt, QList **tokens, va_list *ap QObject *json_parser_parse(QList *tokens, va_list *ap) { + return json_parser_parse_err(tokens, ap, NULL); +} + +QObject *json_parser_parse_err(QList *tokens, va_list *ap, Error **errp) +{ JSONParserContext ctxt = {}; QList *working = qlist_copy(tokens); QObject *result; @@ -573,5 +584,7 @@ QObject *json_parser_parse(QList *tokens, va_list *ap) QDECREF(working); + error_propagate(errp, ctxt.err); + return result; } -- cgit v1.1