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>
This commit is contained in:
Peter Krempa 2022-09-23 13:09:58 +02:00
parent 05ffd59436
commit be43d74b63
3 changed files with 4 additions and 24 deletions

View File

@ -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)

View File

@ -158,9 +158,6 @@ virInterfaceDef *
virInterfaceDefParseString(const char *xmlStr,
unsigned int flags);
virInterfaceDef *
virInterfaceDefParseFile(const char *filename);
virInterfaceDef *
virInterfaceDefParseXML(xmlXPathContextPtr ctxt,
int parentIfType);

View File

@ -792,7 +792,6 @@ virDomainDiskDefValidateStartupPolicy;
# conf/interface_conf.h
virInterfaceDefFormat;
virInterfaceDefFree;
virInterfaceDefParseFile;
virInterfaceDefParseString;
virInterfaceDefParseXML;