[PATCH v2 5/7] virsh: domain: use early return when possible

Kristina Hanicova khanicov at redhat.com
Fri Sep 24 15:17:48 UTC 2021


Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 tools/virsh-domain.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 1692197d1a..3c496d845a 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5883,13 +5883,13 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd)
         rv = virDomainShutdownFlags(dom, flags);
     else
         rv = virDomainShutdown(dom);
-    if (rv == 0) {
-        vshPrintExtra(ctl, _("Domain '%s' is being shutdown\n"), name);
-    } else {
+
+    if (rv != 0) {
         vshError(ctl, _("Failed to shutdown domain '%s'"), name);
         return false;
     }
 
+    vshPrintExtra(ctl, _("Domain '%s' is being shutdown\n"), name);
     return true;
 }
 
@@ -5959,13 +5959,12 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd)
     if (!(dom = virshCommandOptDomain(ctl, cmd, &name)))
         return false;
 
-    if (virDomainReboot(dom, flags) == 0) {
-        vshPrintExtra(ctl, _("Domain '%s' is being rebooted\n"), name);
-    } else {
+    if (virDomainReboot(dom, flags) != 0) {
         vshError(ctl, _("Failed to reboot domain '%s'"), name);
         return false;
     }
 
+    vshPrintExtra(ctl, _("Domain '%s' is being rebooted\n"), name);
     return true;
 }
 
-- 
2.31.1




More information about the libvir-list mailing list