External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

virStorageBackendIQNFound: Rename out label

Browse Source 
This is in fact 'cleanup' label and it should be named as such.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Michal Privoznik 2018-06-29 11:43:54 +02:00
parent 893ccaeca4
commit adeadc53a7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/viriscsi.c
View File

@ -130,21 +130,21 @@ virStorageBackendIQNFound(const char *initiatoriqn,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not allocate memory for output of '%s'"),
ISCSIADM);
goto out;
goto cleanup;
}
memset(line, 0, LINE_SIZE);
virCommandSetOutputFD(cmd, &fd);
if (virCommandRunAsync(cmd, NULL) < 0)
goto out;
goto cleanup;
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)));
goto out;
goto cleanup;
}
while (fgets(line, LINE_SIZE, fp) != NULL) {
@ -154,7 +154,7 @@ virStorageBackendIQNFound(const char *initiatoriqn,
_("Unexpected line > %d characters "
"when parsing output of '%s'"),
LINE_SIZE, ISCSIADM);
goto out;
goto cleanup;
}
*newline = '\0';
@ -169,11 +169,11 @@ virStorageBackendIQNFound(const char *initiatoriqn,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Missing space when parsing output "
"of '%s'"), ISCSIADM);
goto out;
goto cleanup;
}
if (VIR_STRNDUP(*ifacename, line, token - line) < 0)
goto out;
goto cleanup;
VIR_DEBUG("Found interface '%s' with IQN '%s'", *ifacename, iqn);
break;
@ -181,11 +181,11 @@ virStorageBackendIQNFound(const char *initiatoriqn,
}
if (virCommandWait(cmd, NULL) < 0)
goto out;
goto cleanup;
ret = *ifacename ? IQN_FOUND : IQN_MISSING;
out:
cleanup:
if (ret == IQN_MISSING)
VIR_DEBUG("Could not find interface with IQN '%s'", iqn);