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

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

qobject/block-qdict.c

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

    }

}