motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Make more of qobject_to()

Browse source 
This patch reworks some places which use either qobject_type() checks
plus qobject_to(), where the latter alone is sufficient, or NULL checks
plus qobject_type() checks where we can simply do a qobject_to() != NULL
check.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20180224154033.29559-6-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: rebase to qobject_to() parameter ordering]
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Max Reitz 2018-03-10 16:14:36 -06:00 • committed by Eric Blake
parent cb51b976ba
commit 532fb53284
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
qobject/qdict.c
View file

@ -882,18 +882,20 @@ QObject *qdict_crumple(const QDict *src, Error **errp)
child = qdict_get(two_level, prefix);
if (suffix) {
if (child) {
if (qobject_type(child) != QTYPE_QDICT) {
QDict *child_dict = qobject_to(QDict, child);
if (!child_dict) {
if (child) {
error_setg(errp, "Key %s prefix is already set as a scalar",
prefix);
goto error;
}
} else {
child = QOBJECT(qdict_new());
qdict_put_obj(two_level, prefix, child);
child_dict = qdict_new();
qdict_put_obj(two_level, prefix, QOBJECT(child_dict));
}
qobject_incref(ent->value);
qdict_put_obj(qobject_to(QDict, child), suffix, ent->value);
qdict_put_obj(child_dict, suffix, ent->value);
} else {
if (child) {
error_setg(errp, "Key %s prefix is already set as a dict",
@ -913,9 +915,9 @@ QObject *qdict_crumple(const QDict *src, Error **errp)
multi_level = qdict_new();
for (ent = qdict_first(two_level); ent != NULL;
ent = qdict_next(two_level, ent)) {
if (qobject_type(ent->value) == QTYPE_QDICT) {
child = qdict_crumple(qobject_to(QDict, ent->value), errp);
QDict *dict = qobject_to(QDict, ent->value);
if (dict) {
child = qdict_crumple(dict, errp);
if (!child) {
goto error;
}