From: Michal Privoznik <mprivozn@redhat.com>
Let's use automatic memory freeing inside of
virSecurityManagerCheckModel() as it will simplify future
commits.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Tested-by: Richard W.M. Jones <rjones@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
src/security/security_manager.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index 5fc4eb4872..f2f3bb4f19 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -729,9 +729,8 @@ virSecurityManagerReleaseLabel(virSecurityManager *mgr,
static int virSecurityManagerCheckModel(virSecurityManager *mgr,
char *secmodel)
{
- int ret = -1;
+ g_autofree virSecurityManager **sec_managers = NULL;
size_t i;
- virSecurityManager **sec_managers = NULL;
if (STREQ_NULLABLE(secmodel, "none"))
return 0;
@@ -741,17 +740,14 @@ static int virSecurityManagerCheckModel(virSecurityManager *mgr,
for (i = 0; sec_managers[i]; i++) {
if (STREQ_NULLABLE(secmodel, sec_managers[i]->drv->name)) {
- ret = 0;
- goto cleanup;
+ return 0;
}
}
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Security driver model '%1$s' is not available"),
secmodel);
- cleanup:
- VIR_FREE(sec_managers);
- return ret;
+ return -1;
}
--
2.52.0