[PATCH 1/5] virStorageBackendIQNFound: Fix ret value assignment

[Michal Privoznik <mprivozn@xxxxxxxxxx>]

The return value of this function is overwritten more times than
I am comfortable with.

Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
 src/util/viriscsi.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
index d4c745a1af..a308ee4bac 100644
--- a/src/util/viriscsi.c
+++ b/src/util/viriscsi.c
@@ -117,15 +117,16 @@ static int
 virStorageBackendIQNFound(const char *initiatoriqn,
                           char **ifacename)
 {
-    int ret = IQN_MISSING, fd = -1;
+    int ret = IQN_ERROR, fd = -1;
     char ebuf[64];
     FILE *fp = NULL;
     char *line = NULL, *newline = NULL, *iqn = NULL, *token = NULL;
     virCommandPtr cmd = virCommandNewArgList(ISCSIADM,
                                              "--mode", "iface", NULL);
 
+    *ifacename = NULL;
+
     if (VIR_ALLOC_N(line, LINE_SIZE) != 0) {
-        ret = IQN_ERROR;
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Could not allocate memory for output of '%s'"),
                        ISCSIADM);
@@ -135,24 +136,20 @@ virStorageBackendIQNFound(const char *initiatoriqn,
     memset(line, 0, LINE_SIZE);
 
     virCommandSetOutputFD(cmd, &fd);
-    if (virCommandRunAsync(cmd, NULL) < 0) {
-        ret = IQN_ERROR;
+    if (virCommandRunAsync(cmd, NULL) < 0)
         goto out;
-    }
 
     if ((fp = VIR_FDOPEN(fd, "r")) == NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Failed to open stream for file descriptor "
                          "when reading output from '%s': '%s'"),
                        ISCSIADM, virStrerror(errno, ebuf, sizeof(ebuf)));
-        ret = IQN_ERROR;
         goto out;
     }
 
     while (fgets(line, LINE_SIZE, fp) != NULL) {
         newline = strrchr(line, '\n');
         if (newline == NULL) {
-            ret = IQN_ERROR;
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Unexpected line > %d characters "
                              "when parsing output of '%s'"),
@@ -169,27 +166,27 @@ virStorageBackendIQNFound(const char *initiatoriqn,
         if (STREQ(iqn, initiatoriqn)) {
             token = strchr(line, ' ');
             if (!token) {
-                ret = IQN_ERROR;
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("Missing space when parsing output "
                                  "of '%s'"), ISCSIADM);
                 goto out;
             }
-            if (VIR_STRNDUP(*ifacename, line, token - line) < 0) {
-                ret = IQN_ERROR;
+
+            if (VIR_STRNDUP(*ifacename, line, token - line) < 0)
                 goto out;
-            }
+
             VIR_DEBUG("Found interface '%s' with IQN '%s'", *ifacename, iqn);
-            ret = IQN_FOUND;
             break;
         }
     }
 
     if (virCommandWait(cmd, NULL) < 0)
-        ret = IQN_ERROR;
+        goto out;
+
+    ret = *ifacename ? IQN_FOUND : IQN_MISSING;
 
  out:
-    if (ret == IQN_MISSING)
+    if (ret != IQN_FOUND)
         VIR_DEBUG("Could not find interface with IQN '%s'", iqn);
 
     VIR_FREE(line);
-- 
2.16.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list