From: Peter Krempa <pkrempa@redhat.com>

Use autofree for all temporary variables and return the result directly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/rpc/virnettlscontext.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index bf83857a05..f857bb2339 100644
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -308,23 +308,18 @@ static virNetTLSContext *virNetTLSContextNewPath(const char *pkipath,
                                                  bool requireValidCert,
                                                  bool isServer)
 {
-    char *cacert = NULL, *cacrl = NULL, *key = NULL, *cert = NULL;
-    virNetTLSContext *ctxt = NULL;
+    g_autofree char *cacert = NULL;
+    g_autofree char *cacrl = NULL;
+    g_autofree char *key = NULL;
+    g_autofree char *cert = NULL;

     if (virNetTLSContextLocateCredentials(pkipath, tryUserPkiPath, isServer,
                                           &cacert, &cacrl, &cert, &key) < 0)
         return NULL;

-    ctxt = virNetTLSContextNew(cacert, cacrl, cert, key,
+    return virNetTLSContextNew(cacert, cacrl, cert, key,
                                x509dnACL, priority, sanityCheckCert,
                                requireValidCert, isServer);
-
-    VIR_FREE(cacert);
-    VIR_FREE(cacrl);
-    VIR_FREE(key);
-    VIR_FREE(cert);
-
-    return ctxt;
 }

 virNetTLSContext *virNetTLSContextNewServerPath(const char *pkipath,
-- 
2.50.0

On Thu, Jul 17, 2025 at 05:28:05PM +0200, Peter Krempa via Devel wrote:
> From: Peter Krempa <pkrempa@redhat.com>
> 
> Use autofree for all temporary variables and return the result directly.
> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>  src/rpc/virnettlscontext.c | 15 +++++----------
>  1 file changed, 5 insertions(+), 10 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|