External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virNWFilterIncludeDefToRuleInst: Refactor cleanup

Browse Source 
Use automatic memory freeing for 'tmpvars' and move the allocation of
tmpvars earlier so that we are guaranteed that 'obj' will always be
appended to 'inst->filters' and thus don't need cleanup for it.

By moving the reset of 'inst' to the block when virNWFilterDefToInst
fails we can get rid of the rest of the cleanup section and remove the
'ret' variable.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-08-04 11:28:35 +02:00
parent abd045030e
commit 0b6888451f
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/nwfilter/nwfilter_gentech_driver.c
View File

@ -281,20 +281,20 @@ virNWFilterIncludeDefToRuleInst(virNWFilterDriverState *driver,
virNWFilterInst *inst)
{
virNWFilterObj *obj;
GHashTable *tmpvars = NULL;
g_autoptr(GHashTable) tmpvars = NULL;
virNWFilterDef *childdef;
virNWFilterDef *newChilddef;
int ret = -1;
VIR_DEBUG("Instantiating filter %s", inc->filterref);
if (!(obj = virNWFilterObjListFindInstantiateFilter(driver->nwfilters,
inc->filterref)))
goto cleanup;
/* create a temporary hashmap for depth-first tree traversal */
if (!(tmpvars = virNWFilterCreateVarsFrom(inc->params,
vars)))
goto cleanup;
if (!(tmpvars = virNWFilterCreateVarsFrom(inc->params, vars)))
return -1;
/* 'obj' is always appended to 'inst->filters' thus we don't unlock it */
if (!(obj = virNWFilterObjListFindInstantiateFilter(driver->nwfilters,
inc->filterref)))
return -1;
childdef = virNWFilterObjGetDef(obj);
@ -311,24 +311,18 @@ virNWFilterIncludeDefToRuleInst(virNWFilterDriverState *driver,
}
VIR_APPEND_ELEMENT(inst->filters, inst->nfilters, obj);
obj = NULL;
if (virNWFilterDefToInst(driver,
childdef,
tmpvars,
useNewFilter,
foundNewFilter,
inst) < 0)
goto cleanup;
ret = 0;
cleanup:
if (ret < 0)
inst) < 0) {
virNWFilterInstReset(inst);
virHashFree(tmpvars);
if (obj)
virNWFilterObjUnlock(obj);
return ret;
return -1;
}
return 0;
}