[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/18] block-qdict: Clean up qdict_crumple() a bi
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 12/18] block-qdict: Clean up qdict_crumple() a bit |
Date: |
Thu, 14 Jun 2018 21:14:37 +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 | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
index a4e1c8d08f..36cf58acc8 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,28 +422,28 @@ 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) {
+ /*
+ * If @child_dict, then all previous keys with this prefix
+ * had a suffix. If @suffix, this one has one as well,
+ * and we're good, else there's a clash.
+ */
+ if (!child_dict || !suffix) {
+ error_setg(errp, "Cannot mix scalar and non-scalar keys");
+ goto error;
+ }
+ }
+
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(two_level, prefix, 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));
}
--
2.17.1
- [Qemu-devel] [PATCH v2 00/18] block: Configuration fixes and rbd authentication, Markus Armbruster, 2018/06/14
- [Qemu-devel] [PATCH v2 01/18] rbd: Drop deprecated -drive parameter "filename", Markus Armbruster, 2018/06/14
- [Qemu-devel] [PATCH v2 12/18] block-qdict: Clean up qdict_crumple() a bit,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 02/18] iscsi: Drop deprecated -drive parameter "filename", Markus Armbruster, 2018/06/14
- [Qemu-devel] [PATCH v2 14/18] check-block-qdict: Rename qdict_flatten()'s variables for clarity, Markus Armbruster, 2018/06/14
- [Qemu-devel] [PATCH v2 09/18] block: Make remaining uses of qobject input visitor more robust, Markus Armbruster, 2018/06/14
- [Qemu-devel] [PATCH v2 11/18] block-qdict: Tweak qdict_flatten_qdict(), qdict_flatten_qlist(), Markus Armbruster, 2018/06/14
- [Qemu-devel] [PATCH v2 18/18] rbd: New parameter key-secret, Markus Armbruster, 2018/06/14
- [Qemu-devel] [PATCH v2 03/18] block: Add block-specific QDict header, Markus Armbruster, 2018/06/14
- [Qemu-devel] [PATCH v2 13/18] block-qdict: Simplify qdict_is_list() some, Markus Armbruster, 2018/06/14
- [Qemu-devel] [PATCH v2 15/18] check-block-qdict: Cover flattening of empty lists and dictionaries, Markus Armbruster, 2018/06/14