External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: savecookie: Remove virSaveCookieParseNode

Browse Source 
The function provided just checking of the root XML node name which can
be easily moved into the caller wich doesn't do that already and
checking of the pointers which is trivial. Remove the helper.

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 15:03:19 +02:00
parent afa2970b7f
commit f093022155
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/conf/virsavecookie.c
View File

@ -32,26 +32,6 @@
VIR_LOG_INIT("conf.savecookie");
static int
virSaveCookieParseNode(xmlXPathContextPtr ctxt,
virObject **obj,
virSaveCookieCallbacks *saveCookie)
{
*obj = NULL;
if (!virXMLNodeNameEqual(ctxt->node, "cookie")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("XML does not contain expected 'cookie' element"));
return -1;
}
if (!saveCookie || !saveCookie->parse)
return 0;
return saveCookie->parse(ctxt, obj);
}
int
virSaveCookieParse(xmlXPathContextPtr ctxt,
virObject **obj,
@ -64,7 +44,10 @@ virSaveCookieParse(xmlXPathContextPtr ctxt,
if (!(ctxt->node = virXPathNode("./cookie", ctxt)))
return 0;
return virSaveCookieParseNode(ctxt, obj, saveCookie);
if (!saveCookie || !saveCookie->parse)
return 0;
return saveCookie->parse(ctxt, obj);
}
@ -78,13 +61,13 @@ virSaveCookieParseString(const char *xml,
*obj = NULL;
if (!xml)
if (!xml || !saveCookie || !saveCookie->parse)
return 0;
if (!(doc = virXMLParseStringCtxt(xml, _("(save cookie)"), &ctxt)))
if (!(doc = virXMLParse(NULL, xml, _("(save cookie)"), "cookie", &ctxt, NULL, false)))
return -1;
return virSaveCookieParseNode(ctxt, obj, saveCookie);
return saveCookie->parse(ctxt, obj);
}