From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 28 Feb 2022 13:50:19 +0000 (+0100)
Subject: virsh: cmdStart: Rewrite ternary operator use to standard if conditions
X-Git-Tag: v8.2.0-rc1~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38b600166f46e03450d5fa682fc775a43405086d;p=thirdparty%2Flibvirt.git

virsh: cmdStart: Rewrite ternary operator use to standard if conditions

Rewrite the invocation of the virDomainCreate(WithFiles/Flags) APIs
based on the arguments into if-else instead of (nested) ternary
operators.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 6f0c063438..4c90f40f86 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -4104,10 +4104,15 @@ cmdStart(vshControl *ctl, const vshCmd *cmd)
 
     /* We can emulate force boot, even for older servers that reject it.  */
     if (flags & VIR_DOMAIN_START_FORCE_BOOT) {
-        if ((nfds ?
-             virDomainCreateWithFiles(dom, nfds, fds, flags) :
-             virDomainCreateWithFlags(dom, flags)) == 0)
+        if (nfds > 0) {
+            rc = virDomainCreateWithFiles(dom, nfds, fds, flags);
+        } else {
+            rc = virDomainCreateWithFlags(dom, flags);
+        }
+
+        if (rc == 0)
             goto started;
+
         if (last_error->code != VIR_ERR_NO_SUPPORT &&
             last_error->code != VIR_ERR_INVALID_ARG) {
             vshReportError(ctl);
@@ -4128,9 +4133,15 @@ cmdStart(vshControl *ctl, const vshCmd *cmd)
     }
 
     /* Prefer older API unless we have to pass a flag.  */
-    if ((nfds ? virDomainCreateWithFiles(dom, nfds, fds, flags) :
-         (flags ? virDomainCreateWithFlags(dom, flags)
-          : virDomainCreate(dom))) < 0) {
+    if (nfds > 0) {
+        rc = virDomainCreateWithFiles(dom, nfds, fds, flags);
+    } else if (flags != 0) {
+        rc = virDomainCreateWithFlags(dom, flags);
+    } else {
+        rc = virDomainCreate(dom);
+    }
+
+    if (rc < 0) {
         vshError(ctl, _("Failed to start domain '%s'"), virDomainGetName(dom));
         return false;
     }