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

vbox: Don't check the output of virGetUserCacheDirectory()

virGetUserCacheDirectory() *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/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 586937fa19..4493fe8582 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -7374,9 +7374,8 @@ vboxDomainScreenshot(virDomainPtr dom,
 
     if (privileged) {
         cacheDir = g_strdup_printf("%s/cache/libvirt", LOCALSTATEDIR);
-    } else if (!(cacheDir = virGetUserCacheDirectory())) {
-        VBOX_RELEASE(machine);
-        return NULL;
+    } else {
+        cacheDir = virGetUserCacheDirectory();
     }
 
     tmp = g_strdup_printf("%s/vbox.screendump.XXXXXX", cacheDir);