mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
logging: Don't check the output of virGetUserRuntimeDirectory()
virGetUserRuntimeDirectory() *never* *ever* returns NULL, making the checks for it completely unnecessary. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
0753ddb48a
commit
f500e21e41
@ -394,8 +394,7 @@ virLogDaemonUnixSocketPaths(bool privileged,
|
||||
g_autofree char *rundir = NULL;
|
||||
mode_t old_umask;
|
||||
|
||||
if (!(rundir = virGetUserRuntimeDirectory()))
|
||||
return -1;
|
||||
rundir = virGetUserRuntimeDirectory();
|
||||
|
||||
old_umask = umask(077);
|
||||
if (virFileMakePath(rundir) < 0) {
|
||||
@ -615,8 +614,7 @@ virLogDaemonExecRestartStatePath(bool privileged,
|
||||
g_autofree char *rundir = NULL;
|
||||
mode_t old_umask;
|
||||
|
||||
if (!(rundir = virGetUserRuntimeDirectory()))
|
||||
return -1;
|
||||
rundir = virGetUserRuntimeDirectory();
|
||||
|
||||
old_umask = umask(077);
|
||||
if (virFileMakePath(rundir) < 0) {
|
||||
@ -992,10 +990,7 @@ int main(int argc, char **argv) {
|
||||
if (privileged) {
|
||||
run_dir = g_strdup(RUNSTATEDIR "/libvirt");
|
||||
} else {
|
||||
if (!(run_dir = virGetUserRuntimeDirectory())) {
|
||||
VIR_ERROR(_("Can't determine user directory"));
|
||||
goto cleanup;
|
||||
}
|
||||
run_dir = virGetUserRuntimeDirectory();
|
||||
}
|
||||
|
||||
if (privileged)
|
||||
|
@ -49,8 +49,7 @@ virLogManagerDaemonPath(bool privileged)
|
||||
} else {
|
||||
g_autofree char *rundir = NULL;
|
||||
|
||||
if (!(rundir = virGetUserRuntimeDirectory()))
|
||||
return NULL;
|
||||
rundir = virGetUserRuntimeDirectory();
|
||||
|
||||
path = g_strdup_printf("%s/virtlogd-sock", rundir);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user