[PATCH 22/43] conf: checkpoint: Remove virDomainCheckpointDefParseNode

[Peter Krempa]

Replace all it does by properly using virXMLParse.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/conf/checkpoint_conf.c | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
index 0d2d2050da..ea20bfdd14 100644
--- a/src/conf/checkpoint_conf.c
+++ b/src/conf/checkpoint_conf.c
@@ -181,26 +181,6 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt,
     return ret;
 }

-static virDomainCheckpointDef *
-virDomainCheckpointDefParseNode(xmlDocPtr xml,
-                                xmlNodePtr root,
-                                virDomainXMLOption *xmlopt,
-                                void *parseOpaque,
-                                unsigned int flags)
-{
-    g_autoptr(xmlXPathContext) ctxt = NULL;
-
-    if (!virXMLNodeNameEqual(root, "domaincheckpoint")) {
-        virReportError(VIR_ERR_XML_ERROR, "%s", _("domaincheckpoint"));
-        return NULL;
-    }
-
-    if (!(ctxt = virXMLXPathContextNew(xml)))
-        return NULL;
-
-    ctxt->node = root;
-    return virDomainCheckpointDefParse(ctxt, xmlopt, parseOpaque, flags);
-}

 virDomainCheckpointDef *
 virDomainCheckpointDefParseString(const char *xmlStr,
@@ -208,19 +188,19 @@ virDomainCheckpointDefParseString(const char *xmlStr,
                                   void *parseOpaque,
                                   unsigned int flags)
 {
-    virDomainCheckpointDef *ret = NULL;
     g_autoptr(xmlDoc) xml = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     int keepBlanksDefault = xmlKeepBlanksDefault(0);

-    if ((xml = virXMLParse(NULL, xmlStr, _("(domain_checkpoint)"), NULL, NULL,
-                           "domaincheckpoint.rng", true))) {
-        xmlKeepBlanksDefault(keepBlanksDefault);
-        ret = virDomainCheckpointDefParseNode(xml, xmlDocGetRootElement(xml),
-                                              xmlopt, parseOpaque, flags);
-    }
+    xml = virXMLParse(NULL, xmlStr, _("(domain_checkpoint)"),
+                      "domaincheckpoint", &ctxt, "domaincheckpoint.rng", true);
+
     xmlKeepBlanksDefault(keepBlanksDefault);

-    return ret;
+    if (!xml)
+        return NULL;
+
+    return virDomainCheckpointDefParse(ctxt, xmlopt, parseOpaque, flags);
 }


-- 
2.37.3