From bb0b8e5d67526c8c34b7489775c8322ccf4d9639 Mon Sep 17 00:00:00 2001
From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 10 Feb 2016 16:35:48 +0100
Subject: [PATCH] cmdVolCreateAs: Rework to follow usual func pattern

The way we usually write functions is that we start the work and
if something goes bad we goto cleanup and roll back there. Or
just free resources that are no longer needed. Do the same here.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 tools/virsh-volume.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 35f0cbd78e..569f55578a 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -211,14 +211,15 @@ static bool
 cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd)
 {
     virStoragePoolPtr pool;
-    virStorageVolPtr vol;
-    char *xml;
+    virStorageVolPtr vol = NULL;
+    char *xml = NULL;
     const char *name, *capacityStr = NULL, *allocationStr = NULL, *format = NULL;
     const char *snapshotStrVol = NULL, *snapshotStrFormat = NULL;
     unsigned long long capacity, allocation = 0;
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     unsigned long flags = 0;
     virshControlPtr priv = ctl->privData;
+    bool ret = false;
 
     if (vshCommandOptBool(cmd, "prealloc-metadata"))
         flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA;
@@ -335,23 +336,22 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
     }
     xml = virBufferContentAndReset(&buf);
-    vol = virStorageVolCreateXML(pool, xml, flags);
-    VIR_FREE(xml);
-    virStoragePoolFree(pool);
 
-    if (vol != NULL) {
-        vshPrint(ctl, _("Vol %s created\n"), name);
-        virStorageVolFree(vol);
-        return true;
-    } else {
+    if (!(vol = virStorageVolCreateXML(pool, xml, flags))) {
         vshError(ctl, _("Failed to create vol %s"), name);
-        return false;
+        goto cleanup;
     }
 
+    vshPrint(ctl, _("Vol %s created\n"), name);
+    ret = true;
+
  cleanup:
     virBufferFreeAndReset(&buf);
+    if (vol)
+        virStorageVolFree(vol);
     virStoragePoolFree(pool);
-    return false;
+    VIR_FREE(xml);
+    return ret;
 }
 
 /*