[libxml2] xmlTextReaderReadOuterXml should handle DTD * xmlreader.c: fix description of xmlTextReaderReadOuter
- From: Rob Richards <rrichard src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2] xmlTextReaderReadOuterXml should handle DTD * xmlreader.c: fix description of xmlTextReaderReadOuter
- Date: Wed, 5 May 2010 12:00:04 +0000 (UTC)
commit 5b9dde3eed400ce54d5004e1bafd0097297a80ec
Author: Rob Richards <rrichards cdatazone org>
Date: Wed May 5 07:59:44 2010 -0400
xmlTextReaderReadOuterXml should handle DTD
* xmlreader.c: fix description of xmlTextReaderReadOuterXml and support DTD
xmlreader.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/xmlreader.c b/xmlreader.c
index c2afac7..97c71ab 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -1709,9 +1709,9 @@ xmlTextReaderReadInnerXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED)
*
* Reads the contents of the current node, including child nodes and markup.
*
- * Returns a string containing the XML content, or NULL if the current node
- * is neither an element nor attribute, or has no child nodes. The
- * string must be deallocated by the caller.
+ * Returns a string containing the node and any XML content, or NULL if the
+ * current node cannot be serialized. The string must be deallocated
+ * by the caller.
*/
xmlChar *
xmlTextReaderReadOuterXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED)
@@ -1726,7 +1726,11 @@ xmlTextReaderReadOuterXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED)
if (xmlTextReaderExpand(reader) == NULL) {
return NULL;
}
- node = xmlDocCopyNode(node, doc, 1);
+ if (node->type == XML_DTD_NODE) {
+ node = (xmlNodePtr) xmlCopyDtd((xmlDtdPtr) node);
+ } else {
+ node = xmlDocCopyNode(node, doc, 1);
+ }
buff = xmlBufferCreate();
if (xmlNodeDump(buff, doc, node, 0, 0) == -1) {
xmlFreeNode(node);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]