diff options
| author | Markus Armbruster | 2018-06-14 21:14:38 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2018-06-15 14:49:44 +0200 |
| commit | c78b8cfbfd53737353dc94dfb99c57d72ce31ab5 (patch) | |
| tree | 82ca9c0049bf7145402dddc2ac3d0e2269dd5fb2 /qobject | |
| parent | block-qdict: Clean up qdict_crumple() a bit (diff) | |
| download | qemu-c78b8cfbfd53737353dc94dfb99c57d72ce31ab5.tar.gz qemu-c78b8cfbfd53737353dc94dfb99c57d72ce31ab5.tar.xz qemu-c78b8cfbfd53737353dc94dfb99c57d72ce31ab5.zip | |
block-qdict: Simplify qdict_is_list() some
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qobject')
| -rw-r--r-- | qobject/block-qdict.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c index 36cf58acc8..e51a3d2c0f 100644 --- a/qobject/block-qdict.c +++ b/qobject/block-qdict.c @@ -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"); - return -1; - } + if (is_list == -1) { + 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; - } } } |