From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37665 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUPLA-0006WX-7r for qemu-devel@nongnu.org; Thu, 01 Jul 2010 15:22:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUPL1-0007Kq-0b for qemu-devel@nongnu.org; Thu, 01 Jul 2010 15:22:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53455) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUPL0-0007Kj-No for qemu-devel@nongnu.org; Thu, 01 Jul 2010 15:22:18 -0400 From: Luiz Capitulino Date: Thu, 1 Jul 2010 16:21:37 -0300 Message-Id: <1278012111-26227-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1278012111-26227-1-git-send-email-lcapitulino@redhat.com> References: <1278012111-26227-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 09/23] QDict: Rename 'err_value' List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: qemu-devel@nongnu.org A missing key is not an error. Signed-off-by: Luiz Capitulino --- qdict.c | 6 +++--- qdict.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qdict.c b/qdict.c index 175bc17..c974d6f 100644 --- a/qdict.c +++ b/qdict.c @@ -272,16 +272,16 @@ const char *qdict_get_str(const QDict *qdict, const char *key) * * Return integer mapped by 'key', if it is not present in * the dictionary or if the stored object is not of QInt type - * 'err_value' will be returned. + * 'def_value' will be returned. */ int64_t qdict_get_try_int(const QDict *qdict, const char *key, - int64_t err_value) + int64_t def_value) { QObject *obj; obj = qdict_get(qdict, key); if (!obj || qobject_type(obj) != QTYPE_QINT) - return err_value; + return def_value; return qint_get_int(qobject_to_qint(obj)); } diff --git a/qdict.h b/qdict.h index 5e5902c..72ea563 100644 --- a/qdict.h +++ b/qdict.h @@ -56,7 +56,7 @@ QList *qdict_get_qlist(const QDict *qdict, const char *key); QDict *qdict_get_qdict(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); + int64_t def_value); const char *qdict_get_try_str(const QDict *qdict, const char *key); #endif /* QDICT_H */ -- 1.7.2.rc0