conf: nwfilterbinding: Provide only virNWFilterBindingDefParse

Remove the virNWFilterBindingDefParseString/File thin wrappers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbindingdef.c
index 524010c4c44ddf664418bd9a9b1c4edae470cb68..592731fc1b9e760bb14f4de9ee6b95a52e3e8a78 100644 (file)
--- a/src/conf/virnwfilterbindingdef.c
+++ b/src/conf/virnwfilterbindingdef.c
@@ -154,7 +154,7 @@ virNWFilterBindingDefParseXML(xmlXPathContextPtr ctxt)
 }
 
 
-static virNWFilterBindingDef *
+virNWFilterBindingDef *
 virNWFilterBindingDefParse(const char *xmlStr,
                            const char *filename,
                            unsigned int flags)
@@ -171,21 +171,6 @@ virNWFilterBindingDefParse(const char *xmlStr,
 }
 
 
-virNWFilterBindingDef *
-virNWFilterBindingDefParseString(const char *xmlStr,
-                                 unsigned int flags)
-{
-    return virNWFilterBindingDefParse(xmlStr, NULL, flags);
-}
-
-
-virNWFilterBindingDef *
-virNWFilterBindingDefParseFile(const char *filename)
-{
-    return virNWFilterBindingDefParse(NULL, filename, 0);
-}
-
-
 char *
 virNWFilterBindingDefFormat(const virNWFilterBindingDef *def)
 {

diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbindingdef.h
index a5497d5a1c673df32c9f6f7bfdda894de38fcce1..272ad686a05b7ba984b7e2f4cb2bbb8347580848 100644 (file)
--- a/src/conf/virnwfilterbindingdef.h
+++ b/src/conf/virnwfilterbindingdef.h
@@ -50,11 +50,9 @@ virNWFilterBindingDef *
 virNWFilterBindingDefParseXML(xmlXPathContextPtr ctxt);
 
 virNWFilterBindingDef *
-virNWFilterBindingDefParseString(const char *xml,
-                                 unsigned int flags);
-
-virNWFilterBindingDef *
-virNWFilterBindingDefParseFile(const char *filename);
+virNWFilterBindingDefParse(const char *xmlStr,
+                           const char *filename,
+                           unsigned int flags);
 
 char *
 virNWFilterBindingDefFormat(const virNWFilterBindingDef *def);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6e85a8c6cbb95c197c65783a3c30e5eaa6cf8559..b8165c07d9c9d3bdafb26dbb39cdc4400721a6a4 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1364,8 +1364,7 @@ virNWFilterBindingDefCopy;
 virNWFilterBindingDefFormat;
 virNWFilterBindingDefFormatBuf;
 virNWFilterBindingDefFree;
-virNWFilterBindingDefParseFile;
-virNWFilterBindingDefParseString;
+virNWFilterBindingDefParse;
 virNWFilterBindingDefParseXML;
 
 

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 9cb306909c192cfe1da8de40e1cf34408b1f55b3..f9fc09bbd3d48c96a0fecdbfe245b513e1828fba 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -739,7 +739,7 @@ nwfilterBindingCreateXML(virConnectPtr conn,
         return NULL;
     }
 
-    def = virNWFilterBindingDefParseString(xml, flags);
+    def = virNWFilterBindingDefParse(xml, NULL, flags);
     if (!def)
         return NULL;
 

diff --git a/tests/virnwfilterbindingxml2xmltest.c b/tests/virnwfilterbindingxml2xmltest.c
index 0c93b58a0c12f519538fe80aa1bb35b33021416e..bde21968fe376b05eb50abcd432248871774d75c 100644 (file)
--- a/tests/virnwfilterbindingxml2xmltest.c
+++ b/tests/virnwfilterbindingxml2xmltest.c
@@ -41,7 +41,7 @@ testCompareXMLToXMLFiles(const char *xml)
 
     virResetLastError();
 
-    if (!(dev = virNWFilterBindingDefParseFile(xml)))
+    if (!(dev = virNWFilterBindingDefParse(NULL, xml, 0)))
         goto fail;
 
     if (!(actual = virNWFilterBindingDefFormat(dev)))