From 000bb404e53803640e7116869fa98e0f0123a698 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 8 Sep 2022 16:36:28 +0200
Subject: [PATCH] virConnectOpenInternal: Switch to automatic memory cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use automatic cleanup for 'ret' and 'uristr'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/libvirt.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/libvirt.c b/src/libvirt.c
index 19379a2a53..2d32f8f2e8 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -882,9 +882,9 @@ virConnectOpenInternal(const char *name,
 {
     size_t i;
     int res;
-    virConnectPtr ret;
+    g_autoptr(virConnect) ret = NULL;
     g_autoptr(virConf) conf = NULL;
-    char *uristr = NULL;
+    g_autofree char *uristr = NULL;
     bool embed = false;
 
     ret = virGetConnect();
@@ -1151,14 +1151,9 @@ virConnectOpenInternal(const char *name,
         goto failed;
     }
 
-    VIR_FREE(uristr);
-
-    return ret;
+    return g_steal_pointer(&ret);
 
  failed:
-    VIR_FREE(uristr);
-    virObjectUnref(ret);
-
     return NULL;
 }