From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 15 Sep 2021 14:15:11 +0000 (+0200)
Subject: virsh: Make code flow in cmdManagedSaveRemove more straightforward
X-Git-Tag: v7.8.0-rc1~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88810c5267ea84f79de4b0cebe7c1ef898804b10;p=thirdparty%2Flibvirt.git

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 4d328d2174..d765e1e5d4 100644
--- 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;
 }