From eb945f802c6786167db982de9c5ed8f9187b0ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 19 Dec 2019 10:21:40 +0100 Subject: [PATCH] remote: Don't check the output of virGetUserRuntimeDirectory() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit virGetUserRuntimeDirectory() *never* *ever* returns NULL, making the checks for it completely unnecessary. Signed-off-by: Fabiano Fidêncio Reviewed-by: Ján Tomko --- src/remote/remote_daemon.c | 8 +------- src/remote/remote_driver.c | 3 +-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index b400b1dd10..5893492875 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -245,8 +245,7 @@ daemonUnixSocketPaths(struct daemonConfig *config, } else { mode_t old_umask; - if (!(rundir = virGetUserRuntimeDirectory())) - goto cleanup; + rundir = virGetUserRuntimeDirectory(); old_umask = umask(077); if (virFileMakePath(rundir) < 0) { @@ -1208,11 +1207,6 @@ int main(int argc, char **argv) { run_dir = g_strdup(RUNSTATEDIR "/libvirt"); } else { run_dir = virGetUserRuntimeDirectory(); - - if (!run_dir) { - VIR_ERROR(_("Can't determine user directory")); - goto cleanup; - } } if (privileged) old_umask = umask(022); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e684fcba09..c11f73ab4d 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -779,8 +779,7 @@ remoteGetUNIXSocketHelper(remoteDriverTransport transport, remoteDriverTransportTypeToString(transport)); return NULL; } - if (!(userdir = virGetUserRuntimeDirectory())) - return NULL; + userdir = virGetUserRuntimeDirectory(); sockname = g_strdup_printf("%s/%s-sock", userdir, sock_prefix); } else {