From bfdb3bb1ee045628cd4faa4dba81355132e969ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 19 Dec 2019 10:35:57 +0100 Subject: [PATCH] locking: Use g_autofree in virLockDaemonUnixSocketPaths() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Together with the change, let's also simplify the function and get rid of the goto. Signed-off-by: Fabiano Fidêncio Reviewed-by: Ján Tomko --- src/locking/lock_daemon.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) 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; } -- 2.47.2