From 11e65596aaeed80cb484ceac8f173a6314f1448d Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Thu, 4 Mar 2010 23:11:52 -0300 Subject: [PATCH 30/42] vmdk: share cleanup code RH-Author: Juan Quintela Message-id: <87ee81ae4bdb675329c0007ce1a3baeb8ee29153.1267743950.git.quintela@redhat.com> Patchwork-id: 7559 O-Subject: [PATCH 30/32] vmdk: share cleanup code Bugzilla: 567099 RH-Acked-by: Kevin Wolf RH-Acked-by: Amit Shah RH-Acked-by: Marcelo Tosatti 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(-) Signed-off-by: Eduardo Habkost --- block/vmdk.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index fb4a4c6..a379946 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; -- 1.6.3.rc4.29.g8146