[Pkg-libvirt-commits] [libguestfs] 16/165: lib: xmlParse{File, Memory} -> xmlRead{File, Memory}

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 845daded5fddc70fc5e822769bc1e2a8cbead7ca
Author: Pino Toscano <ptoscano at redhat.com>
Date:   Tue May 6 19:22:14 2014 +0200

    lib: xmlParse{File,Memory} -> xmlRead{File,Memory}
    
    Switch from xmlParse* to xmlRead* so we can explicitly specify parsing
    flags, including no network usage and no entity resolution.
    The two behaviours mentioned above were not done before either, so this
    should not introduce behaviour changes in libguestfs.
---
 src/launch-libvirt.c | 3 ++-
 src/libvirt-domain.c | 3 ++-
 src/osinfo.c         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index 4eba851..bc295b4 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -611,7 +611,8 @@ parse_capabilities (guestfs_h *g, const char *capabilities_xml,
   size_t seen_qemu, seen_kvm;
   int force_tcg;
 
-  doc = xmlParseMemory (capabilities_xml, strlen (capabilities_xml));
+  doc = xmlReadMemory (capabilities_xml, strlen (capabilities_xml),
+                       NULL, NULL, XML_PARSE_NONET);
   if (doc == NULL) {
     error (g, _("unable to parse capabilities XML returned by libvirt"));
     return -1;
diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 587bf65..d148d4a 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -750,7 +750,8 @@ get_domain_xml (guestfs_h *g, virDomainPtr dom)
   }
 
   /* Parse the domain XML into an XML document. */
-  doc = xmlParseMemory (xml, strlen (xml));
+  doc = xmlReadMemory (xml, strlen (xml),
+                       NULL, NULL, XML_PARSE_NONET);
   if (doc == NULL) {
     error (g, _("unable to parse XML information returned by libvirt"));
     return NULL;
diff --git a/src/osinfo.c b/src/osinfo.c
index f0ab379..dfffaa9 100644
--- a/src/osinfo.c
+++ b/src/osinfo.c
@@ -269,7 +269,7 @@ read_osinfo_db_xml (guestfs_h *g, const char *filename)
 
   snprintf (pathname, pathname_len, "%s/%s", LIBOSINFO_DB_OS_PATH, filename);
 
-  doc = xmlParseFile (pathname);
+  doc = xmlReadFile (pathname, NULL, XML_PARSE_NONET);
   if (doc == NULL) {
     debug (g, "osinfo: unable to parse XML file %s", pathname);
     return 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git