[PATCH 36/43] util: xml: Remove virXMLParseString

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

 



Most callers use virXMLParseStringCtxt. Convert the last use case
and remove the helper.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/conf/domain_conf.c |  2 +-
 src/util/virxml.h      | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bf165d0a64..70501ca768 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -28851,7 +28851,7 @@ virDomainDefSetMetadata(virDomainDef *def,
         if (metadata) {

             /* parse and modify the xml from the user */
-            if (!(doc = virXMLParseString(metadata, _("(metadata_xml)"))))
+            if (!(doc = virXMLParseStringCtxt(metadata, _("(metadata_xml)"), NULL)))
                 return -1;

             if (virXMLInjectNamespace(doc->children, uri, key) < 0)
diff --git a/src/util/virxml.h b/src/util/virxml.h
index a80e795f6b..72d45f8018 100644
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -216,18 +216,6 @@ virXMLPickShellSafeComment(const char *str1,
 #define virXMLParse(filename, xmlStr, url, rootelement, ctxt, schemafile, validate) \
     virXMLParseHelper(VIR_FROM_THIS, filename, xmlStr, url, rootelement, ctxt, schemafile, validate)

-/**
- * virXMLParseString:
- * @xmlStr: a string to parse
- * @url: an optional filename to attribute the parse to
- *
- * Parse xml from a string.
- *
- * Return the parsed document object, or NULL on failure.
- */
-#define virXMLParseString(xmlStr, url) \
-    virXMLParseHelper(VIR_FROM_THIS, NULL, xmlStr, url, NULL, NULL, NULL, false)
-
 /**
  * virXMLParseFile:
  * @filename: file to parse
-- 
2.37.3




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux