From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 5 Feb 2020 11:30:31 +0000 (+0100)
Subject: virDomainDiskAddISCSIPoolSourceHost: Remove ternary operator
X-Git-Tag: v6.1.0-rc1~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e20c5b17037acca0cfffd983c0bcdd0ee5b7e628;p=thirdparty%2Flibvirt.git

virDomainDiskAddISCSIPoolSourceHost: Remove ternary operator

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bc858944ce..f63087e88c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -31344,8 +31344,10 @@ virDomainDiskAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
 
     def->src->hosts[0].name = g_strdup(pooldef->source.hosts[0].name);
 
-    def->src->hosts[0].port = pooldef->source.hosts[0].port ?
-        pooldef->source.hosts[0].port : 3260;
+    if (pooldef->source.hosts[0].port != 0)
+        def->src->hosts[0].port = pooldef->source.hosts[0].port;
+    else
+        def->src->hosts[0].port = 3260;
 
     /* iscsi volume has name like "unit:0:0:1" */
     if (!(tokens = virStringSplitCount(def->src->srcpool->volume, ":", 0, &ntokens)))