From patchwork Wed Mar 3 12:06:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 46798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6AACCB7CE6 for ; Wed, 3 Mar 2010 23:34:17 +1100 (EST) Received: from localhost ([127.0.0.1]:35981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nmnhp-0005SJ-3J for incoming@patchwork.ozlabs.org; Wed, 03 Mar 2010 07:29:37 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NmnMH-0000r0-0r for qemu-devel@nongnu.org; Wed, 03 Mar 2010 07:07:21 -0500 Received: from [199.232.76.173] (port=53685 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmnMG-0000qb-2Y for qemu-devel@nongnu.org; Wed, 03 Mar 2010 07:07:20 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NmnME-0005Je-Vt for qemu-devel@nongnu.org; Wed, 03 Mar 2010 07:07:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14371) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NmnME-0005JW-JU for qemu-devel@nongnu.org; Wed, 03 Mar 2010 07:07:18 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o23C7Hj1003868 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 3 Mar 2010 07:07:17 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o23C71AD004209; Wed, 3 Mar 2010 07:07:16 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 3 Mar 2010 13:06:59 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, amit.shah@redhat.com Subject: [Qemu-devel] [PATCH 09/10] vmdk: share cleanup code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org cleanup code is identical for error/success cases. Only difference are goto labels. Signed-off-by: Juan Quintela --- block/vmdk.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 819c1c9..007fca4 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -334,18 +334,13 @@ static int vmdk_snapshot_create(const char *filename, const char *backing_file) ret = -errno; goto fail_gd; } - qemu_free(gd_buf); - qemu_free(rgd_buf); - - close(p_fd); - close(snp_fd); - return 0; + ret = 0; - fail_gd: +fail_gd: qemu_free(gd_buf); - fail_rgd: +fail_rgd: qemu_free(rgd_buf); - fail: +fail: close(p_fd); close(snp_fd); return ret;