From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 6 Jul 2021 08:18:24 +0000 (+0200)
Subject: virNWFilterCreateVarsFrom: Use automatic memory management
X-Git-Tag: v7.6.0-rc1~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b65883652934d3164f510942c05418a6edce1821;p=thirdparty%2Flibvirt.git

virNWFilterCreateVarsFrom: Use automatic memory management

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c
index 3b7190b5cd..26d4a936ad 100644
--- a/tests/nwfilterxml2firewalltest.c
+++ b/tests/nwfilterxml2firewalltest.c
@@ -148,7 +148,7 @@ static GHashTable *
 virNWFilterCreateVarsFrom(GHashTable *vars1,
                           GHashTable *vars2)
 {
-    GHashTable *res = virHashNew(virNWFilterVarValueHashFree);
+    g_autoptr(GHashTable) res = virHashNew(virNWFilterVarValueHashFree);
 
     if (virNWFilterHashTablePutAll(vars1, res) < 0)
         goto err_exit;
@@ -156,10 +156,9 @@ virNWFilterCreateVarsFrom(GHashTable *vars1,
     if (virNWFilterHashTablePutAll(vars2, res) < 0)
         goto err_exit;
 
-    return res;
+    return g_steal_pointer(&res);
 
  err_exit:
-    virHashFree(res);
     return NULL;
 }