[libvirt] [PATCH 09/17] nwfilter: Consistently name virNWFilterPtr in driver
Use @nwfilter always for the name
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/nwfilter/nwfilter_driver.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index d527769..7db4f87 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -384,7 +384,7 @@ nwfilterLookupByUUID(virConnectPtr conn,
{
virNWFilterObjPtr obj;
virNWFilterDefPtr def;
- virNWFilterPtr ret = NULL;
+ virNWFilterPtr nwfilter = NULL;
nwfilterDriverLock();
obj = nwfilterObjFromNWFilter(uuid);
@@ -397,11 +397,11 @@ nwfilterLookupByUUID(virConnectPtr conn,
if (virNWFilterLookupByUUIDEnsureACL(conn, def) < 0)
goto cleanup;
- ret = virGetNWFilter(conn, def->name, def->uuid);
+ nwfilter = virGetNWFilter(conn, def->name, def->uuid);
cleanup:
virNWFilterObjUnlock(obj);
- return ret;
+ return nwfilter;
}
@@ -411,7 +411,7 @@ nwfilterLookupByName(virConnectPtr conn,
{
virNWFilterObjPtr obj;
virNWFilterDefPtr def;
- virNWFilterPtr ret = NULL;
+ virNWFilterPtr nwfilter = NULL;
nwfilterDriverLock();
obj = virNWFilterObjListFindByName(driver->nwfilters, name);
@@ -427,11 +427,11 @@ nwfilterLookupByName(virConnectPtr conn,
if (virNWFilterLookupByNameEnsureACL(conn, def) < 0)
goto cleanup;
- ret = virGetNWFilter(conn, def->name, def->uuid);
+ nwfilter = virGetNWFilter(conn, def->name, def->uuid);
cleanup:
virNWFilterObjUnlock(obj);
- return ret;
+ return nwfilter;
}
@@ -467,7 +467,7 @@ nwfilterConnectListNWFilters(virConnectPtr conn,
static int
nwfilterConnectListAllNWFilters(virConnectPtr conn,
- virNWFilterPtr **filters,
+ virNWFilterPtr **nwfilters,
unsigned int flags)
{
int ret;
@@ -478,7 +478,7 @@ nwfilterConnectListAllNWFilters(virConnectPtr conn,
return -1;
nwfilterDriverLock();
- ret = virNWFilterObjListExport(conn, driver->nwfilters, filters,
+ ret = virNWFilterObjListExport(conn, driver->nwfilters, nwfilters,
virConnectListAllNWFiltersCheckACL);
nwfilterDriverUnlock();
@@ -492,7 +492,7 @@ nwfilterDefineXML(virConnectPtr conn,
virNWFilterDefPtr def;
virNWFilterObjPtr obj = NULL;
virNWFilterDefPtr objdef;
- virNWFilterPtr ret = NULL;
+ virNWFilterPtr nwfilter = NULL;
if (!driver->privileged) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@@ -521,7 +521,7 @@ nwfilterDefineXML(virConnectPtr conn,
goto cleanup;
}
- ret = virGetNWFilter(conn, objdef->name, objdef->uuid);
+ nwfilter = virGetNWFilter(conn, objdef->name, objdef->uuid);
cleanup:
virNWFilterDefFree(def);
@@ -531,7 +531,7 @@ nwfilterDefineXML(virConnectPtr conn,
virNWFilterCallbackDriversUnlock();
virNWFilterUnlockFilterUpdates();
nwfilterDriverUnlock();
- return ret;
+ return nwfilter;
}
--
2.9.4