[PATCH 06/11] conf: Split and rename secretXMLParseNode

[John Ferlan <jferlan@xxxxxxxxxx>]

Split/rename secretXMLParseNode to virSecretDefParseNode and
virSecretDefParseXML in order to follow other drivers usage
and naming of the same functionality.

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
 src/conf/secret_conf.c | 56 ++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 7a2e4b28aa..faf44bccce 100644
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -121,29 +121,14 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt,
     return 0;
 }
 
+
 static virSecretDefPtr
-secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root)
+virSecretDefParseXML(xmlXPathContextPtr ctxt)
 {
-    xmlXPathContextPtr ctxt = NULL;
     virSecretDefPtr def = NULL, ret = NULL;
     char *prop = NULL;
     char *uuidstr = NULL;
 
-    if (!virXMLNodeNameEqual(root, "secret")) {
-        virReportError(VIR_ERR_XML_ERROR,
-                       _("unexpected root element <%s>, "
-                         "expecting <secret>"),
-                       root->name);
-        goto cleanup;
-    }
-
-    ctxt = xmlXPathNewContext(xml);
-    if (ctxt == NULL) {
-        virReportOOMError();
-        goto cleanup;
-    }
-    ctxt->node = root;
-
     if (VIR_ALLOC(def) < 0)
         goto cleanup;
 
@@ -195,17 +180,46 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root)
     if (virXPathNode("./usage", ctxt) != NULL
         && virSecretDefParseUsage(ctxt, def) < 0)
         goto cleanup;
-    ret = def;
-    def = NULL;
+    VIR_STEAL_PTR(ret, def);
 
  cleanup:
     VIR_FREE(prop);
     VIR_FREE(uuidstr);
     virSecretDefFree(def);
-    xmlXPathFreeContext(ctxt);
     return ret;
 }
 
+
+static virSecretDefPtr
+virSecretDefParseNode(xmlDocPtr xml,
+                      xmlNodePtr root)
+{
+    xmlXPathContextPtr ctxt = NULL;
+    virSecretDefPtr def = NULL;
+
+    if (!virXMLNodeNameEqual(root, "secret")) {
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("unexpected root element <%s>, "
+                         "expecting <secret>"),
+                       root->name);
+        goto cleanup;
+    }
+
+    ctxt = xmlXPathNewContext(xml);
+    if (ctxt == NULL) {
+        virReportOOMError();
+        goto cleanup;
+    }
+    ctxt->node = root;
+
+    def = virSecretDefParseXML(ctxt);
+
+ cleanup:
+    xmlXPathFreeContext(ctxt);
+    return def;
+}
+
+
 static virSecretDefPtr
 virSecretDefParse(const char *xmlStr,
                   const char *filename)
@@ -214,7 +228,7 @@ virSecretDefParse(const char *xmlStr,
     virSecretDefPtr ret = NULL;
 
     if ((xml = virXMLParse(filename, xmlStr, _("(definition_of_secret)")))) {
-        ret = secretXMLParseNode(xml, xmlDocGetRootElement(xml));
+        ret = virSecretDefParseNode(xml, xmlDocGetRootElement(xml));
         xmlFreeDoc(xml);
     }
 
-- 
2.17.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list