On Thu, Dec 19, 2019 at 11:04:10AM +0100, Fabiano Fidêncio wrote:
> virGetUserDirectory() *never* *ever* returns NULL, making the checks for
> it completely unnecessary.
>
> Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
> ---
> src/rpc/virnetclient.c | 12 ++++--------
> src/rpc/virnettlscontext.c | 12 ------------
> 2 files changed, 4 insertions(+), 20 deletions(-)
[...]
> diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
> index ec9dd35c46..08944f6771 100644
> --- a/src/rpc/virnettlscontext.c
> +++ b/src/rpc/virnettlscontext.c
> @@ -805,9 +805,6 @@ static int virNetTLSContextLocateCredentials(const char *pkipath,
> */
> userdir = virGetUserDirectory();
>
> - if (!userdir)
> - goto error;
> -
> user_pki_path = g_strdup_printf("%s/.pki/libvirt", userdir);
>
> VIR_DEBUG("Trying to find TLS user credentials in %s", user_pki_path);
> @@ -864,15 +861,6 @@ static int virNetTLSContextLocateCredentials(const char *pkipath,
> VIR_FREE(userdir);
>
> return 0;
> -
> - error:
> - VIR_FREE(*cacert);
> - VIR_FREE(*cacrl);
> - VIR_FREE(*key);
> - VIR_FREE(*cert);
> - VIR_FREE(user_pki_path);
> - VIR_FREE(userdir);
> - return -1;
This doesn't look right. Looks like some leftover from rebase where
you wanted to use g_autofree.
Pavel
Attachment:
signature.asc
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
