[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] qemu-img: img_create(): drop unneeded goto and
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 4/6] qemu-img: img_create(): drop unneeded goto and ret variable |
Date: |
Fri, 19 Oct 2012 11:28:03 -0300 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
qemu-img.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index a5f2969..dafe705 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -294,7 +294,7 @@ static int add_old_style_options(const char *fmt,
QEMUOptionParameter *list,
static int img_create(int argc, char **argv)
{
- int c, ret = 0;
+ int c;
uint64_t img_size = -1;
const char *fmt = "raw";
const char *base_fmt = NULL;
@@ -351,15 +351,13 @@ static int img_create(int argc, char **argv)
error_report("Invalid image size specified! You may use k, M, G or
"
"T suffixes for ");
error_report("kilobytes, megabytes, gigabytes and terabytes.");
- ret = -1;
- goto out;
+ return 1;
}
img_size = (uint64_t)sval;
}
if (options && is_help_option(options)) {
- ret = print_block_option_help(filename, fmt);
- goto out;
+ return print_block_option_help(filename, fmt);
}
bdrv_img_create(filename, fmt, base_filename, base_fmt,
@@ -367,13 +365,9 @@ static int img_create(int argc, char **argv)
if (error_is_set(&local_err)) {
error_report("%s", error_get_pretty(local_err));
error_free(local_err);
- ret = -1;
- }
-
-out:
- if (ret) {
return 1;
}
+
return 0;
}
--
1.7.12.315.g682ce8b
- [Qemu-devel] [PATCH v2 0/6] block: bdrv_img_create(): propagate errors, Luiz Capitulino, 2012/10/19
- [Qemu-devel] [PATCH 2/6] block: bdrv_img_create(): add Error ** argument, Luiz Capitulino, 2012/10/19
- [Qemu-devel] [PATCH 3/6] qemu-img: img_create(): pass Error object to bdrv_img_create(), Luiz Capitulino, 2012/10/19
- [Qemu-devel] [PATCH 6/6] block: bdrv_img_create(): drop unused error handling code, Luiz Capitulino, 2012/10/19
- [Qemu-devel] [PATCH 1/6] error: add error_set_errno and error_setg_errno, Luiz Capitulino, 2012/10/19
- [Qemu-devel] [PATCH 4/6] qemu-img: img_create(): drop unneeded goto and ret variable,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 5/6] qmp: qmp_transaction(): pass Error object to bdrv_img_create(), Luiz Capitulino, 2012/10/19