On Thu, Dec 19, 2019 at 8:23 PM Ján Tomko <jtomko(a)redhat.com> wrote:
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(a)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()
Indeed. But that's material for another series.
Best Regards,
--
Fabiano Fidêncio