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

virStoragePoolObjLoadAllConfigs: Use automatic memory clearing

Browse Source 
Refactor the inner loop to automatically free temporary variables and
remove unreachable error paths.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-01-20 11:34:46 +01:00
parent 7cf5b88338
commit 8a80df95ac
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/virstorageobj.c
View File

@ -1736,27 +1736,15 @@ virStoragePoolObjLoadAllConfigs(virStoragePoolObjList *pools,
return rc; return rc;
while ((ret = virDirRead(dir, &entry, configDir)) > 0) { while ((ret = virDirRead(dir, &entry, configDir)) > 0) {
char *path; g_autofree char *path = virFileBuildPath(configDir, entry->d_name, NULL);
char *autostartLink; g_autofree char *autostartLink = virFileBuildPath(autostartDir, entry->d_name, NULL);
virStoragePoolObj *obj; virStoragePoolObj *obj;
if (!virStringHasSuffix(entry->d_name, ".xml")) if (!virStringHasSuffix(entry->d_name, ".xml"))
continue; continue;
if (!(path = virFileBuildPath(configDir, entry->d_name, NULL)))
continue;
if (!(autostartLink = virFileBuildPath(autostartDir, entry->d_name,
NULL))) {
VIR_FREE(path);
continue;
}
obj = virStoragePoolObjLoad(pools, entry->d_name, path, autostartLink); obj = virStoragePoolObjLoad(pools, entry->d_name, path, autostartLink);
virStoragePoolObjEndAPI(&obj); virStoragePoolObjEndAPI(&obj);
VIR_FREE(path);
VIR_FREE(autostartLink);
} }
return ret; return ret;