virHashFree refactoring and removal

[PATCH 01/23] virDomainNetDefParseXML: Automatically free GHashTable

Posted by Peter Krempa 4 years, 2 months ago

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f88405ab02..25e504a99a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10244,7 +10244,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
     xmlNodePtr vlan_node = NULL;
     xmlNodePtr bandwidth_node = NULL;
     xmlNodePtr tmpNode;
-    GHashTable *filterparams = NULL;
+    g_autoptr(GHashTable) filterparams = NULL;
     virDomainActualNetDef *actual = NULL;
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
     virDomainChrSourceReconnectDef reconnect = {0};
@@ -10431,7 +10431,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,

     if ((filterref_node = virXPathNode("./filterref", ctxt))) {
         filter = virXMLPropString(filterref_node, "filter");
-        virHashFree(filterparams);
         filterparams = virNWFilterParseParamAttributes(filterref_node);
     }

@@ -10960,7 +10959,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,

  cleanup:
     virDomainActualNetDefFree(actual);
-    virHashFree(filterparams);
     return def;

  error:
-- 
2.31.1

Re: [PATCH 01/23] virDomainNetDefParseXML: Automatically free GHashTable

Posted by Ján Tomko 4 years, 2 months ago

On a Tuesday in 2021, Peter Krempa wrote:
>Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>---
> src/conf/domain_conf.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
>index f88405ab02..25e504a99a 100644
>--- a/src/conf/domain_conf.c
>+++ b/src/conf/domain_conf.c
>@@ -10244,7 +10244,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
>     xmlNodePtr vlan_node = NULL;
>     xmlNodePtr bandwidth_node = NULL;
>     xmlNodePtr tmpNode;
>-    GHashTable *filterparams = NULL;
>+    g_autoptr(GHashTable) filterparams = NULL;
>     virDomainActualNetDef *actual = NULL;
>     VIR_XPATH_NODE_AUTORESTORE(ctxt)
>     virDomainChrSourceReconnectDef reconnect = {0};
>@@ -10431,7 +10431,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
>
>     if ((filterref_node = virXPathNode("./filterref", ctxt))) {
>         filter = virXMLPropString(filterref_node, "filter");
>-        virHashFree(filterparams);

This virHashFree is called with a NULL parameter since the refactor to
xpath in commit fdd06824e3a618ca33752e0439bbd5b2d9da1b0d

>         filterparams = virNWFilterParseParamAttributes(filterref_node);
>     }
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano