From: Juan Quintela <quintela@redhat.com>
Date: Thu, 4 Mar 2010 09:00:37 +0000 (+0100)
Subject: vmdk: share cleanup code
X-Git-Tag: TizenStudio_2.0_p2.3~5436
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81d06ac9e6416476479eebcd16a98afa9176a38e;p=sdk%2Femulator%2Fqemu.git

vmdk: share cleanup code

cleanup code is identical for error/success cases.  Only difference
are goto labels.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

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;