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

logging: Use g_autofree in virLogDaemonUnixSocketPaths()

Together with the change, let's also simplify the function and get rid
of the goto.

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

diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c
index 268d3c62b9..d41d9caba9 100644
--- a/src/logging/log_daemon.c
+++ b/src/logging/log_daemon.c
@@ -391,29 +391,23 @@ virLogDaemonUnixSocketPaths(bool privileged,
         *sockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlogd-sock");
         *adminSockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlogd-admin-sock");
     } else {
-        char *rundir = NULL;
+        g_autofree char *rundir = NULL;
         mode_t old_umask;
 
         if (!(rundir = virGetUserRuntimeDirectory()))
-            goto error;
+            return -1;
 
         old_umask = umask(077);
         if (virFileMakePath(rundir) < 0) {
             umask(old_umask);
-            VIR_FREE(rundir);
-            goto error;
+            return -1;
         }
         umask(old_umask);
 
         *sockfile = g_strdup_printf("%s/virtlogd-sock", rundir);
         *adminSockfile = g_strdup_printf("%s/virtlogd-admin-sock", rundir);
-
-        VIR_FREE(rundir);
     }
     return 0;
-
- error:
-    return -1;
 }