[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 10/45] qemu-option: Simplify around find_default_by_name()
From: |
Markus Armbruster |
Subject: |
[PATCH v4 10/45] qemu-option: Simplify around find_default_by_name() |
Date: |
Tue, 7 Jul 2020 18:05:38 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
util/qemu-option.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 14e211ddd8..e7b540a21b 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -277,7 +277,6 @@ static void qemu_opt_del_all(QemuOpts *opts, const char
*name)
const char *qemu_opt_get(QemuOpts *opts, const char *name)
{
QemuOpt *opt;
- const char *def_val;
if (opts == NULL) {
return NULL;
@@ -285,12 +284,10 @@ const char *qemu_opt_get(QemuOpts *opts, const char *name)
opt = qemu_opt_find(opts, name);
if (!opt) {
- def_val = find_default_by_name(opts, name);
- if (def_val) {
- return def_val;
- }
+ return find_default_by_name(opts, name);
}
- return opt ? opt->str : NULL;
+
+ return opt->str;
}
void qemu_opt_iter_init(QemuOptsIter *iter, QemuOpts *opts, const char *name)
@@ -319,8 +316,7 @@ const char *qemu_opt_iter_next(QemuOptsIter *iter)
char *qemu_opt_get_del(QemuOpts *opts, const char *name)
{
QemuOpt *opt;
- const char *def_val;
- char *str = NULL;
+ char *str;
if (opts == NULL) {
return NULL;
@@ -328,11 +324,7 @@ char *qemu_opt_get_del(QemuOpts *opts, const char *name)
opt = qemu_opt_find(opts, name);
if (!opt) {
- def_val = find_default_by_name(opts, name);
- if (def_val) {
- str = g_strdup(def_val);
- }
- return str;
+ return g_strdup(find_default_by_name(opts, name));
}
str = opt->str;
opt->str = NULL;
--
2.26.2
- Re: [PATCH v4 03/45] error: Document Error API usage rules, (continued)
[PATCH v4 11/45] qemu-option: Factor out helper opt_create(), Markus Armbruster, 2020/07/07
[PATCH v4 04/45] qdev: Use returned bool to check for qdev_realize() etc. failure, Markus Armbruster, 2020/07/07
[PATCH v4 12/45] qemu-option: Replace opt_set() by cleaner opt_validate(), Markus Armbruster, 2020/07/07
[PATCH v4 08/45] qemu-option: Make uses of find_desc_by_name() more similar, Markus Armbruster, 2020/07/07
[PATCH v4 15/45] block: Avoid error accumulation in bdrv_img_create(), Markus Armbruster, 2020/07/07
[PATCH v4 09/45] qemu-option: Factor out helper find_default_by_name(), Markus Armbruster, 2020/07/07
[PATCH v4 23/45] qom: Crash more nicely on object_property_get_link() failure, Markus Armbruster, 2020/07/07
[PATCH v4 13/45] qemu-option: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/07
[PATCH v4 10/45] qemu-option: Simplify around find_default_by_name(),
Markus Armbruster <=
[PATCH v4 30/45] qom: Make functions taking Error ** return bool, not 0/-1, Markus Armbruster, 2020/07/07
[PATCH v4 14/45] qemu-option: Use returned bool to check for failure, Markus Armbruster, 2020/07/07
[PATCH v4 20/45] s390x/pci: Fix harmless mistake in zpci's property fid's setter, Markus Armbruster, 2020/07/07
[PATCH v4 06/45] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/07/07
[PATCH v4 07/45] qemu-option: Check return value instead of @err where convenient, Markus Armbruster, 2020/07/07
[PATCH v4 19/45] qapi: Use returned bool to check for failure, manual part, Markus Armbruster, 2020/07/07
[PATCH v4 29/45] qom: Use returned bool to check for failure, manual part, Markus Armbruster, 2020/07/07
[PATCH v4 31/45] qdev: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/07
[PATCH v4 24/45] qom: Don't handle impossible object_property_get_link() failure, Markus Armbruster, 2020/07/07