qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com
Subject: [Qemu-devel] [PATCH 01/13] QDict: Rename 'err_value'
Date: Tue, 22 Jun 2010 14:40:39 -0300	[thread overview]
Message-ID: <1277228451-7741-2-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1277228451-7741-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.1.359.gd0b8d

  reply	other threads:[~2010-06-22 17:41 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-22 17:40 [Qemu-devel] [PATCH v2 00/13]: QMP: Replace client argument checker Luiz Capitulino
2010-06-22 17:40 ` Luiz Capitulino [this message]
2010-06-22 17:40 ` [Qemu-devel] [PATCH 02/13] QDict: Small terminology change Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 03/13] QDict: Introduce functions to retrieve QDictEntry values Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 04/13] QDict: Introduce new iteration API Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 05/13] check-qdict: Introduce test for the " Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 06/13] QDict: Introduce qdict_get_try_bool() Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 07/13] Monitor: handle optional '-' arg as a bool Luiz Capitulino
2010-06-23 15:05   ` Markus Armbruster
2010-06-23 16:14     ` Luiz Capitulino
2010-06-23 16:31       ` Markus Armbruster
2010-06-23 16:43         ` Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 08/13] QMP: New argument checker (first part) Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 09/13] QMP: New argument checker (second part) Luiz Capitulino
2010-06-23 15:21   ` Markus Armbruster
2010-06-23 16:28     ` Luiz Capitulino
2010-06-23 17:16       ` Markus Armbruster
2010-06-22 17:40 ` [Qemu-devel] [PATCH 10/13] QMP: Drop old client argument checker Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 11/13] QError: Introduce QERR_QMP_UNEXPECTED_INPUT_OBJECT_MEMBER Luiz Capitulino
2010-06-22 17:40 ` [Qemu-devel] [PATCH 12/13] QMP: Introduce qmp_check_input_obj() Luiz Capitulino
2010-06-23 15:23   ` Markus Armbruster
2010-06-23 16:29     ` Luiz Capitulino
2010-06-23 17:20       ` Markus Armbruster
2010-06-22 17:40 ` [Qemu-devel] [PATCH 13/13] QMP: Drop old input object checking Luiz Capitulino

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=1277228451-7741-2-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=armbru@redhat.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).