mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-20 06:50:22 +03:00
nwfilter: Introduce virNWFilterObjNew
Perform the object initialization in a helper rather than inline. Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
parent
4b6264508f
commit
298d9f61b9
@ -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
|
||||
virNWFilterObjGetDef(virNWFilterObjPtr obj)
|
||||
{
|
||||
@ -321,17 +341,9 @@ virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
|
||||
return obj;
|
||||
}
|
||||
|
||||
if (VIR_ALLOC(obj) < 0)
|
||||
if (!(obj = virNWFilterObjNew()))
|
||||
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,
|
||||
nwfilters->count, obj) < 0) {
|
||||
virNWFilterObjUnlock(obj);
|
||||
|
Loading…
x
Reference in New Issue
Block a user