From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 5 Mar 2020 16:16:29 +0000 (+0100)
Subject: virmacmap: Use g_autofree in virMacMapWriteFileLocked
X-Git-Tag: v6.2.0-rc1~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7741937eba79e531d510aae27a87aeebcc1bcd4;p=thirdparty%2Flibvirt.git

virmacmap: Use g_autofree in virMacMapWriteFileLocked

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c
index 0c0ba90def..4a57edede8 100644
--- a/src/util/virmacmap.c
+++ b/src/util/virmacmap.c
@@ -261,19 +261,15 @@ static int
 virMacMapWriteFileLocked(virMacMapPtr mgr,
                          const char *file)
 {
-    char *str;
-    int ret = -1;
+    g_autofree char *str = NULL;
 
     if (virMacMapDumpStrLocked(mgr, &str) < 0)
-        goto cleanup;
+        return -1;
 
     if (virFileRewriteStr(file, 0644, str) < 0)
-        goto cleanup;
+        return -1;
 
-    ret = 0;
- cleanup:
-    VIR_FREE(str);
-    return ret;
+    return 0;
 }