[libvirt] [PATCH 17/42] remote: Don't check the output of virGetUserConfigDirectory()

Fabiano Fidêncio fidencio at redhat.com
Thu Dec 19 10:04:22 UTC 2019


virGetUserConfigDirectory() *never* *ever* returns NULL, making the
checks for it completely unnecessary.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 src/remote/remote_daemon_config.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c
index ae6b491686..84e331474b 100644
--- a/src/remote/remote_daemon_config.c
+++ b/src/remote/remote_daemon_config.c
@@ -81,17 +81,13 @@ daemonConfigFilePath(bool privileged, char **configfile)
     } else {
         char *configdir = NULL;
 
-        if (!(configdir = virGetUserConfigDirectory()))
-            goto error;
+        configdir = virGetUserConfigDirectory();
 
         *configfile = g_strdup_printf("%s/%s.conf", configdir, DAEMON_NAME);
         VIR_FREE(configdir);
     }
 
     return 0;
-
- error:
-    return -1;
 }
 
 struct daemonConfig*
-- 
2.24.1




More information about the libvir-list mailing list