[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 10/18] block-qdict: Simplify qdict_flatten_qdict()
From: |
Markus Armbruster |
Subject: |
[Qemu-block] [PATCH 10/18] block-qdict: Simplify qdict_flatten_qdict() |
Date: |
Tue, 12 Jun 2018 14:58:13 +0200 |
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 <address@hidden>
---
qobject/block-qdict.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
index 41f39abc4a..f32df343e8 100644
--- a/qobject/block-qdict.c
+++ b/qobject/block-qdict.c
@@ -89,16 +89,13 @@ static void qdict_flatten_qdict(QDict *qdict, QDict
*target, const char *prefix)
QObject *value;
const QDictEntry *entry, *next;
char *new_key;
- bool delete;
entry = qdict_first(qdict);
while (entry != NULL) {
-
next = qdict_next(qdict, entry);
value = qdict_entry_value(entry);
new_key = NULL;
- delete = false;
if (prefix) {
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. */
qdict_flatten_qdict(qobject_to(QDict, value), target,
new_key ? new_key : entry->key);
- delete = true;
+ qdict_del(qdict, entry->key);
} else if (qobject_type(value) == QTYPE_QLIST) {
qdict_flatten_qlist(qobject_to(QList, value), target,
new_key ? new_key : entry->key);
- delete = true;
+ qdict_del(qdict, entry->key);
} else if (prefix) {
/* All other objects are moved to the target unchanged. */
qdict_put_obj(target, new_key, qobject_ref(value));
- delete = true;
- }
-
- g_free(new_key);
-
- if (delete) {
qdict_del(qdict, entry->key);
-
- /* Restart loop after modifying the iterated QDict */
- entry = qdict_first(qdict);
- continue;
}
+ g_free(new_key);
entry = next;
}
}
--
2.17.1
- [Qemu-block] [PATCH 17/18] rbd: New parameter auth-client-required, (continued)
[Qemu-block] [PATCH 10/18] block-qdict: Simplify qdict_flatten_qdict(),
Markus Armbruster <=
[Qemu-block] [PATCH 03/18] block: Add block-specific QDict header, Markus Armbruster, 2018/06/12
[Qemu-block] [PATCH 18/18] rbd: New parameter key-secret, Markus Armbruster, 2018/06/12
[Qemu-block] [PATCH 08/18] block: Factor out qobject_input_visitor_new_flat_confused(), Markus Armbruster, 2018/06/12
[Qemu-block] [PATCH 05/18] block: Fix -blockdev for certain non-string scalars, Markus Armbruster, 2018/06/12
[Qemu-block] [PATCH 16/18] block: Fix -blockdev / blockdev-add for empty objects and arrays, Markus Armbruster, 2018/06/12
[Qemu-block] [PATCH 04/18] qobject: Move block-specific qdict code to block-qdict.c, Markus Armbruster, 2018/06/12