Re: [libvirt] [PATCH 38/42] locking: Use g_autofree on virLockDaemonExecRestartStatePath()

2019-12-19 Thread Ján Tomko 

On Thu, Dec 19, 2019 at 11:04:43AM +0100, Fabiano Fidêncio wrote:

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

Signed-off-by: Fabiano Fidêncio 
---
src/locking/lock_daemon.c | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 38/42] locking: Use g_autofree on virLockDaemonExecRestartStatePath()

2019-12-19 Thread Fabiano Fidêncio 
Together with the change, let's also simplify the function and get rid
of the goto.

Signed-off-by: Fabiano Fidêncio 
---
 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 9bcd36a869..7c89adf077 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -820,29 +820,23 @@ virLockDaemonExecRestartStatePath(bool privileged,
 if (privileged) {
 *state_file = g_strdup(RUNSTATEDIR "/virtlockd-restart-exec.json");
 } 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);
 
 *state_file = g_strdup_printf("%s/virtlockd-restart-exec.json", 
rundir);
-
-VIR_FREE(rundir);
 }
 
 return 0;
-
- error:
-return -1;
 }
 
 
-- 
2.24.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list