External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: nwfilter: Remove virNWFilterDefParseNode

Browse Source 
Use virXMLParse to fetch the XML context and validate the top level XML
element name so that virNWFilterDefParseNode is no longer needed.

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 10:32:52 +02:00
parent 573f764ee4
commit 2a8998d427
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/nwfilter_conf.c
View File

@ -2685,42 +2685,20 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt)
}
virNWFilterDef *
virNWFilterDefParseNode(xmlDocPtr xml,
xmlNodePtr root)
{
g_autoptr(xmlXPathContext) ctxt = NULL;
if (STRNEQ((const char *)root->name, "filter")) {
virReportError(VIR_ERR_XML_ERROR,
"%s",
_("unknown root element for nw filter"));
return NULL;
}
if (!(ctxt = virXMLXPathContextNew(xml)))
return NULL;
ctxt->node = root;
return virNWFilterDefParseXML(ctxt);
}
static virNWFilterDef *
virNWFilterDefParse(const char *xmlStr,
const char *filename,
unsigned int flags)
{
virNWFilterDef *def = NULL;
g_autoptr(xmlDoc) xml = NULL;
g_autoptr(xmlXPathContext) ctxt = NULL;
bool validate = flags & VIR_NWFILTER_DEFINE_VALIDATE;
if ((xml = virXMLParse(filename, xmlStr, _("(nwfilter_definition)"),
NULL, NULL, "nwfilter.rng", validate))) {
def = virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml));
}
if (!(xml = virXMLParse(filename, xmlStr, _("(nwfilter_definition)"),
"filter", &ctxt, "nwfilter.rng", validate)))
return NULL;
return def;
return virNWFilterDefParseXML(ctxt);
}

4
src/conf/nwfilter_conf.h
View File

@ -533,10 +533,6 @@ int
virNWFilterDeleteDef(const char *configDir,
virNWFilterDef *def);
virNWFilterDef *
virNWFilterDefParseNode(xmlDocPtr xml,
xmlNodePtr root);
char *
virNWFilterDefFormat(const virNWFilterDef *def);