[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 for-5.1 7/9] qemu-img: Factor out accumulate_options() helper
From: |
Markus Armbruster |
Subject: |
[PATCH v2 for-5.1 7/9] qemu-img: Factor out accumulate_options() helper |
Date: |
Wed, 15 Apr 2020 09:49:25 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
qemu-img.c | 59 +++++++++++++++++++++---------------------------------
1 file changed, 23 insertions(+), 36 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 821cbf610e..d36b21b758 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -223,6 +223,25 @@ static bool qemu_img_object_print_help(const char *type,
QemuOpts *opts)
return true;
}
+static int accumulate_options(char **options, char *optarg)
+{
+ char *new_options;
+
+ if (!is_valid_option_list(optarg)) {
+ error_report("Invalid option list: %s", optarg);
+ return -1;
+ }
+
+ if (!*options) {
+ *options = g_strdup(optarg);
+ } else {
+ new_options = g_strdup_printf("%s,%s", *options, optarg);
+ g_free(*options);
+ *options = new_options;
+ }
+ return 0;
+}
+
static QemuOptsList qemu_source_opts = {
.name = "source",
.implied_opt_name = "file",
@@ -482,17 +501,9 @@ static int img_create(int argc, char **argv)
fmt = optarg;
break;
case 'o':
- if (!is_valid_option_list(optarg)) {
- error_report("Invalid option list: %s", optarg);
+ if (accumulate_options(&options, optarg) < 0) {
goto fail;
}
- if (!options) {
- options = g_strdup(optarg);
- } else {
- char *old_options = options;
- options = g_strdup_printf("%s,%s", options, optarg);
- g_free(old_options);
- }
break;
case 'q':
quiet = true;
@@ -2127,17 +2138,9 @@ static int img_convert(int argc, char **argv)
s.compressed = true;
break;
case 'o':
- if (!is_valid_option_list(optarg)) {
- error_report("Invalid option list: %s", optarg);
+ if (accumulate_options(&options, optarg) < 0) {
goto fail_getopt;
}
- if (!options) {
- options = g_strdup(optarg);
- } else {
- char *old_options = options;
- options = g_strdup_printf("%s,%s", options, optarg);
- g_free(old_options);
- }
break;
case 'l':
if (strstart(optarg, SNAPSHOT_OPT_BASE, NULL)) {
@@ -3953,18 +3956,10 @@ static int img_amend(int argc, char **argv)
help();
break;
case 'o':
- if (!is_valid_option_list(optarg)) {
- error_report("Invalid option list: %s", optarg);
+ if (accumulate_options(&options, optarg) < 0) {
ret = -1;
goto out_no_progress;
}
- if (!options) {
- options = g_strdup(optarg);
- } else {
- char *old_options = options;
- options = g_strdup_printf("%s,%s", options, optarg);
- g_free(old_options);
- }
break;
case 'f':
fmt = optarg;
@@ -4855,17 +4850,9 @@ static int img_measure(int argc, char **argv)
out_fmt = optarg;
break;
case 'o':
- if (!is_valid_option_list(optarg)) {
- error_report("Invalid option list: %s", optarg);
+ if (accumulate_options(&options, optarg) < 0) {
goto out;
}
- if (!options) {
- options = g_strdup(optarg);
- } else {
- char *old_options = options;
- options = g_strdup_printf("%s,%s", options, optarg);
- g_free(old_options);
- }
break;
case 'l':
if (strstart(optarg, SNAPSHOT_OPT_BASE, NULL)) {
--
2.21.1
- [PATCH v2 for-5.1 0/9] qemu-option: Fix corner cases and clean up, Markus Armbruster, 2020/04/15
- [PATCH v2 for-5.1 3/9] qemu-option: Fix sloppy recognition of "id=..." after ", , ", Markus Armbruster, 2020/04/15
- [PATCH v2 for-5.1 2/9] qemu-options: Factor out get_opt_name_value() helper, Markus Armbruster, 2020/04/15
- [PATCH v2 for-5.1 1/9] tests-qemu-opts: Cover has_help_option(), qemu_opt_has_help_opt(), Markus Armbruster, 2020/04/15
- [PATCH v2 for-5.1 5/9] test-qemu-opts: Simplify test_has_help_option() after bug fix, Markus Armbruster, 2020/04/15
- [PATCH v2 for-5.1 6/9] qemu-option: Avoid has_help_option() in qemu_opts_parse_noisily(), Markus Armbruster, 2020/04/15
- [PATCH v2 for-5.1 4/9] qemu-option: Fix has_help_option()'s sloppy parsing, Markus Armbruster, 2020/04/15
- [PATCH v2 for-5.1 7/9] qemu-img: Factor out accumulate_options() helper,
Markus Armbruster <=
- [PATCH v2 for-5.1 9/9] qemu-img: Reject broken -o "", Markus Armbruster, 2020/04/15
- [PATCH v2 for-5.1 8/9] qemu-img: Move is_valid_option_list() to qemu-img.c and rewrite, Markus Armbruster, 2020/04/15
- Re: [PATCH v2 for-5.1 0/9] qemu-option: Fix corner cases and clean up, no-reply, 2020/04/15
- Re: [PATCH v2 for-5.1 0/9] qemu-option: Fix corner cases and clean up, Markus Armbruster, 2020/04/29