External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Remove need for extra VIR_FREE's in virGetFCHostNameByWWN

Browse Source 
Rather than extraneous VIR_FREE's depending on where we are in the code,
move them to the top of the loop and in the cleanup path.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-11-18 08:55:35 -05:00
parent 9fdc8c4269
commit 1d0fde7ee1
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/util/virutil.c
View File

@ -2205,43 +2205,34 @@ virGetFCHostNameByWWN(const char *sysfs_prefix,
} while (0)
while (virDirRead(dir, &entry, prefix) > 0) {
VIR_FREE(wwnn_buf);
VIR_FREE(wwnn_path);
VIR_FREE(wwpn_buf);
VIR_FREE(wwpn_path);
if (virAsprintf(&wwnn_path, "%s/%s/node_name", prefix,
entry->d_name) < 0)
goto cleanup;
if (!virFileExists(wwnn_path)) {
VIR_FREE(wwnn_path);
if (!virFileExists(wwnn_path))
continue;
}
READ_WWN(wwnn_path, wwnn_buf);
if (STRNEQ(wwnn, p)) {
VIR_FREE(wwnn_buf);
VIR_FREE(wwnn_path);
if (STRNEQ(wwnn, p))
continue;
}
if (virAsprintf(&wwpn_path, "%s/%s/port_name", prefix,
entry->d_name) < 0)
goto cleanup;
if (!virFileExists(wwpn_path)) {
VIR_FREE(wwnn_buf);
VIR_FREE(wwnn_path);
VIR_FREE(wwpn_path);
if (!virFileExists(wwpn_path))
continue;
}
READ_WWN(wwpn_path, wwpn_buf);
if (STRNEQ(wwpn, p)) {
VIR_FREE(wwnn_path);
VIR_FREE(wwpn_path);
VIR_FREE(wwnn_buf);
VIR_FREE(wwpn_buf);
if (STRNEQ(wwpn, p))
continue;
}
ignore_value(VIR_STRDUP(ret, entry->d_name));
break;