External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

locking: Use g_autofree in virLockDaemonUnixSocketPaths()

Browse Source 
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>
This commit is contained in:
Fabiano Fidêncio 2019-12-19 10:35:57 +01:00
parent 9152b922d7
commit bfdb3bb1ee
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/locking/lock_daemon.c
View File

@ -449,29 +449,23 @@ virLockDaemonUnixSocketPaths(bool privileged,
*sockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlockd-sock"); *sockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlockd-sock");
*adminSockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlockd-admin-sock"); *adminSockfile = g_strdup(RUNSTATEDIR "/libvirt/virtlockd-admin-sock");
} else { } else {
char *rundir = NULL; g_autofree char *rundir = NULL;
mode_t old_umask; mode_t old_umask;
if (!(rundir = virGetUserRuntimeDirectory())) if (!(rundir = virGetUserRuntimeDirectory()))
goto error; return -1;
old_umask = umask(077); old_umask = umask(077);
if (virFileMakePath(rundir) < 0) { if (virFileMakePath(rundir) < 0) {
VIR_FREE(rundir);
umask(old_umask); umask(old_umask);
goto error; return -1;
} }
umask(old_umask); umask(old_umask);
*sockfile = g_strdup_printf("%s/virtlockd-sock", rundir); *sockfile = g_strdup_printf("%s/virtlockd-sock", rundir);
*adminSockfile = g_strdup_printf("%s/virtlockd-admin-sock", rundir); *adminSockfile = g_strdup_printf("%s/virtlockd-admin-sock", rundir);
VIR_FREE(rundir);
} }
return 0; return 0;
error:
return -1;
} }