[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 2/9] storage: Refactor matchISCSISource



Continuing on the same reduction them, foobar'd

Signed-off-by: John Ferlan <jferlan redhat com>
---
 src/conf/storage_conf.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 4a38416..fa7a7f9 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -2295,13 +2295,12 @@ static bool
 matchISCSISource(virStoragePoolObjPtr matchpool,
                  virStoragePoolDefPtr def)
 {
-    if (matchpool->def->source.nhost == 1 && def->source.nhost == 1) {
-        if (STREQ(matchpool->def->source.hosts[0].name,
-                  def->source.hosts[0].name)) {
-            if ((matchpool->def->source.initiator.iqn) &&
-                (def->source.initiator.iqn)) {
-                if (STREQ(matchpool->def->source.initiator.iqn,
-                          def->source.initiator.iqn))
+    virStoragePoolSourcePtr poolsrc = &matchpool->def->source;
+    virStoragePoolSourcePtr defsrc = &def->source;
+    if (poolsrc->nhost == 1 && defsrc->nhost == 1) {
+        if (STREQ(poolsrc->hosts[0].name, defsrc->hosts[0].name)) {
+            if (poolsrc->initiator.iqn && defsrc->initiator.iqn) {
+                if (STREQ(poolsrc->initiator.iqn, defsrc->initiator.iqn))
                     return true;
                 else
                     return false;
-- 
2.1.0


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]