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

locking: Use g_autofree in virLockDaemonUnixSocketPaths()

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/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 0d12a97231..9bcd36a869 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -449,29 +449,23 @@ virLockDaemonUnixSocketPaths(bool privileged,
         *sockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlockd-sock");
         *adminSockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlockd-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) {
-            VIR_FREE(rundir);
             umask(old_umask);
-            goto error;
+            return -1;
         }
         umask(old_umask);
 
         *sockfile = g_strdup_printf("%s/virtlockd-sock", rundir);
         *adminSockfile = g_strdup_printf("%s/virtlockd-admin-sock", rundir);
-
-        VIR_FREE(rundir);
     }
     return 0;
-
- error:
-    return -1;
 }