From patchwork Thu Dec 13 15:10:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 206134 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 29F1F2C0091 for ; Fri, 14 Dec 2012 02:45:58 +1100 (EST) Received: from localhost ([::1]:60256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjAyy-0000RJ-Bu for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2012 10:45:56 -0500 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 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBDFB8IF001777 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 13 Dec 2012 10:11:09 -0500 Received: from dhcp-5-188.str.redhat.com (dhcp-200-232.str.redhat.com [10.33.200.232]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qBDFApmU026810; Thu, 13 Dec 2012 10:11:08 -0500 From: Kevin Wolf To: anthony@codemonkey.ws 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 15/43] qemu-img: img_create(): drop unneeded goto and ret variable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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; }