NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Introduce virNWFilterObjNew

Browse Source 
Perform the object initialization in a helper rather than inline.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-04-20 11:15:28 -04:00
parent 4b6264508f
commit 298d9f61b9
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/conf/virnwfilterobj.c
View File

@ -43,6 +43,26 @@ struct _virNWFilterObj {
}; };
static virNWFilterObjPtr
virNWFilterObjNew(void)
{
virNWFilterObjPtr obj;
if (VIR_ALLOC(obj) < 0)
return NULL;
if (virMutexInitRecursive(&obj->lock) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("cannot initialize mutex"));
VIR_FREE(obj);
return NULL;
}
virNWFilterObjLock(obj);
return obj;
}
virNWFilterDefPtr virNWFilterDefPtr
virNWFilterObjGetDef(virNWFilterObjPtr obj) virNWFilterObjGetDef(virNWFilterObjPtr obj)
{ {
@ -321,17 +341,9 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
return obj; return obj;
} }
if (VIR_ALLOC(obj) < 0) if (!(obj = virNWFilterObjNew()))
return NULL; return NULL;
if (virMutexInitRecursive(&obj->lock) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("cannot initialize mutex"));
VIR_FREE(obj);
return NULL;
}
virNWFilterObjLock(obj);
if (VIR_APPEND_ELEMENT_COPY(nwfilters->objs, if (VIR_APPEND_ELEMENT_COPY(nwfilters->objs,
nwfilters->count, obj) < 0) { nwfilters->count, obj) < 0) {
virNWFilterObjUnlock(obj); virNWFilterObjUnlock(obj);