[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 02/10] Make virDomainObjParseFile and virDomainObjParseNode static.



Signed-off-by: Chris Lalancette <clalance redhat com>
---
 src/conf/domain_conf.c |   37 +++++++++++++++++++------------------
 src/conf/domain_conf.h |    6 ------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2de838b..e4a2cac 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4504,24 +4504,9 @@ cleanup:
 }
 
 
-virDomainObjPtr virDomainObjParseFile(virCapsPtr caps,
-                                      const char *filename)
-{
-    xmlDocPtr xml;
-    virDomainObjPtr obj = NULL;
-
-    if ((xml = virXMLParseFile(filename))) {
-        obj = virDomainObjParseNode(caps, xml, xmlDocGetRootElement(xml));
-        xmlFreeDoc(xml);
-    }
-
-    return obj;
-}
-
-
-virDomainObjPtr virDomainObjParseNode(virCapsPtr caps,
-                                      xmlDocPtr xml,
-                                      xmlNodePtr root)
+static virDomainObjPtr virDomainObjParseNode(virCapsPtr caps,
+                                             xmlDocPtr xml,
+                                             xmlNodePtr root)
 {
     xmlXPathContextPtr ctxt = NULL;
     virDomainObjPtr obj = NULL;
@@ -4546,6 +4531,22 @@ cleanup:
     return obj;
 }
 
+
+static virDomainObjPtr virDomainObjParseFile(virCapsPtr caps,
+                                             const char *filename)
+{
+    xmlDocPtr xml;
+    virDomainObjPtr obj = NULL;
+
+    if ((xml = virXMLParseFile(filename))) {
+        obj = virDomainObjParseNode(caps, xml, xmlDocGetRootElement(xml));
+        xmlFreeDoc(xml);
+    }
+
+    return obj;
+}
+
+
 static int virDomainDefMaybeAddController(virDomainDefPtr def,
                                           int type,
                                           int idx)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 82f2d15..fafa0f5 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -974,12 +974,6 @@ virDomainDefPtr virDomainDefParseNode(virCapsPtr caps,
                                       xmlNodePtr root,
                                       int flags);
 
-virDomainObjPtr virDomainObjParseFile(virCapsPtr caps,
-                                      const char *filename);
-virDomainObjPtr virDomainObjParseNode(virCapsPtr caps,
-                                      xmlDocPtr xml,
-                                      xmlNodePtr root);
-
 int virDomainDefAddImplicitControllers(virDomainDefPtr def);
 
 # endif
-- 
1.6.6.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]