Re: [Qemu-devel] [PATCH 02/14] check-qdict: Simplify qdict_crumple_test_recursive()

[Markus Armbruster]

Eric Blake  writes:

> On 02/17/2017 02:38 PM, Markus Armbruster wrote:
>> Use qdict_get_qdict(), qdict_get_qlist() instead of qdict_get()
>> followed by qobject_to_qdict(), qobject_to_qlist().
>
> Worth a Coccinelle script to make sure we catch it all?

I'm pretty sure I got them all: I examined all uses of the QType
enumeration constants for this series.

>> 
>> While there, drop some redundant code.
>> 
>> Signed-off-by: Markus Armbruster 
>> ---
>>  tests/check-qdict.c | 25 +
>>  1 file changed, 9 insertions(+), 16 deletions(-)
>> 
>
> Reviewed-by: Eric Blake 

Thanks!

Re: [Qemu-devel] [PATCH 02/14] check-qdict: Simplify qdict_crumple_test_recursive()

[Eric Blake]

On 02/17/2017 02:38 PM, Markus Armbruster wrote:
> Use qdict_get_qdict(), qdict_get_qlist() instead of qdict_get()
> followed by qobject_to_qdict(), qobject_to_qlist().

Worth a Coccinelle script to make sure we catch it all?

> 
> While there, drop some redundant code.
> 
> Signed-off-by: Markus Armbruster 
> ---
>  tests/check-qdict.c | 25 +
>  1 file changed, 9 insertions(+), 16 deletions(-)
> 

Reviewed-by: Eric Blake 

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature

[Qemu-devel] [PATCH 02/14] check-qdict: Simplify qdict_crumple_test_recursive()

[Markus Armbruster]

Use qdict_get_qdict(), qdict_get_qlist() instead of qdict_get()
followed by qobject_to_qdict(), qobject_to_qlist().

While there, drop some redundant code.

Signed-off-by: Markus Armbruster 
---
 tests/check-qdict.c | 25 +
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index 07b1c79..14e942a 100644
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -591,7 +591,7 @@ static void qdict_join_test(void)
 static void qdict_crumple_test_recursive(void)
 {
 QDict *src, *dst, *rule, *vnc, *acl, *listen;
-QObject *child, *res;
+QObject *res;
 QList *rules;
 
 src = qdict_new();
@@ -613,23 +613,19 @@ static void qdict_crumple_test_recursive(void)
 
 g_assert_cmpint(qdict_size(dst), ==, 1);
 
-child = qdict_get(dst, "vnc");
-g_assert_cmpint(qobject_type(child), ==, QTYPE_QDICT);
-vnc = qobject_to_qdict(child);
+vnc = qdict_get_qdict(dst, "vnc");
+g_assert(vnc);
 
-child = qdict_get(vnc, "listen");
-g_assert_cmpint(qobject_type(child), ==, QTYPE_QDICT);
-listen = qobject_to_qdict(child);
+listen = qdict_get_qdict(vnc, "listen");
+g_assert(listen);
 g_assert_cmpstr("127.0.0.1", ==, qdict_get_str(listen, "addr"));
 g_assert_cmpstr("5901", ==, qdict_get_str(listen, "port"));
 
-child = qdict_get(vnc, "acl");
-g_assert_cmpint(qobject_type(child), ==, QTYPE_QDICT);
-acl = qobject_to_qdict(child);
+acl = qdict_get_qdict(vnc, "acl");
+g_assert(acl);
 
-child = qdict_get(acl, "rules");
-g_assert_cmpint(qobject_type(child), ==, QTYPE_QLIST);
-rules = qobject_to_qlist(child);
+rules = qdict_get_qlist(acl, "rules");
+g_assert(rules);
 g_assert_cmpint(qlist_size(rules), ==, 2);
 
 rule = qobject_to_qdict(qlist_pop(rules));
@@ -646,9 +642,6 @@ static void qdict_crumple_test_recursive(void)
 
 /* With recursive crumpling, we should see all names unescaped */
 g_assert_cmpstr("acl0", ==, qdict_get_str(vnc, "acl.name"));
-child = qdict_get(vnc, "acl");
-g_assert_cmpint(qobject_type(child), ==, QTYPE_QDICT);
-acl = qdict_get_qdict(vnc, "acl");
 g_assert_cmpstr("acl0", ==, qdict_get_str(acl, "rule.name"));
 
 QDECREF(src);
-- 
2.7.4