External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDevMapperGetTargetsImpl: Use VIR_AUTOSTRINGLIST

Browse Source 
Since we have VIR_AUTOSTRINGLIST we can use it to free string
lists used in the function automatically.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2020-07-24 09:40:04 +02:00
parent ae5752aabc
commit b8ebbe0545
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/virdevmapper.c
View File

@ -67,8 +67,7 @@ virDevMapperGetTargetsImpl(const char *path,
struct dm_task *dmt = NULL;
struct dm_deps *deps;
struct dm_info info;
char **devPaths = NULL;
char **recursiveDevPaths = NULL;
VIR_AUTOSTRINGLIST devPaths = NULL;
size_t i;
int ret = -1;
@ -133,28 +132,19 @@ virDevMapperGetTargetsImpl(const char *path,
minor(deps->device[i]));
}
recursiveDevPaths = NULL;
for (i = 0; i < deps->count; i++) {
char **tmpPaths;
VIR_AUTOSTRINGLIST tmpPaths = NULL;
if (virDevMapperGetTargetsImpl(devPaths[i], &tmpPaths, ttl - 1) < 0)
goto cleanup;
if (tmpPaths &&
virStringListMerge(&recursiveDevPaths, &tmpPaths) < 0) {
virStringListFree(tmpPaths);
if (virStringListMerge(&devPaths, &tmpPaths) < 0)
goto cleanup;
}
}
if (virStringListMerge(&devPaths, &recursiveDevPaths) < 0)
goto cleanup;
*devPaths_ret = g_steal_pointer(&devPaths);
ret = 0;
cleanup:
virStringListFree(recursiveDevPaths);
virStringListFree(devPaths);
dm_task_destroy(dmt);
return ret;
}