From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=46979 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Py9SX-0005uc-W0 for qemu-devel@nongnu.org; Fri, 11 Mar 2011 16:01:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Py9SW-0008Me-Fs for qemu-devel@nongnu.org; Fri, 11 Mar 2011 16:01:17 -0500 Received: from e33.co.us.ibm.com ([32.97.110.151]:51947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Py9SW-0008Lh-8h for qemu-devel@nongnu.org; Fri, 11 Mar 2011 16:01:16 -0500 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e33.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p2BKsdmD021235 for ; Fri, 11 Mar 2011 13:54:39 -0700 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2BL1AYw110130 for ; Fri, 11 Mar 2011 14:01:10 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2BL19ZB009009 for ; Fri, 11 Mar 2011 14:01:09 -0700 From: Anthony Liguori Date: Fri, 11 Mar 2011 15:00:45 -0600 Message-Id: <1299877249-13433-8-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1299877249-13433-1-git-send-email-aliguori@us.ibm.com> References: <1299877249-13433-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 07/11] json: propagate error from parser List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , Markus Armbruster , Michael D Roth , Luiz Capitulino Signed-off-by: Anthony Liguori 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; } diff --git a/json-parser.h b/json-parser.h index 97f43f6..8f2b5ec 100644 --- a/json-parser.h +++ b/json-parser.h @@ -16,7 +16,9 @@ #include "qemu-common.h" #include "qlist.h" +#include "error.h" QObject *json_parser_parse(QList *tokens, va_list *ap); +QObject *json_parser_parse_err(QList *tokens, va_list *ap, Error **errp); #endif -- 1.7.0.4