From 7dc847ebba953db90853d15f140c20eef74d4fb2 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Sat, 24 Feb 2018 16:40:29 +0100 Subject: qapi: Replace qobject_to_X(o) by qobject_to(X, o) This patch was generated using the following Coccinelle script: @@ expression Obj; @@ ( - qobject_to_qnum(Obj) + qobject_to(QNum, Obj) | - qobject_to_qstring(Obj) + qobject_to(QString, Obj) | - qobject_to_qdict(Obj) + qobject_to(QDict, Obj) | - qobject_to_qlist(Obj) + qobject_to(QList, Obj) | - qobject_to_qbool(Obj) + qobject_to(QBool, Obj) ) and a bit of manual fix-up for overly long lines and three places in tests/check-qjson.c that Coccinelle did not find. Signed-off-by: Max Reitz Reviewed-by: Alberto Garcia Message-Id: <20180224154033.29559-4-mreitz@redhat.com> Reviewed-by: Eric Blake [eblake: swap order from qobject_to(o, X), rebase to master, also a fix to latent false-positive compiler complaint about hw/i386/acpi-build.c] Signed-off-by: Eric Blake --- tests/check-qlit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/check-qlit.c') diff --git a/tests/check-qlit.c b/tests/check-qlit.c index 836f4a3090..96bbb06f2c 100644 --- a/tests/check-qlit.c +++ b/tests/check-qlit.c @@ -59,7 +59,7 @@ static void qlit_equal_qobject_test(void) g_assert(!qlit_equal_qobject(&qlit_foo, qobj)); - qdict_put(qobject_to_qdict(qobj), "bee", qlist_new()); + qdict_put(qobject_to(QDict, qobj), "bee", qlist_new()); g_assert(!qlit_equal_qobject(&qlit, qobj)); qobject_decref(qobj); @@ -71,20 +71,20 @@ static void qobject_from_qlit_test(void) QDict *qdict; QList *bee; - qdict = qobject_to_qdict(qobj); + qdict = qobject_to(QDict, qobj); g_assert_cmpint(qdict_get_int(qdict, "foo"), ==, 42); g_assert_cmpstr(qdict_get_str(qdict, "bar"), ==, "hello world"); g_assert(qobject_type(qdict_get(qdict, "baz")) == QTYPE_QNULL); bee = qdict_get_qlist(qdict, "bee"); obj = qlist_pop(bee); - g_assert_cmpint(qnum_get_int(qobject_to_qnum(obj)), ==, 43); + g_assert_cmpint(qnum_get_int(qobject_to(QNum, obj)), ==, 43); qobject_decref(obj); obj = qlist_pop(bee); - g_assert_cmpint(qnum_get_int(qobject_to_qnum(obj)), ==, 44); + g_assert_cmpint(qnum_get_int(qobject_to(QNum, obj)), ==, 44); qobject_decref(obj); obj = qlist_pop(bee); - g_assert(qbool_get_bool(qobject_to_qbool(obj))); + g_assert(qbool_get_bool(qobject_to(QBool, obj))); qobject_decref(obj); qobject_decref(qobj); -- cgit v1.2.3-55-g7522