From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCfBH-0008Jq-Jp for qemu-devel@nongnu.org; Mon, 23 Nov 2009 15:06:39 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCfBC-0008GI-TC for qemu-devel@nongnu.org; Mon, 23 Nov 2009 15:06:38 -0500 Received: from [199.232.76.173] (port=42671 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCfBC-0008G1-Gz for qemu-devel@nongnu.org; Mon, 23 Nov 2009 15:06:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2226) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCfBB-0001ZK-UM for qemu-devel@nongnu.org; Mon, 23 Nov 2009 15:06:34 -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 nANK6Xtc022596 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 23 Nov 2009 15:06:33 -0500 Received: from localhost (vpn-9-248.rdu.redhat.com [10.11.9.248]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nANK6VQo027920 for ; Mon, 23 Nov 2009 15:06:32 -0500 From: Luiz Capitulino Date: Mon, 23 Nov 2009 18:06:09 -0200 Message-Id: <1259006783-945-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1259006783-945-1-git-send-email-lcapitulino@redhat.com> References: <1259006783-945-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 03/17] QDict: Introduce qdict_get_qbool() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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 35238f5..8b4c4e6 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,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); -- 1.6.5.3.148.g785c5