util: Don't check the output of virGetUserConfigDirectory()

virGetUserConfigDirectory() *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>

diff --git a/src/util/virauth.c b/src/util/virauth.c
index 55208c01efd0efdb01dbbb2b31a0269bc5b24cc9..f75e6745861f130cdadc47d28ba0dff446298bc2 100644 (file)
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -66,8 +66,7 @@ virAuthGetConfigFilePathURI(virURIPtr uri,
         }
     }
 
-    if (!(userdir = virGetUserConfigDirectory()))
-        return -1;
+    userdir = virGetUserConfigDirectory();
 
     *path = g_strdup_printf("%s/auth.conf", userdir);
 

diff --git a/src/util/virconf.c b/src/util/virconf.c
index db2bbb7e37420c32a6139ba5087f26abd9aaeb7e..f79024f07a7d6dc21833b71d433c89151aa75c82 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -1507,8 +1507,6 @@ virConfLoadConfigPath(const char *name)
         path = g_strdup_printf("%s/libvirt/%s", SYSCONFDIR, name);
     } else {
         g_autofree char *userdir = virGetUserConfigDirectory();
-        if (!userdir)
-            return NULL;
 
         path = g_strdup_printf("%s/%s", userdir, name);
     }