virsh: Make code flow in cmdManagedSaveRemove more straightforward

By doing so we can get rid of the code which violates our coding style
guidelines.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 4d328d217454fdb0240bd4ede0b50ca6a948ed37..d765e1e5d4eb99f68988d5d46942e0dc743f9bc0 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -4788,18 +4788,19 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd)
         return false;
     }
 
-    if (hassave) {
-        if (virDomainManagedSaveRemove(dom, 0) < 0) {
-            vshError(ctl, _("Failed to remove managed save image for domain '%s'"),
-                     name);
-            return false;
-        }
-        else
-            vshPrintExtra(ctl, _("Removed managedsave image for domain '%s'"), name);
-    }
-    else
+    if (hassave == 0) {
         vshPrintExtra(ctl, _("Domain '%s' has no manage save image; removal skipped"),
                       name);
+        return true;
+    }
+
+    if (virDomainManagedSaveRemove(dom, 0) < 0) {
+        vshError(ctl, _("Failed to remove managed save image for domain '%s'"),
+                 name);
+        return false;
+    }
+
+    vshPrintExtra(ctl, _("Removed managedsave image for domain '%s'"), name);
 
     return true;
 }