提交 0753ddb4 编写于 作者: F Fabiano Fidêncio

logging: Use g_autofree in virLogDaemonExecRestartStatePath()

Together with the change, let's also simplify the function and get rid
of the goto.
Signed-off-by: NFabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 441c668b
......@@ -612,29 +612,23 @@ virLogDaemonExecRestartStatePath(bool privileged,
if (privileged) {
*state_file = g_strdup(RUNSTATEDIR "/virtlogd-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/virtlogd-restart-exec.json", rundir);
VIR_FREE(rundir);
}
return 0;
error:
return -1;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册