conf: change virNWFilterBindingPtr to virNWFilterBindingDefPtr

We are going to want to expose the NWFilter binding concept in the
public API, so the virNWFilterBindingPtr type needs to be used there.
Our internal type will shortly gain an XML representation, so rename
it to virNWFilterBindingDefPtr which follows our normal conventions.

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 452daa214a7006dcf8ccfc2d90541c5e67d7a68d..6422f6b8ea9df189b9a12d095e926fb25adb9661 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -3268,25 +3268,25 @@ virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule)
 
 
 void
-virNWFilterBindingFree(virNWFilterBindingPtr binding)
+virNWFilterBindingDefFree(virNWFilterBindingDefPtr def)
 {
-    if (!binding)
+    if (!def)
         return;
 
-    VIR_FREE(binding->ownername);
-    VIR_FREE(binding->portdevname);
-    VIR_FREE(binding->linkdevname);
-    VIR_FREE(binding->filter);
-    virHashFree(binding->filterparams);
+    VIR_FREE(def->ownername);
+    VIR_FREE(def->portdevname);
+    VIR_FREE(def->linkdevname);
+    VIR_FREE(def->filter);
+    virHashFree(def->filterparams);
 
-    VIR_FREE(binding);
+    VIR_FREE(def);
 }
 
 
-virNWFilterBindingPtr
-virNWFilterBindingCopy(virNWFilterBindingPtr src)
+virNWFilterBindingDefPtr
+virNWFilterBindingDefCopy(virNWFilterBindingDefPtr src)
 {
-    virNWFilterBindingPtr ret;
+    virNWFilterBindingDefPtr ret;
 
     if (VIR_ALLOC(ret) < 0)
         return NULL;
@@ -3316,6 +3316,6 @@ virNWFilterBindingCopy(virNWFilterBindingPtr src)
     return ret;
 
  error:
-    virNWFilterBindingFree(ret);
+    virNWFilterBindingDefFree(ret);
     return NULL;
 }

diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index 6fcbba4bd5a4fc1a422af7714596e2b4220c897a..c72171f2f24a3bf66c33c67e2674f26c6dd69cbf 100644 (file)
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -545,10 +545,10 @@ struct _virNWFilterDef {
     virNWFilterEntryPtr *filterEntries;
 };
 
-typedef struct virNWFilterBinding virNWFilterBinding;
-typedef virNWFilterBinding *virNWFilterBindingPtr;
+typedef struct _virNWFilterBindingDef virNWFilterBindingDef;
+typedef virNWFilterBindingDef *virNWFilterBindingDefPtr;
 
-struct virNWFilterBinding {
+struct _virNWFilterBindingDef {
     char *ownername;
     unsigned char owneruuid[VIR_UUID_BUFLEN];
     char *portdevname;
@@ -664,9 +664,9 @@ bool
 virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule);
 
 void
-virNWFilterBindingFree(virNWFilterBindingPtr binding);
-virNWFilterBindingPtr
-virNWFilterBindingCopy(virNWFilterBindingPtr src);
+virNWFilterBindingDefFree(virNWFilterBindingDefPtr binding);
+virNWFilterBindingDefPtr
+virNWFilterBindingDefCopy(virNWFilterBindingDefPtr src);
 
 VIR_ENUM_DECL(virNWFilterRuleAction);
 VIR_ENUM_DECL(virNWFilterRuleDirection);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 98913a577a19b1eaea303ec7237edbdc532a1a29..91b6235328927aa9422ad6250a748c3b8902105c 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -787,8 +787,8 @@ virDomainNumatuneSpecifiedMaxNode;
 
 
 # conf/nwfilter_conf.h
-virNWFilterBindingCopy;
-virNWFilterBindingFree;
+virNWFilterBindingDefCopy;
+virNWFilterBindingDefFree;
 virNWFilterCallbackDriversLock;
 virNWFilterCallbackDriversUnlock;
 virNWFilterChainSuffixTypeToString;