conf: interface: Remove virInterfaceDefParseFile

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

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

diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 628199c6f399bd7855c9f7d9098db1c35077c939..b31fdce101e3b897ea9fa1b107c8bdbc182dac6c 100644 (file)
--- 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 b8927d7b4f0c1508cda2c9b80f72afec2d77b876..1272216300f148adf6a5c4168ccde291d2548a0b 100644 (file)
--- 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 1251bba89679ed7367d2cabf85824db536d6a165..a24e0db5d7694ecd979d1cae3707b882c88c4ebb 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -792,7 +792,6 @@ virDomainDiskDefValidateStartupPolicy;
 # conf/interface_conf.h
 virInterfaceDefFormat;
 virInterfaceDefFree;
-virInterfaceDefParseFile;
 virInterfaceDefParseString;
 virInterfaceDefParseXML;