virNetTLSContextNewPath: Refactor temporary variable usage

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

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index bf83857a05b72d716c7eb93b552cbacabae8eab0..f857bb2339c796a3a999c05a9761e3f7e7f7ec07 100644 (file)
--- 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,