From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 21 Jan 2019 13:48:18 +0000 (+0100)
Subject: virQEMUDriverConfigLoadSWTPMEntry: use VIR_AUTOFREE
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5de4d410a2707314d66e61e60e769dc0d160cd30;p=libvirt.git

virQEMUDriverConfigLoadSWTPMEntry: use VIR_AUTOFREE

Switch the function to use VIR_AUTOFREE and VIR_AUTOPTR macros
to get rid of the cleanup section.

Requested-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 37f09b8e80..2baf13b1c7 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -984,24 +984,20 @@ static int
 virQEMUDriverConfigLoadSWTPMEntry(virQEMUDriverConfigPtr cfg,
                                   virConfPtr conf)
 {
-    char *swtpm_user = NULL, *swtpm_group = NULL;
-    int ret = -1;
+    VIR_AUTOFREE(char *) swtpm_user = NULL;
+    VIR_AUTOFREE(char *) swtpm_group = NULL;
 
     if (virConfGetValueString(conf, "swtpm_user", &swtpm_user) < 0)
-        goto cleanup;
+        return -1;
     if (swtpm_user && virGetUserID(swtpm_user, &cfg->swtpm_user) < 0)
-        goto cleanup;
+        return -1;
 
     if (virConfGetValueString(conf, "swtpm_group", &swtpm_group) < 0)
-        goto cleanup;
+        return -1;
     if (swtpm_group && virGetGroupID(swtpm_group, &cfg->swtpm_group) < 0)
-        goto cleanup;
+        return -1;
 
-    ret = 0;
- cleanup:
-    VIR_FREE(swtpm_user);
-    VIR_FREE(swtpm_group);
-    return ret;
+    return 0;
 }