ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block-qdict: Simplify qdict_flatten_qdict() 

There's no need to restart the loop.  We don't elsewhere, e.g. in
qdict_extract_subqdict(), qdict_join() and qemu_opts_absorb_qdict().
Simplify accordingly.

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:35 +02:00 committed by Kevin Wolf
parent f853465aac
commit eb0e0f7d3d
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qobject/block-qdict.c
View File

@ -89,16 +89,13 @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
QObject *value; QObject *value;
const QDictEntry *entry, *next; const QDictEntry *entry, *next;
char *new_key; char *new_key;
bool delete;
entry = qdict_first(qdict); entry = qdict_first(qdict);
while (entry != NULL) { while (entry != NULL) {
next = qdict_next(qdict, entry); next = qdict_next(qdict, entry);
value = qdict_entry_value(entry); value = qdict_entry_value(entry);
new_key = NULL; new_key = NULL;
delete = false;
if (prefix) { if (prefix) {
new_key = g_strdup_printf("%s.%s", prefix, entry->key); new_key = g_strdup_printf("%s.%s", prefix, entry->key);
@ -109,27 +106,18 @@ static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
* itself disappears. */ * 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);
delete = true; qdict_del(qdict, entry->key);
} else if (qobject_type(value) == QTYPE_QLIST) { } else if (qobject_type(value) == QTYPE_QLIST) {
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);
delete = true; qdict_del(qdict, entry->key);
} else if (prefix) { } else if (prefix) {
/* All other objects are moved to the target unchanged. */ /* 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));
delete = true; qdict_del(qdict, entry->key);
} }
g_free(new_key); g_free(new_key);
if (delete) {
qdict_del(qdict, entry->key);
/* Restart loop after modifying the iterated QDict */
entry = qdict_first(qdict);
continue;
}
entry = next; entry = next;
} }
} }