Attachment 885457 Details for Bug 1086699 – xmlParse{File,Memory} -> xmlRead{File,Memory}

[patch] xmlParse{File,Memory} -> xmlRead{File,Memory}

xml.diff (text/plain), 1.53 KB, created by Pino Toscano on 2014-04-11 14:29:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pino Toscano

Created: 2014-04-11 14:29:41 UTC

Size: 1.53 KB

patch

obsolete

>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;

Actions: View | Diff

Attachments on bug 1086699: 885457