[PATCH V2 0/2] define g_autoptr for virNWFilterDef and virNWFilterRuleDef
Define and use g_autoptr() for virNWFilterDef and virNWFilterRuleDef, and remove unnecessary label/variable. Those patches are followup with: https://gitlab.com/libvirt/libvirt/-/commit/a9027d447be789cd11c0aa18ceb83ed7... diff to v1: * drop two changes that may cause memory leaks in 'nwfilterDefineXMLFlags' and 'virNWFilterObjListLoadConfig' Jiang Jiacheng (2): conf: define g_autoptr for virNWFilterDef and virNWFilterRuleDef src/tests: use g_autoptr for virNWFilterDef and virNWFilterRuleDef src/conf/nwfilter_conf.c | 44 +++++++++++++++---------------------- src/conf/nwfilter_conf.h | 2 ++ tests/nwfilterxml2xmltest.c | 22 +++++++------------ 3 files changed, 28 insertions(+), 40 deletions(-) -- 2.33.0
Signed-off-by: Jiang Jiacheng <jiangjiacheng@huawei.com> --- src/conf/nwfilter_conf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 1a38e4198c..7c09b3bcb9 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -522,9 +522,11 @@ struct _virNWFilterDef { void virNWFilterRuleDefFree(virNWFilterRuleDef *def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNWFilterRuleDef, virNWFilterRuleDefFree); void virNWFilterDefFree(virNWFilterDef *def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNWFilterDef, virNWFilterDefFree); int virNWFilterTriggerRebuild(void); -- 2.33.0
Use g_autoptr() for virNWFilterDef and virNWFilterRuleDef and remove unnecessary label. Signed-off-by: Jiang Jiacheng <jiangjiacheng@huawei.com> --- src/conf/nwfilter_conf.c | 44 +++++++++++++++---------------------- tests/nwfilterxml2xmltest.c | 22 +++++++------------ 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index f41d3858da..8d198a7bb1 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2384,7 +2384,7 @@ virNWFilterRuleParse(xmlNodePtr node) int priority; xmlNodePtr cur; - virNWFilterRuleDef *ret; + g_autoptr(virNWFilterRuleDef) ret = NULL; ret = g_new0(virNWFilterRuleDef, 1); @@ -2397,28 +2397,28 @@ virNWFilterRuleParse(xmlNodePtr node) virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("rule node requires action attribute")); - goto err_exit; + return NULL; } if ((ret->action = virNWFilterRuleActionTypeFromString(action)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unknown rule action attribute value")); - goto err_exit; + return NULL; } if (!direction) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("rule node requires direction attribute")); - goto err_exit; + return NULL; } if ((ret->tt = virNWFilterRuleDirectionTypeFromString(direction)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unknown rule direction attribute value")); - goto err_exit; + return NULL; } ret->priority = MAX_RULE_PRIORITY / 2; @@ -2455,10 +2455,10 @@ virNWFilterRuleParse(xmlNodePtr node) if (virNWFilterRuleDetailsParse(cur, ret, virAttr[i].att) < 0) { - goto err_exit; + return NULL; } if (virNWFilterRuleValidate(ret) < 0) - goto err_exit; + return NULL; break; } if (!found) { @@ -2476,11 +2476,7 @@ virNWFilterRuleParse(xmlNodePtr node) virNWFilterRuleDefFixup(ret); - return ret; - - err_exit: - g_clear_pointer(&ret, virNWFilterRuleDefFree); - return NULL; + return g_steal_pointer(&ret); } @@ -2561,7 +2557,7 @@ virNWFilterIsAllowedChain(const char *chainname) static virNWFilterDef * virNWFilterDefParseXML(xmlXPathContextPtr ctxt) { - virNWFilterDef *ret; + g_autoptr(virNWFilterDef) ret = NULL; xmlNodePtr curr = ctxt->node; g_autofree char *uuid = NULL; g_autofree char *chain = NULL; @@ -2576,7 +2572,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) if (!ret->name) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("filter has no name")); - goto cleanup; + return NULL; } chain_pri_s = virXPathString("string(./@priority)", ctxt); @@ -2585,7 +2581,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) virReportError(VIR_ERR_INVALID_ARG, _("Could not parse chain priority '%s'"), chain_pri_s); - goto cleanup; + return NULL; } if (chain_priority < NWFILTER_MIN_FILTER_PRIORITY || chain_priority > NWFILTER_MAX_FILTER_PRIORITY) { @@ -2595,7 +2591,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) chain_priority, NWFILTER_MIN_FILTER_PRIORITY, NWFILTER_MAX_FILTER_PRIORITY); - goto cleanup; + return NULL; } } @@ -2603,7 +2599,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) if (chain) { name_prefix = virNWFilterIsAllowedChain(chain); if (name_prefix == NULL) - goto cleanup; + return NULL; ret->chainsuffix = g_steal_pointer(&chain); if (chain_pri_s) { @@ -2626,13 +2622,13 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) if (virUUIDGenerate(ret->uuid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unable to generate uuid")); - goto cleanup; + return NULL; } } else { if (virUUIDParse(uuid, ret->uuid) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed uuid element")); - goto cleanup; + return NULL; } } @@ -2645,12 +2641,12 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) if (virXMLNodeNameEqual(curr, "rule")) { if (!(entry->rule = virNWFilterRuleParse(curr))) { virNWFilterEntryFree(entry); - goto cleanup; + return NULL; } } else if (virXMLNodeNameEqual(curr, "filterref")) { if (!(entry->include = virNWFilterIncludeParse(curr))) { virNWFilterEntryFree(entry); - goto cleanup; + return NULL; } } @@ -2663,11 +2659,7 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) curr = curr->next; } - return ret; - - cleanup: - virNWFilterDefFree(ret); - return NULL; + return g_steal_pointer(&ret); } diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index ca037ad9a0..5c84c2fee9 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -16,31 +16,25 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool expect_error) { g_autofree char *actual = NULL; - int ret = -1; - virNWFilterDef *dev = NULL; + g_autoptr(virNWFilterDef) def = NULL; virResetLastError(); - if (!(dev = virNWFilterDefParse(NULL, inxml, 0))) { + if (!(def = virNWFilterDefParse(NULL, inxml, 0))) { if (expect_error) { virResetLastError(); - goto done; + return 0; } - goto fail; + return -1; } - if (!(actual = virNWFilterDefFormat(dev))) - goto fail; + if (!(actual = virNWFilterDefFormat(def))) + return -1; if (virTestCompareToFile(actual, outxml) < 0) - goto fail; + return -1; - done: - ret = 0; - - fail: - virNWFilterDefFree(dev); - return ret; + return 0; } typedef struct test_parms { -- 2.33.0
On a Tuesday in 2023, Jiang Jiacheng wrote:
Define and use g_autoptr() for virNWFilterDef and virNWFilterRuleDef, and remove unnecessary label/variable.
Those patches are followup with: https://gitlab.com/libvirt/libvirt/-/commit/a9027d447be789cd11c0aa18ceb83ed7...
diff to v1: * drop two changes that may cause memory leaks in 'nwfilterDefineXMLFlags' and 'virNWFilterObjListLoadConfig'
Jiang Jiacheng (2): conf: define g_autoptr for virNWFilterDef and virNWFilterRuleDef src/tests: use g_autoptr for virNWFilterDef and virNWFilterRuleDef
src/conf/nwfilter_conf.c | 44 +++++++++++++++---------------------- src/conf/nwfilter_conf.h | 2 ++ tests/nwfilterxml2xmltest.c | 22 +++++++------------ 3 files changed, 28 insertions(+), 40 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Ping... 在 2023/1/10 19:29, Jiang Jiacheng 写道:
Define and use g_autoptr() for virNWFilterDef and virNWFilterRuleDef, and remove unnecessary label/variable.
Those patches are followup with: https://gitlab.com/libvirt/libvirt/-/commit/a9027d447be789cd11c0aa18ceb83ed7...
diff to v1: * drop two changes that may cause memory leaks in 'nwfilterDefineXMLFlags' and 'virNWFilterObjListLoadConfig'
Jiang Jiacheng (2): conf: define g_autoptr for virNWFilterDef and virNWFilterRuleDef src/tests: use g_autoptr for virNWFilterDef and virNWFilterRuleDef
src/conf/nwfilter_conf.c | 44 +++++++++++++++---------------------- src/conf/nwfilter_conf.h | 2 ++ tests/nwfilterxml2xmltest.c | 22 +++++++------------ 3 files changed, 28 insertions(+), 40 deletions(-)
On 1/20/23 07:33, Jiang Jiacheng wrote:
Ping...
These were merged as: commit e5b065b40e555dd2c39c2af320d95b21547e7070 Author: Jiang Jiacheng <jiangjiacheng@huawei.com> AuthorDate: Tue Jan 10 19:29:26 2023 +0800 Commit: Ján Tomko <jtomko@redhat.com> CommitDate: Fri Jan 20 22:09:34 2023 +0100 src/tests: use g_autoptr for virNWFilterDef and virNWFilterRuleDef Use g_autoptr() for virNWFilterDef and virNWFilterRuleDef and remove unnecessary label. Signed-off-by: Jiang Jiacheng <jiangjiacheng@huawei.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> commit 94432a486f089a3c00cb0b1c35757adea0571aa1 Author: Jiang Jiacheng <jiangjiacheng@huawei.com> AuthorDate: Tue Jan 10 19:29:25 2023 +0800 Commit: Ján Tomko <jtomko@redhat.com> CommitDate: Fri Jan 20 22:09:34 2023 +0100 conf: define g_autoptr for virNWFilterDef and virNWFilterRuleDef Signed-off-by: Jiang Jiacheng <jiangjiacheng@huawei.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Michal
participants (3)
-
Jiang Jiacheng -
Ján Tomko -
Michal Prívozník