[PATCH 2/6] virConnectOpenInternal: Switch to automatic memory cleanup

Peter Krempa pkrempa at redhat.com
Thu Sep 8 15:15:56 UTC 2022


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

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/libvirt.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/libvirt.c b/src/libvirt.c
index 7e7c0fc8e3..fca38dba40 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;
 }

-- 
2.37.1



More information about the libvir-list mailing list