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

locking: 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/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index 62df30d9f4..c67b0a75e1 100644
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -43,16 +43,12 @@ virLockDaemonConfigFilePath(bool privileged, char **configfile)
     } else {
         g_autofree char *configdir = NULL;
 
-        if (!(configdir = virGetUserConfigDirectory()))
-            goto error;
+        configdir = virGetUserConfigDirectory();
 
         *configfile = g_strdup_printf("%s/virtlockd.conf", configdir);
     }
 
     return 0;
-
- error:
-    return -1;
 }