| Message ID | 20180426152805.8469-1-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qobject: Use qobject_to() instead of type cast | expand |
On 04/26/2018 10:28 AM, Markus Armbruster wrote: > 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> > --- > tests/check-qdict.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com>
On Thu, Apr 26, 2018 at 5:28 PM, Markus Armbruster <armbru@redhat.com> wrote: > 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> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > tests/check-qdict.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/check-qdict.c b/tests/check-qdict.c > index a0e0454684..eba5d3528e 100644 > --- a/tests/check-qdict.c > +++ b/tests/check-qdict.c > @@ -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); > > -- > 2.13.6 >
Applied to qapi-next.
diff --git a/tests/check-qdict.c b/tests/check-qdict.c index a0e0454684..eba5d3528e 100644 --- a/tests/check-qdict.c +++ b/tests/check-qdict.c @@ -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);
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> --- tests/check-qdict.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)