OSDN Git Service

qobject: Use qobject_to() instead of type cast
authorMarkus Armbruster <armbru@redhat.com>
Thu, 26 Apr 2018 15:28:05 +0000 (17:28 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Fri, 4 May 2018 06:27:53 +0000 (08:27 +0200)
The proper way to convert from (abstract) QObject to a (concrete)
subtype is qobject_to().  Look for offenders that type cast instead:

    $ git-grep '(Q[A-Z][a-z]* \*)'
    hmp.c:    qmp_device_add((QDict *)qdict, NULL, &err);
    include/qapi/qmp/qobject.h:        return (QObject *)obj;
    qobject/qobject.c:static void (*qdestroy[QTYPE__MAX])(QObject *) = {
    tests/check-qdict.c:    dst = (QDict *)qdict_crumple(src, &error_abort);

The first two cast away const, the third isn't a type cast.  Fix the
fourth.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180426152805.8469-1-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
tests/check-qdict.c

index 2e73c2f..08d4303 100644 (file)
@@ -657,7 +657,7 @@ static void qdict_crumple_test_empty(void)
 
     src = qdict_new();
 
-    dst = (QDict *)qdict_crumple(src, &error_abort);
+    dst = qobject_to(QDict, qdict_crumple(src, &error_abort));
 
     g_assert_cmpint(qdict_size(dst), ==, 0);