[PATCH 29/43] conf: interface: Remove virInterfaceDefParseFile

[Peter Krempa]

The function was not used. Remove it and merge virInterfaceDefParse
into virInterfaceDefParseString.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/conf/interface_conf.c | 24 ++++--------------------
 src/conf/interface_conf.h |  3 ---
 src/libvirt_private.syms  |  1 -
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 628199c6f3..b31fdce101 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -669,16 +669,15 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt,
 }


-static virInterfaceDef *
-virInterfaceDefParse(const char *xmlStr,
-                     const char *filename,
-                     unsigned int flags)
+virInterfaceDef *
+virInterfaceDefParseString(const char *xmlStr,
+                           unsigned int flags)
 {
     g_autoptr(xmlDoc) xml = NULL;
     g_autoptr(xmlXPathContext) ctxt = NULL;
     bool validate = flags & VIR_INTERFACE_DEFINE_VALIDATE;

-    if (!(xml = virXMLParse(filename, xmlStr, _("(interface_definition)"),
+    if (!(xml = virXMLParse(NULL, xmlStr, _("(interface_definition)"),
                             "interface", &ctxt, "interface.rng", validate)))
         return NULL;

@@ -686,21 +685,6 @@ virInterfaceDefParse(const char *xmlStr,
 }


-virInterfaceDef *
-virInterfaceDefParseString(const char *xmlStr,
-                           unsigned int flags)
-{
-    return virInterfaceDefParse(xmlStr, NULL, flags);
-}
-
-
-virInterfaceDef *
-virInterfaceDefParseFile(const char *filename)
-{
-    return virInterfaceDefParse(NULL, filename, 0);
-}
-
-
 static int
 virInterfaceBridgeDefFormat(virBuffer *buf,
                             const virInterfaceDef *def)
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index b8927d7b4f..1272216300 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -158,9 +158,6 @@ virInterfaceDef *
 virInterfaceDefParseString(const char *xmlStr,
                            unsigned int flags);

-virInterfaceDef *
-virInterfaceDefParseFile(const char *filename);
-
 virInterfaceDef *
 virInterfaceDefParseXML(xmlXPathContextPtr ctxt,
                         int parentIfType);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 1251bba896..a24e0db5d7 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -792,7 +792,6 @@ virDomainDiskDefValidateStartupPolicy;
 # conf/interface_conf.h
 virInterfaceDefFormat;
 virInterfaceDefFree;
-virInterfaceDefParseFile;
 virInterfaceDefParseString;
 virInterfaceDefParseXML;

-- 
2.37.3