Re: [libvirt] [PATCH 6/6] conf: Use consistent function name prefixes for virnwfilterobj
On 03/06/2017 05:36 PM, John Ferlan wrote:
Use "virNWFilterObj" as a prefix for any external API in
virnwfilterobj
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/virnwfilterobj.c | 34 +++++++++++++++++-----------------
src/conf/virnwfilterobj.h | 6 +++---
src/libvirt_private.syms | 4 ++--
src/nwfilter/nwfilter_driver.c | 8 +++-----
4 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c
index 0d81912..7e13afb 100644
--- a/src/conf/virnwfilterobj.c
+++ b/src/conf/virnwfilterobj.c
@@ -117,9 +117,9 @@ virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters,
static int
-_virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilters,
- virNWFilterDefPtr def,
- const char *filtername)
+_virNWFilterObjDefLoopDetect(virNWFilterObjListPtr nwfilters,
+ virNWFilterDefPtr def,
+ const char *filtername)
Ouch. This is even worse than virFunction() + virFunctionInternal()
pair. Moreover, I don't think that we need virNWFilterDefLoopDetect at
all. I mean, this one starting with _ can take its place. The only
difference is that while virNWFilterDefLoopDetect() takes just two
arguments _virNWFilterDefLoopDetect() takes three.
But I guess that can be saved either for a follow up patch or one that's
inserted before this one.
{
int rc = 0;
size_t i;
@@ -141,8 +141,8 @@ _virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilters,
obj = virNWFilterObjFindByName(nwfilters,
entry->include->filterref);
if (obj) {
- rc = _virNWFilterDefLoopDetect(nwfilters,
- obj->def, filtername);
+ rc = _virNWFilterObjDefLoopDetect(nwfilters,
+ obj->def, filtername);
virNWFilterObjUnlock(obj);
if (rc < 0)
Michal