]> xenbits.xensource.com Git - libvirt.git/commitdiff
Make virDomainObjParseNode() static
authorHu Tao <hutao@cn.fujitsu.com>
Wed, 16 Mar 2011 07:03:47 +0000 (15:03 +0800)
committerEric Blake <eblake@redhat.com>
Thu, 17 Mar 2011 22:47:55 +0000 (16:47 -0600)
Make virDomainObjParseNode() static since it is called only
in one file.

src/conf/domain_conf.c
src/conf/domain_conf.h

index 16e12914389de49f443f7ffd648982b09a23ccb0..c6373005eb1d061811ccb63f98bdd7f6628fc9d7 100644 (file)
@@ -6081,24 +6081,10 @@ 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;
@@ -6123,6 +6109,22 @@ cleanup:
     return obj;
 }
 
+
+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)
index 30aecccdb6999a05aa00611f3bda0b571ba6140d..cbd0f98d790847ba65b0465ef8fc479b8f66e920 100644 (file)
@@ -1246,9 +1246,6 @@ virDomainDefPtr virDomainDefParseNode(virCapsPtr caps,
 
 virDomainObjPtr virDomainObjParseFile(virCapsPtr caps,
                                       const char *filename);
-virDomainObjPtr virDomainObjParseNode(virCapsPtr caps,
-                                      xmlDocPtr xml,
-                                      xmlNodePtr root);
 
 int virDomainDefAddImplicitControllers(virDomainDefPtr def);