From: Fabiano Fidêncio <fidencio@redhat.com>
Date: Thu, 19 Dec 2019 08:33:54 +0000 (+0100)
Subject: util: Don't check the output of virGetUserConfigDirectory()
X-Git-Tag: v6.0.0-rc1~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa4a0264bfba44d68b2f997cf347302038ce6f0f;p=thirdparty%2Flibvirt.git

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 55208c01ef..f75e674586 100644
--- 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 db2bbb7e37..f79024f07a 100644
--- 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);
     }