From patchwork Tue Nov 17 20:32:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 38700 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 0BD0EB6F1C for ; Wed, 18 Nov 2009 10:35:47 +1100 (EST) Received: from localhost ([127.0.0.1]:41586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAUp1-0006v4-Df for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2009 15:38:43 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAUjE-0004Lg-Qy for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:44 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAUj9-0004In-PO for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:44 -0500 Received: from [199.232.76.173] (port=34676 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAUj9-0004IV-FA for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63235) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAUj8-00086S-Um for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:39 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHKWciI028367 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 15:32:38 -0500 Received: from localhost (vpn-11-203.rdu.redhat.com [10.11.11.203]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAHKWaAj024807 for ; Tue, 17 Nov 2009 15:32:37 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 17 Nov 2009 18:32:10 -0200 Message-Id: <1258489944-12159-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1258489944-12159-1-git-send-email-lcapitulino@redhat.com> References: <1258489944-12159-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 03/17] QDict: Introduce qdict_get_qbool() 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 This is a helper function that does type checking before retrieving a QBool from the dictionary. Signed-off-by: Luiz Capitulino --- Makefile | 2 +- qdict.c | 15 +++++++++++++++ qdict.h | 1 + 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index dd48a35..fa41ac9 100644 --- a/Makefile +++ b/Makefile @@ -232,7 +232,7 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx check-qint: check-qint.o qint.o qemu-malloc.o check-qstring: check-qstring.o qstring.o qemu-malloc.o -check-qdict: check-qdict.o qdict.o qint.o qstring.o qemu-malloc.o +check-qdict: check-qdict.o qdict.o qint.o qstring.o qbool.o qemu-malloc.o check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o diff --git a/qdict.c b/qdict.c index 0e04cb1..45e08be 100644 --- a/qdict.c +++ b/qdict.c @@ -12,6 +12,7 @@ #include "qint.h" #include "qdict.h" +#include "qbool.h" #include "qstring.h" #include "qobject.h" #include "qemu-queue.h" @@ -189,6 +190,20 @@ int64_t qdict_get_int(const QDict *qdict, const char *key) } /** + * qdict_get_bool(): Get a bool mapped by 'key' + * + * This function assumes that 'key' exists and it stores a + * QBool object. + * + * Return bool mapped by 'key'. + */ +int qdict_get_bool(const QDict *qdict, const char *key) +{ + QObject *obj = qdict_get_obj(qdict, key, QTYPE_QBOOL); + return qbool_get_int(qobject_to_qbool(obj)); +} + +/** * qdict_get_str(): Get a pointer to the stored string mapped * by 'key' * diff --git a/qdict.h b/qdict.h index 14b2633..1473c04 100644 --- a/qdict.h +++ b/qdict.h @@ -37,6 +37,7 @@ void qdict_iter(const QDict *qdict, /* High level helpers */ int64_t qdict_get_int(const QDict *qdict, const char *key); +int qdict_get_bool(const QDict *qdict, const char *key); const char *qdict_get_str(const QDict *qdict, const char *key); int64_t qdict_get_try_int(const QDict *qdict, const char *key, int64_t err_value);