qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com
Subject: [Qemu-devel] [PATCH 1/5] QDict: Fix size update
Date: Mon, 14 Dec 2009 18:53:20 -0200	[thread overview]
Message-ID: <1260824004-2941-2-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1260824004-2941-1-git-send-email-lcapitulino@redhat.com>

Key replacement should not update the dictionary's size.

This commit also adds a test for the bug.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 check-qdict.c |    2 ++
 qdict.c       |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/check-qdict.c b/check-qdict.c
index c37d448..f2b4826 100644
--- a/check-qdict.c
+++ b/check-qdict.c
@@ -205,6 +205,8 @@ START_TEST(qdict_put_exists_test)
 
     value = qdict_get_int(tests_dict, key);
     fail_unless(value == 2);
+
+    fail_unless(qdict_size(tests_dict) == 1);
 }
 END_TEST
 
diff --git a/qdict.c b/qdict.c
index ef73265..ba8eef0 100644
--- a/qdict.c
+++ b/qdict.c
@@ -122,9 +122,8 @@ void qdict_put_obj(QDict *qdict, const char *key, QObject *value)
         /* allocate a new entry */
         entry = alloc_entry(key, value);
         QLIST_INSERT_HEAD(&qdict->table[hash], entry, next);
+        qdict->size++;
     }
-
-    qdict->size++;
 }
 
 /**
-- 
1.6.6.rc2.5.g49666

  reply	other threads:[~2009-12-14 20:53 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-14 20:53 [Qemu-devel] [FOR 0.12 0/5]: Misc QMP related fixes Luiz Capitulino
2009-12-14 20:53 ` Luiz Capitulino [this message]
2009-12-14 20:53 ` [Qemu-devel] [PATCH 2/5] monitor: Use 'device' in eject Luiz Capitulino
2009-12-14 20:53 ` [Qemu-devel] [PATCH 3/5] monitor: do_balloon(): Check for errors Luiz Capitulino
2009-12-14 20:53 ` [Qemu-devel] [PATCH 4/5] monitor: Avoid readline functions in QMP Luiz Capitulino
2009-12-15  9:50   ` Markus Armbruster
2009-12-15  9:54     ` Markus Armbruster
2009-12-15 12:08       ` Luiz Capitulino
2009-12-15 14:03         ` Markus Armbruster
2009-12-15 14:17         ` [Qemu-devel] " Jan Kiszka
2009-12-14 20:53 ` [Qemu-devel] [PATCH 5/5] monitor: Catch printing to non-existent monitor Luiz Capitulino
2009-12-15  9:42   ` Markus Armbruster
2009-12-15 12:02     ` Luiz Capitulino
2009-12-15 13:56       ` Markus Armbruster

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=1260824004-2941-2-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).