Commit 3692b5d7 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

block-qdict: Clean up qdict_crumple() a bit 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f1b34a24

qobject/block-qdict.c

+16 −16
Original line number Diff line number Diff line
@@ -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);

        if (suffix) {

            QDict *child_dict = qobject_to(QDict, child);

            if (!child_dict) {

        child_dict = qobject_to(QDict, child);



        if (child) {

                    error_setg(errp, "Key %s prefix is already set as a scalar",

                               prefix);

            /*

             * 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) {

            if (!child_dict) {

                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));

        }