External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: Consistently name virNWFilterPtr in driver

Browse Source 
Use @nwfilter always for the name

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-14 09:00:27 -04:00
parent 5d5f718323
commit 54c226c10b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nwfilter/nwfilter_driver.c
View File

@ -384,7 +384,7 @@ nwfilterLookupByUUID(virConnectPtr conn,
{ {
virNWFilterObjPtr obj; virNWFilterObjPtr obj;
virNWFilterDefPtr def; virNWFilterDefPtr def;
virNWFilterPtr ret = NULL; virNWFilterPtr nwfilter = NULL;
nwfilterDriverLock(); nwfilterDriverLock();
obj = nwfilterObjFromNWFilter(uuid); obj = nwfilterObjFromNWFilter(uuid);
@ -397,11 +397,11 @@ nwfilterLookupByUUID(virConnectPtr conn,
if (virNWFilterLookupByUUIDEnsureACL(conn, def) < 0) if (virNWFilterLookupByUUIDEnsureACL(conn, def) < 0)
goto cleanup; goto cleanup;
ret = virGetNWFilter(conn, def->name, def->uuid); nwfilter = virGetNWFilter(conn, def->name, def->uuid);
cleanup: cleanup:
virNWFilterObjUnlock(obj); virNWFilterObjUnlock(obj);
return ret; return nwfilter;
} }
@ -411,7 +411,7 @@ nwfilterLookupByName(virConnectPtr conn,
{ {
virNWFilterObjPtr obj; virNWFilterObjPtr obj;
virNWFilterDefPtr def; virNWFilterDefPtr def;
virNWFilterPtr ret = NULL; virNWFilterPtr nwfilter = NULL;
nwfilterDriverLock(); nwfilterDriverLock();
obj = virNWFilterObjListFindByName(driver->nwfilters, name); obj = virNWFilterObjListFindByName(driver->nwfilters, name);
@ -427,11 +427,11 @@ nwfilterLookupByName(virConnectPtr conn,
if (virNWFilterLookupByNameEnsureACL(conn, def) < 0) if (virNWFilterLookupByNameEnsureACL(conn, def) < 0)
goto cleanup; goto cleanup;
ret = virGetNWFilter(conn, def->name, def->uuid); nwfilter = virGetNWFilter(conn, def->name, def->uuid);
cleanup: cleanup:
virNWFilterObjUnlock(obj); virNWFilterObjUnlock(obj);
return ret; return nwfilter;
} }
@ -467,7 +467,7 @@ nwfilterConnectListNWFilters(virConnectPtr conn,
static int static int
nwfilterConnectListAllNWFilters(virConnectPtr conn, nwfilterConnectListAllNWFilters(virConnectPtr conn,
virNWFilterPtr **filters, virNWFilterPtr **nwfilters,
unsigned int flags) unsigned int flags)
{ {
int ret; int ret;
@ -478,7 +478,7 @@ nwfilterConnectListAllNWFilters(virConnectPtr conn,
return -1; return -1;
nwfilterDriverLock(); nwfilterDriverLock();
ret = virNWFilterObjListExport(conn, driver->nwfilters, filters, ret = virNWFilterObjListExport(conn, driver->nwfilters, nwfilters,
virConnectListAllNWFiltersCheckACL); virConnectListAllNWFiltersCheckACL);
nwfilterDriverUnlock(); nwfilterDriverUnlock();
@ -492,7 +492,7 @@ nwfilterDefineXML(virConnectPtr conn,
virNWFilterDefPtr def; virNWFilterDefPtr def;
virNWFilterObjPtr obj = NULL; virNWFilterObjPtr obj = NULL;
virNWFilterDefPtr objdef; virNWFilterDefPtr objdef;
virNWFilterPtr ret = NULL; virNWFilterPtr nwfilter = NULL;
if (!driver->privileged) { if (!driver->privileged) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@ -520,7 +520,7 @@ nwfilterDefineXML(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
ret = virGetNWFilter(conn, objdef->name, objdef->uuid); nwfilter = virGetNWFilter(conn, objdef->name, objdef->uuid);
cleanup: cleanup:
virNWFilterDefFree(def); virNWFilterDefFree(def);
@ -530,7 +530,7 @@ nwfilterDefineXML(virConnectPtr conn,
virNWFilterCallbackDriversUnlock(); virNWFilterCallbackDriversUnlock();
virNWFilterUnlockFilterUpdates(); virNWFilterUnlockFilterUpdates();
nwfilterDriverUnlock(); nwfilterDriverUnlock();
return ret; return nwfilter;
} }