dfaggioli/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block-qdict: Tweak qdict_flatten_qdict(), qdict_flatten_qlist()

Browse Source 
qdict_flatten_qdict() skips copying scalars from @qdict to @target
when the two are the same.  Fair enough, but it uses a non-obvious
test for "same".  Replace it by the obvious one.  While there, improve
comments.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster
2018-06-14 21:14:36 +02:00
committed by Kevin Wolf
parent eb0e0f7d3d
commit f1b34a248e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
qobject/block-qdict.c
View File

@@ -71,12 +71,15 @@ static void qdict_flatten_qlist(QList *qlist, QDict *target, const char *prefix)
value = qlist_entry_obj(entry); value = qlist_entry_obj(entry);
new_key = g_strdup_printf("%s.%i", prefix, i); new_key = g_strdup_printf("%s.%i", prefix, i);
/*
* Flatten non-empty QDict and QList recursively into @target,
* copy other objects to @target
*/
if (qobject_type(value) == QTYPE_QDICT) { if (qobject_type(value) == QTYPE_QDICT) {
qdict_flatten_qdict(qobject_to(QDict, value), target, new_key); qdict_flatten_qdict(qobject_to(QDict, value), target, new_key);
} else if (qobject_type(value) == QTYPE_QLIST) { } else if (qobject_type(value) == QTYPE_QLIST) {
qdict_flatten_qlist(qobject_to(QList, value), target, new_key); qdict_flatten_qlist(qobject_to(QList, value), target, new_key);
} else { } else {
/* All other types are moved to the target unchanged. */
qdict_put_obj(target, new_key, qobject_ref(value)); qdict_put_obj(target, new_key, qobject_ref(value));
} }
@@ -101,9 +104,11 @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
new_key = g_strdup_printf("%s.%s", prefix, entry->key); new_key = g_strdup_printf("%s.%s", prefix, entry->key);
} }
/*
* Flatten non-empty QDict and QList recursively into @target,
* copy other objects to @target
*/
if (qobject_type(value) == QTYPE_QDICT) { if (qobject_type(value) == QTYPE_QDICT) {
/* Entries of QDicts are processed recursively, the QDict object
* itself disappears. */
qdict_flatten_qdict(qobject_to(QDict, value), target, qdict_flatten_qdict(qobject_to(QDict, value), target,
new_key ? new_key : entry->key); new_key ? new_key : entry->key);
qdict_del(qdict, entry->key); qdict_del(qdict, entry->key);
@@ -111,8 +116,7 @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
qdict_flatten_qlist(qobject_to(QList, value), target, qdict_flatten_qlist(qobject_to(QList, value), target,
new_key ? new_key : entry->key); new_key ? new_key : entry->key);
qdict_del(qdict, entry->key); qdict_del(qdict, entry->key);
} else if (prefix) { } else if (target != qdict) {
/* All other objects are moved to the target unchanged. */
qdict_put_obj(target, new_key, qobject_ref(value)); qdict_put_obj(target, new_key, qobject_ref(value));
qdict_del(qdict, entry->key); qdict_del(qdict, entry->key);
} }