[PATCH 07/43] conf: nwfilterbinding: Provide only virNWFilterBindingDefParse
Remove the virNWFilterBindingDefParseString/File thin wrappers.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/conf/virnwfilterbindingdef.c | 17 +----------------
src/conf/virnwfilterbindingdef.h | 8 +++-----
src/libvirt_private.syms | 3 +--
src/nwfilter/nwfilter_driver.c | 2 +-
tests/virnwfilterbindingxml2xmltest.c | 2 +-
5 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbindingdef.c
index 524010c4c4..592731fc1b 100644
--- 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 a5497d5a1c..272ad686a0 100644
--- 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 6e85a8c6cb..b8165c07d9 100644
--- 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 9cb306909c..f9fc09bbd3 100644
--- 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 0c93b58a0c..bde21968fe 100644
--- 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)))
--
2.37.3