From patchwork Thu Nov 19 01:05:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 38796 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C99751007D1 for ; Thu, 19 Nov 2009 12:08:05 +1100 (EST) Received: from localhost ([127.0.0.1]:60499 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAvVC-00043Z-Ng for incoming@patchwork.ozlabs.org; Wed, 18 Nov 2009 20:08:02 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAvTI-0003Cq-2m for qemu-devel@nongnu.org; Wed, 18 Nov 2009 20:06:04 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAvTB-0003AW-V2 for qemu-devel@nongnu.org; Wed, 18 Nov 2009 20:06:02 -0500 Received: from [199.232.76.173] (port=35026 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAvTB-0003AM-QR for qemu-devel@nongnu.org; Wed, 18 Nov 2009 20:05:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29878) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAvTB-0008An-98 for qemu-devel@nongnu.org; Wed, 18 Nov 2009 20:05:57 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAJ15uml021763 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 18 Nov 2009 20:05:56 -0500 Received: from localhost (vpn-11-188.rdu.redhat.com [10.11.11.188]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAJ15tKt006468; Wed, 18 Nov 2009 20:05:56 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 18 Nov 2009 23:05:24 -0200 Message-Id: <1258592736-10252-2-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1258592736-10252-1-git-send-email-lcapitulino@redhat.com> References: <1258592736-10252-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, kraxel@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 01/13] QJSON: Introduce qobject_from_jsonv() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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 #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);