From: Fabiano Fidêncio <fidencio@redhat.com>
Date: Thu, 19 Dec 2019 09:11:49 +0000 (+0100)
Subject: util: Use g_autofree in virLogSetDefaultOutputToFile()
X-Git-Tag: v6.0.0-rc1~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e09f723bf11d8bb771484f60663e5a1d830997e1;p=thirdparty%2Flibvirt.git

util: Use g_autofree in virLogSetDefaultOutputToFile()

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virlog.c b/src/util/virlog.c
index d45e2dd316..10639d7328 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -173,8 +173,7 @@ virLogSetDefaultOutputToJournald(void)
 static int
 virLogSetDefaultOutputToFile(const char *binary, bool privileged)
 {
-    int ret = -1;
-    char *logdir = NULL;
+    g_autofree char *logdir = NULL;
     mode_t old_umask;
 
     if (privileged) {
@@ -182,12 +181,12 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged)
                                               virLogDefaultPriority, LOCALSTATEDIR, binary);
     } else {
         if (!(logdir = virGetUserCacheDirectory()))
-            goto cleanup;
+            return -1;
 
         old_umask = umask(077);
         if (virFileMakePath(logdir) < 0) {
             umask(old_umask);
-            goto cleanup;
+            return -1;
         }
         umask(old_umask);
 
@@ -195,10 +194,7 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged)
                                               virLogDefaultPriority, logdir, binary);
     }
 
-    ret = 0;
- cleanup:
-    VIR_FREE(logdir);
-    return ret;
+    return 0;
 }