]> xenbits.xensource.com Git - libvirt.git/commitdiff
interface: Don't check the output of virGetUserRuntimeDirectory()
authorFabiano Fidêncio <fidencio@redhat.com>
Thu, 19 Dec 2019 09:39:32 +0000 (10:39 +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/interface/interface_backend_netcf.c
src/interface/interface_backend_udev.c

index 4f46717cf3219d4b425dcfdb2b6915515aeca731..65cb7eae629a88d5dd3920dd2068067a6af8cd37 100644 (file)
@@ -105,8 +105,7 @@ netcfStateInitialize(bool privileged,
     } else {
         g_autofree char *rundir = NULL;
 
-        if (!(rundir = virGetUserRuntimeDirectory()))
-            goto error;
+        rundir = virGetUserRuntimeDirectory();
         driver->stateDir = g_strdup_printf("%s/interface/run", rundir);
     }
 
index 26b1045f8a391b5a7ff07ce9af71a2b5886a2712..7cc098eb3375986fd81dbc412b2ab10ec78212d9 100644 (file)
@@ -1160,8 +1160,7 @@ udevStateInitialize(bool privileged,
     } else {
         g_autofree char *rundir = NULL;
 
-        if (!(rundir = virGetUserRuntimeDirectory()))
-            goto cleanup;
+        rundir = virGetUserRuntimeDirectory();
         driver->stateDir = g_strdup_printf("%s/interface/run", rundir);
     }