]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virsh: cmdRestore: Use if-else instead of ternary operator
authorPeter Krempa <pkrempa@redhat.com>
Mon, 28 Feb 2022 14:00:00 +0000 (15:00 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 3 Mar 2022 10:06:56 +0000 (11:06 +0100)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
tools/virsh-domain.c

index 607eb973ac0328f97984c04c95001f084d8543c3..732690ec4435640be52d681ef52491ac40b72428 100644 (file)
@@ -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;
     }