]> xenbits.xensource.com Git - libvirt.git/commitdiff
rpc: Don't check the output of virGetUserConfigDirectory()
authorFabiano Fidêncio <fidencio@redhat.com>
Thu, 19 Dec 2019 08:37:51 +0000 (09:37 +0100)
committerFabiano Fidêncio <fidencio@redhat.com>
Fri, 20 Dec 2019 08:38:43 +0000 (09:38 +0100)
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>
src/rpc/virnetclient.c

index 40e5fa35e2cb95cae33c554d92111a47f1a5f549..eba8b865d15aabcb15a37b63bb7c7a9d72426e37 100644 (file)
@@ -455,11 +455,9 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host,
         knownhosts = g_strdup(knownHostsPath);
     } else {
         confdir = virGetUserConfigDirectory();
-        if (confdir) {
-            virBufferAsprintf(&buf, "%s/known_hosts", confdir);
-            if (!(knownhosts = virBufferContentAndReset(&buf)))
-                goto no_memory;
-        }
+        virBufferAsprintf(&buf, "%s/known_hosts", confdir);
+        if (!(knownhosts = virBufferContentAndReset(&buf)))
+            goto no_memory;
     }
 
     if (privkeyPath) {
@@ -556,8 +554,7 @@ virNetClientPtr virNetClientNewLibssh(const char *host,
         knownhosts = g_strdup(knownHostsPath);
     } else {
         confdir = virGetUserConfigDirectory();
-        if (confdir)
-            knownhosts = g_strdup_printf("%s/known_hosts", confdir);
+        knownhosts = g_strdup_printf("%s/known_hosts", confdir);
     }
 
     if (privkeyPath) {