[libvirt] [PATCH 16/42] rpc: Don't check the output of virGetUserConfigDirectory()

[Ján Tomko]

On Thu, Dec 19, 2019 at 11:04:21AM +0100, Fabiano Fidêncio wrote:
>virGetUserConfigDirectory() *never* *ever* returns NULL, making the
>checks for it completely unnecessary.
>
>Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
>---
> src/rpc/virnetclient.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
>diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
>index 40e5fa35e2..eba8b865d1 100644
>--- a/src/rpc/virnetclient.c
>+++ b/src/rpc/virnetclient.c
>@@ -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;

no_memory seems suspicious in the times of abort()

>     }
>
>     if (privkeyPath) {

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20191219/bfb8a0ba/attachment-0001.sig>