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

util: Use g_autofree in virLogSetDefaultOutputToFile()

Signed-off-by: NFabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 aa88882c
...@@ -173,8 +173,7 @@ virLogSetDefaultOutputToJournald(void) ...@@ -173,8 +173,7 @@ virLogSetDefaultOutputToJournald(void)
static int static int
virLogSetDefaultOutputToFile(const char *binary, bool privileged) virLogSetDefaultOutputToFile(const char *binary, bool privileged)
{ {
int ret = -1; g_autofree char *logdir = NULL;
char *logdir = NULL;
mode_t old_umask; mode_t old_umask;
if (privileged) { if (privileged) {
...@@ -182,12 +181,12 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged) ...@@ -182,12 +181,12 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged)
virLogDefaultPriority, LOCALSTATEDIR, binary); virLogDefaultPriority, LOCALSTATEDIR, binary);
} else { } else {
if (!(logdir = virGetUserCacheDirectory())) if (!(logdir = virGetUserCacheDirectory()))
goto cleanup; return -1;
old_umask = umask(077); old_umask = umask(077);
if (virFileMakePath(logdir) < 0) { if (virFileMakePath(logdir) < 0) {
umask(old_umask); umask(old_umask);
goto cleanup; return -1;
} }
umask(old_umask); umask(old_umask);
...@@ -195,10 +194,7 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged) ...@@ -195,10 +194,7 @@ virLogSetDefaultOutputToFile(const char *binary, bool privileged)
virLogDefaultPriority, logdir, binary); virLogDefaultPriority, logdir, binary);
} }
ret = 0; return 0;
cleanup:
VIR_FREE(logdir);
return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册