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

[libvirt] [PATCH 01/21] virDomainDefNamespaceParse: remove unused attributes



Neither the xmlDocPtr nor the root xmlNode (also passed
in the XPathContext) are interesting to the callees.

Signed-off-by: Ján Tomko <jtomko redhat com>
---
 src/bhyve/bhyve_domain.c | 4 +---
 src/conf/capabilities.h  | 3 +--
 src/conf/domain_conf.c   | 4 ++--
 src/lxc/lxc_domain.c     | 4 +---
 src/qemu/qemu_domain.c   | 4 +---
 src/test/test_driver.c   | 4 +---
 6 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c
index 67cd6cc039..51366f8e26 100644
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -196,9 +196,7 @@ bhyveDomainDefNamespaceFree(void *nsdata)
 }
 
 static int
-bhyveDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
-                             xmlNodePtr root ATTRIBUTE_UNUSED,
-                             xmlXPathContextPtr ctxt,
+bhyveDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
                              void **data)
 {
     bhyveDomainCmdlineDefPtr cmd = NULL;
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 28b398891a..41c81ceeb1 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -182,8 +182,7 @@ struct _virCapsStoragePool {
 };
 
 
-typedef int (*virDomainDefNamespaceParse)(xmlDocPtr, xmlNodePtr,
-                                          xmlXPathContextPtr, void **);
+typedef int (*virDomainDefNamespaceParse)(xmlXPathContextPtr, void **);
 typedef void (*virDomainDefNamespaceFree)(void *);
 typedef int (*virDomainDefNamespaceXMLFormat)(virBufferPtr, void *);
 typedef const char *(*virDomainDefNamespaceHref)(void);
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 604e006dab..40b5f9b801 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -19643,7 +19643,7 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
 
 static virDomainDefPtr
 virDomainDefParseXML(xmlDocPtr xml,
-                     xmlNodePtr root,
+                     xmlNodePtr root ATTRIBUTE_UNUSED,
                      xmlXPathContextPtr ctxt,
                      virCapsPtr caps,
                      virDomainXMLOptionPtr xmlopt,
@@ -21345,7 +21345,7 @@ virDomainDefParseXML(xmlDocPtr xml,
     def->ns = xmlopt->ns;
 
     if (def->ns.parse &&
-        (def->ns.parse)(xml, root, ctxt, &def->namespaceData) < 0)
+        (def->ns.parse)(ctxt, &def->namespaceData) < 0)
         goto error;
 
     return def;
diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 51a9fd36eb..87f3c7bd63 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -207,9 +207,7 @@ lxcDomainDefNamespaceFree(void *nsdata)
 }
 
 static int
-lxcDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
-                           xmlNodePtr root ATTRIBUTE_UNUSED,
-                           xmlXPathContextPtr ctxt,
+lxcDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
                            void **data)
 {
     lxcDomainDefPtr lxcDef = NULL;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a06672333c..880307f215 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3626,9 +3626,7 @@ qemuDomainDefNamespaceParseCaps(qemuDomainXmlNsDefPtr nsdef,
 
 
 static int
-qemuDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
-                            xmlNodePtr root ATTRIBUTE_UNUSED,
-                            xmlXPathContextPtr ctxt,
+qemuDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
                             void **data)
 {
     qemuDomainXmlNsDefPtr nsdata = NULL;
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index c39eef2d4b..a59984051d 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -198,9 +198,7 @@ testDomainDefNamespaceFree(void *data)
 }
 
 static int
-testDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
-                            xmlNodePtr root ATTRIBUTE_UNUSED,
-                            xmlXPathContextPtr ctxt,
+testDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
                             void **data)
 {
     testDomainNamespaceDefPtr nsdata = NULL;
-- 
2.19.2


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