]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
node_device: Don't check the output of virGetUserRuntimeDirectory()
authorFabiano Fidêncio <fidencio@redhat.com>
Thu, 19 Dec 2019 09:23:14 +0000 (10:23 +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/node_device/node_device_hal.c
src/node_device/node_device_udev.c

index b40f93df46b3867ae0095f649bdbd6280651eff9..cf12854fe9d9986a4a9895520658159dd2e10fda 100644 (file)
@@ -618,8 +618,7 @@ nodeStateInitialize(bool privileged G_GNUC_UNUSED,
     } else {
         g_autofree char *rundir = NULL;
 
-        if (!(rundir = virGetUserRuntimeDirectory()))
-            goto failure;
+        rundir = virGetUserRuntimeDirectory();
         driver->stateDir = g_strdup_printf("%s/nodedev/run", rundir);
     }
 
index cae00dc9dc49e931756129bb86ed41e13c5d25bb..eedcd123a3021d588350a398eac574e359bd7705 100644 (file)
@@ -1806,8 +1806,7 @@ nodeStateInitialize(bool privileged,
     } else {
         g_autofree char *rundir = NULL;
 
-        if (!(rundir = virGetUserRuntimeDirectory()))
-            goto cleanup;
+        rundir = virGetUserRuntimeDirectory();
         driver->stateDir = g_strdup_printf("%s/nodedev/run", rundir);
     }