From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjARQ-0007vV-LB for qemu-devel@nongnu.org; Thu, 13 Dec 2012 10:11:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TjARK-0005wN-8J for qemu-devel@nongnu.org; Thu, 13 Dec 2012 10:11:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjARK-0005wF-0N for qemu-devel@nongnu.org; Thu, 13 Dec 2012 10:11:10 -0500 From: Kevin Wolf Date: Thu, 13 Dec 2012 16:10:22 +0100 Message-Id: <1355411450-12761-16-git-send-email-kwolf@redhat.com> In-Reply-To: <1355411450-12761-1-git-send-email-kwolf@redhat.com> References: <1355411450-12761-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 15/43] qemu-img: img_create(): drop unneeded goto and ret variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Luiz Capitulino Signed-off-by: Luiz Capitulino Signed-off-by: Kevin Wolf --- qemu-img.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 595b6f5..c4dae88 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.6.5