[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/18] block-qdict: Clean up qdict_crumple() a bit
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 12/18] block-qdict: Clean up qdict_crumple() a bit |
Date: |
Tue, 12 Jun 2018 14:58:15 +0200 |
When you mix scalar and non-scalar keys, whether you get an "already
set as scalar" or an "already set as dict" error depends on qdict
iteration order. Neither message makes much sense. Replace by
""Cannot mix scalar and non-scalar keys". This is similar to the
message we get for mixing list and non-list keys.
I find qdict_crumple()'s first loop hard to understand. Rearrange it
and add a comment.
Signed-off-by: Markus Armbruster <address@hidden>
---
qobject/block-qdict.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
index a4e1c8d08f..35e9052816 100644
--- a/qobject/block-qdict.c
+++ b/qobject/block-qdict.c
@@ -403,7 +403,7 @@ static int qdict_is_list(QDict *maybe_list, Error **errp)
QObject *qdict_crumple(const QDict *src, Error **errp)
{
const QDictEntry *ent;
- QDict *two_level, *multi_level = NULL;
+ QDict *two_level, *multi_level = NULL, *child_dict;
QObject *dst = NULL, *child;
size_t i;
char *prefix = NULL;
@@ -422,29 +422,29 @@ QObject *qdict_crumple(const QDict *src, Error **errp)
}
qdict_split_flat_key(ent->key, &prefix, &suffix);
-
child = qdict_get(two_level, prefix);
+ child_dict = qobject_to(QDict, child);
+
+ if (child) {
+ /*
+ * An existing child must be a dict and @ent must be a
+ * dict member (i.e. suffix not null), or else @ent
+ * clashes.
+ */
+ if (!child_dict || !suffix) {
+ error_setg(errp,
+ "Cannot mix scalar and non-scalar keys");
+ goto error;
+ }
+ } else if (suffix) {
+ child_dict = qdict_new();
+ qdict_put(two_level, prefix, child_dict);
+ } else {
+ qdict_put_obj(two_level, prefix, qobject_ref(ent->value));
+ }
+
if (suffix) {
- 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;
- }
-
- child_dict = qdict_new();
- qdict_put_obj(two_level, prefix, QOBJECT(child_dict));
- }
-
qdict_put_obj(child_dict, suffix, qobject_ref(ent->value));
- } else {
- if (child) {
- error_setg(errp, "Key %s prefix is already set as a dict",
- prefix);
- goto error;
- }
- qdict_put_obj(two_level, prefix, qobject_ref(ent->value));
}
g_free(prefix);
--
2.17.1
- [Qemu-devel] [PATCH 00/18] block: Configuration fixes and rbd authentication, Markus Armbruster, 2018/06/12
- [Qemu-devel] [PATCH 10/18] block-qdict: Simplify qdict_flatten_qdict(), Markus Armbruster, 2018/06/12
- [Qemu-devel] [PATCH 01/18] rbd: Drop deprecated -drive parameter "filename", Markus Armbruster, 2018/06/12
- [Qemu-devel] [PATCH 15/18] check-block-qdict: Cover flattening of empty lists and dictionaries, Markus Armbruster, 2018/06/12
- [Qemu-devel] [PATCH 11/18] block-qdict: Tweak qdict_flatten_qdict(), qdict_flatten_qlist(), Markus Armbruster, 2018/06/12
- [Qemu-devel] [PATCH 12/18] block-qdict: Clean up qdict_crumple() a bit,
Markus Armbruster <=
[Qemu-devel] [PATCH 02/18] iscsi: Drop deprecated -drive parameter "filename", Markus Armbruster, 2018/06/12
[Qemu-devel] [PATCH 06/18] block: Fix -drive for certain non-string scalars, Markus Armbruster, 2018/06/12
[Qemu-devel] [PATCH 14/18] check-block-qdict: Rename qdict_flatten()'s variables for clarity, Markus Armbruster, 2018/06/12