qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: aliguori@us.ibm.com
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 09/23] QDict: Rename 'err_value'
Date: Thu,  1 Jul 2010 16:21:37 -0300	[thread overview]
Message-ID: <1278012111-26227-10-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1278012111-26227-1-git-send-email-lcapitulino@redhat.com>

A missing key is not an error.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 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

  parent reply	other threads:[~2010-07-01 19:22 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-01 19:21 [Qemu-devel] [PATCH 00/23][PULL]: QMP/Monitor queue Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 01/23] monitor: Fix leakage during completion processing Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 02/23] monitor: Fix command completion vs. boolean switches Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 03/23] monitor: Establish cmd flags and convert the async tag Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 04/23] QMP: Teach basic capability negotiation to python example Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 05/23] QMP: Fix python helper /wrt long return strings Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 06/23] net: delete QemuOpts when net_client_init() fails Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 07/23] QMP: Fix error reporting in the async API Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 08/23] QError: Enhance QERR_DEVICE_NOT_ACTIVE's user desc Luiz Capitulino
2010-07-01 19:21 ` Luiz Capitulino [this message]
2010-07-01 19:21 ` [Qemu-devel] [PATCH 10/23] QDict: Small terminology change Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 11/23] QDict: Introduce functions to retrieve QDictEntry values Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 12/23] QDict: Introduce new iteration API Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 13/23] check-qdict: Introduce test for the " Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 14/23] QDict: Introduce qdict_get_try_bool() Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 15/23] Monitor: handle optional '-' arg as a bool Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 16/23] QMP: New argument checker (first part) Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 17/23] QMP: New argument checker (second part) Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 18/23] QMP: Drop old client argument checker Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 19/23] QError: Introduce QERR_QMP_EXTRA_MEMBER Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 20/23] QMP: Introduce qmp_check_input_obj() Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 21/23] QMP: Drop old input object checking Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 22/23] QMP: handle_qmp_command(): Small cleanup Luiz Capitulino
2010-07-01 19:21 ` [Qemu-devel] [PATCH 23/23] monitor: Allow to exclude commands from QMP Luiz Capitulino
2010-07-06 15:44 ` [Qemu-devel] [PATCH 00/23][PULL]: QMP/Monitor queue Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1278012111-26227-10-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).