]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
util: Don't check the output of virGetUserRuntimeDirectory()
authorFabiano Fidêncio <fidencio@redhat.com>
Thu, 19 Dec 2019 09:16:21 +0000 (10:16 +0100)
committerFabiano Fidêncio <fidencio@redhat.com>
Fri, 20 Dec 2019 08:38:43 +0000 (09:38 +0100)
virGetUserRuntimeDirectory() *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>
src/util/virhostdev.c
src/util/virpidfile.c

index 78e409732ab8596cfafddd8d72c9abaafaf3adec..9b4ea30216085fa61208e9833e0c555026bb1861 100644 (file)
@@ -182,8 +182,7 @@ virHostdevManagerNew(void)
         g_autofree char *rundir = NULL;
         mode_t old_umask;
 
-        if (!(rundir = virGetUserRuntimeDirectory()))
-            return NULL;
+        rundir = virGetUserRuntimeDirectory();
 
         hostdevMgr->stateDir = g_strdup_printf("%s/hostdevmgr", rundir);
 
index 249515aff2dc306e00bcd805da0a0d27bca400cd..b08e0d8d520cebc21431ff785c65f062e0662e81 100644 (file)
@@ -488,8 +488,7 @@ virPidFileConstructPath(bool privileged,
         }
         *pidfile = g_strdup_printf("%s/%s.pid", runstatedir, progname);
     } else {
-        if (!(rundir = virGetUserRuntimeDirectory()))
-            return -1;
+        rundir = virGetUserRuntimeDirectory();
 
         if (virFileMakePathWithMode(rundir, 0700) < 0) {
             virReportSystemError(errno,