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

block-qdict: Simplify qdict_is_list() some 



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 3692b5d7

qobject/block-qdict.c

+11 −16
Original line number Diff line number Diff line
@@ -317,27 +317,22 @@ static int qdict_is_list(QDict *maybe_list, Error **errp) 


    for (ent = qdict_first(maybe_list); ent != NULL;

         ent = qdict_next(maybe_list, ent)) {

        int is_index = !qemu_strtoi64(ent->key, NULL, 10, &val);



        if (qemu_strtoi64(ent->key, NULL, 10, &val) == 0) {

        if (is_list == -1) {

                is_list = 1;

            } else if (!is_list) {

                error_setg(errp,

                           "Cannot mix list and non-list keys");

            is_list = is_index;

        }



        if (is_index != is_list) {

            error_setg(errp, "Cannot mix list and non-list keys");

            return -1;

        }



        if (is_index) {

            len++;

            if (val > max) {

                max = val;

            }

        } else {

            if (is_list == -1) {

                is_list = 0;

            } else if (is_list) {

                error_setg(errp,

                           "Cannot mix list and non-list keys");

                return -1;

            }

        }

    }