From 06db68cfc94ef696f30a41302b74c39b77096d06 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Mon, 22 Mar 2010 14:23:39 -0300 Subject: [PATCH 14/29] QDict: New qdict_get_double() RH-Author: Luiz Capitulino Message-id: <1269267825-8627-3-git-send-email-lcapitulino@redhat.com> Patchwork-id: 7969 O-Subject: [PATCH 2/8] QDict: New qdict_get_double() Bugzilla: 575821 RH-Acked-by: Markus Armbruster RH-Acked-by: Kevin Wolf RH-Acked-by: Juan Quintela From: Markus Armbruster Helper function just like qdict_get_int(), just for QFloat/double. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori (cherry picked from commit acc3b0336c24a0f8c2a9638fb7ae8580484b59ca) --- Makefile | 2 +- qdict.c | 24 ++++++++++++++++++++++++ qdict.h | 1 + 3 files changed, 26 insertions(+), 1 deletions(-) Signed-off-by: Eduardo Habkost --- Makefile | 2 +- qdict.c | 24 ++++++++++++++++++++++++ qdict.h | 1 + 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index dc67e32..5235d9c 100644 --- a/Makefile +++ b/Makefile @@ -260,7 +260,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 qbool.o qemu-malloc.o qlist.o +check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.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 ba8eef0..32119cf 100644 --- a/qdict.c +++ b/qdict.c @@ -11,6 +11,7 @@ */ #include "qint.h" +#include "qfloat.h" #include "qdict.h" #include "qbool.h" #include "qstring.h" @@ -175,6 +176,29 @@ static QObject *qdict_get_obj(const QDict *qdict, const char *key, } /** + * qdict_get_double(): Get an number mapped by 'key' + * + * This function assumes that 'key' exists and it stores a + * QFloat or QInt object. + * + * Return number mapped by 'key'. + */ +double qdict_get_double(const QDict *qdict, const char *key) +{ + QObject *obj = qdict_get(qdict, key); + + assert(obj); + switch (qobject_type(obj)) { + case QTYPE_QFLOAT: + return qfloat_get_double(qobject_to_qfloat(obj)); + case QTYPE_QINT: + return qint_get_int(qobject_to_qint(obj)); + default: + assert(0); + } +} + +/** * qdict_get_int(): Get an integer mapped by 'key' * * This function assumes that 'key' exists and it stores a diff --git a/qdict.h b/qdict.h index 5fef1ea..5649ccf 100644 --- a/qdict.h +++ b/qdict.h @@ -37,6 +37,7 @@ void qdict_iter(const QDict *qdict, qdict_put_obj(qdict, key, QOBJECT(obj)) /* High level helpers */ +double qdict_get_double(const QDict *qdict, const char *key); int64_t qdict_get_int(const QDict *qdict, const char *key); int qdict_get_bool(const QDict *qdict, const char *key); QList *qdict_get_qlist(const QDict *qdict, const char *key); -- 1.7.0.3