[PATCH 06/19] virSecuritySELinuxRestoreFileLabels: Refactor variable freeing
From: Peter Krempa <pkrempa(a)redhat.com>
Declare 'filename' inside the loop that is using it and use automatic
freeing.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/security/security_selinux.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index f042da4a13..854e46954e 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -3698,7 +3698,6 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManager *mgr,
{
int ret = 0;
struct dirent *ent;
- char *filename = NULL;
g_autoptr(DIR) dir = NULL;
if ((ret = virSecuritySELinuxRestoreFileLabel(mgr, path, true)))
@@ -3711,9 +3710,8 @@ virSecuritySELinuxRestoreFileLabels(virSecurityManager *mgr,
return -1;
while ((ret = virDirRead(dir, &ent, path)) > 0) {
- filename = g_strdup_printf("%s/%s", path, ent->d_name);
+ g_autofree char *filename = g_strdup_printf("%s/%s", path,
ent->d_name);
ret = virSecuritySELinuxRestoreFileLabel(mgr, filename, true);
- VIR_FREE(filename);
if (ret < 0)
break;
}
--
2.50.0