From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 28 Feb 2022 14:00:00 +0000 (+0100)
Subject: virsh: cmdRestore: Use if-else instead of ternary operator
X-Git-Tag: v8.2.0-rc1~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a00632667315a769fe594df1cf34d1a77ca2809;p=thirdparty%2Flibvirt.git

virsh: cmdRestore: Use if-else instead of ternary operator

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 607eb973ac..732690ec44 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5313,6 +5313,7 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd)
     const char *xmlfile = NULL;
     g_autofree char *xml = NULL;
     virshControl *priv = ctl->privData;
+    int rc;
 
     if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
         return false;
@@ -5333,9 +5334,13 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd)
         virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0)
         return false;
 
-    if (((flags || xml)
-         ? virDomainRestoreFlags(priv->conn, from, xml, flags)
-         : virDomainRestore(priv->conn, from)) < 0) {
+    if (flags || xml) {
+        rc = virDomainRestoreFlags(priv->conn, from, xml, flags);
+    } else {
+        rc = virDomainRestore(priv->conn, from);
+    }
+
+    if (rc < 0) {
         vshError(ctl, _("Failed to restore domain from %s"), from);
         return false;
     }