From eff68d3637d4530b8813062a730ec13ac24a67a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 13 Dec 2021 14:06:17 +0100 Subject: [PATCH] security: apparmor: use automatic cleanup in load_profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use g_auto for virCommand and char * and drop the cleanup label. Signed-off-by: Ján Tomko Reviewed-by: Michal Privoznik --- src/security/security_apparmor.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index dadcfd67db..d1087aa10c 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -163,14 +163,13 @@ load_profile(virSecurityManager *mgr G_GNUC_UNUSED, const char *fn, bool append) { - int rc = -1; bool create = true; - char *xml = NULL; - virCommand *cmd = NULL; + g_autofree char *xml = NULL; + g_autoptr(virCommand) cmd = NULL; xml = virDomainDefFormat(def, NULL, VIR_DOMAIN_DEF_FORMAT_SECURE); if (!xml) - goto cleanup; + return -1; if (profile_status_file(profile) >= 0) create = false; @@ -191,13 +190,7 @@ load_profile(virSecurityManager *mgr G_GNUC_UNUSED, virLogGetDefaultPriority()); virCommandSetInputBuffer(cmd, xml); - rc = virCommandRun(cmd, NULL); - - cleanup: - VIR_FREE(xml); - virCommandFree(cmd); - - return rc; + return virCommandRun(cmd, NULL); } static int