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

virsh: doSave: 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 4c90f40f86..607eb973ac 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -4213,6 +4213,7 @@ doSave(void *opaque)
     unsigned int flags = 0;
     const char *xmlfile = NULL;
     g_autofree char *xml = NULL;
+    int rc;
 #ifndef WIN32
     sigset_t sigmask, oldsigmask;
 
@@ -4244,9 +4245,13 @@ doSave(void *opaque)
         goto out;
     }
 
-    if (((flags || xml)
-         ? virDomainSaveFlags(dom, to, xml, flags)
-         : virDomainSave(dom, to)) < 0) {
+    if (flags || xml) {
+        rc = virDomainSaveFlags(dom, to, xml, flags);
+    } else {
+        rc = virDomainSave(dom, to);
+    }
+
+    if (rc < 0) {
         vshError(ctl, _("Failed to save domain '%s' to %s"), name, to);
         goto out;
     }