summaryrefslogtreecommitdiff
path: root/xmlreader.c
diff options
context:
space:
mode:
authorAron Xu <aron@debian.org>2013-06-09 00:17:44 +0800
committerAron Xu <aron@debian.org>2013-06-09 00:17:44 +0800
commit2c8fe012ef1ff6e0613480dd182dec099aa9636e (patch)
treef220f4e6733d3204aef57831a8dee2dd8551ed40 /xmlreader.c
parent3c845c4be476dc0ecb93388de9cfedb3f611e6a8 (diff)
downloadlibxml2-2c8fe012ef1ff6e0613480dd182dec099aa9636e.tar.gz
Imported Upstream version 2.9.1upstream/2.9.1
Diffstat (limited to 'xmlreader.c')
-rw-r--r--xmlreader.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/xmlreader.c b/xmlreader.c
index 579e943..00083d0 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -984,7 +984,7 @@ printf("Expand failed !\n");
* xmlTextReaderValidateCData:
* @reader: the xmlTextReaderPtr used
* @data: pointer to the CData
- * @len: lenght of the CData block in bytes.
+ * @len: length of the CData block in bytes.
*
* Push some CData for validation
*/
@@ -1409,8 +1409,7 @@ get_next_node:
#endif
(reader->entNr == 0) &&
(reader->node->prev != NULL) &&
- (reader->node->prev->type != XML_DTD_NODE) &&
- (reader->entNr == 0)) {
+ (reader->node->prev->type != XML_DTD_NODE)) {
xmlNodePtr tmp = reader->node->prev;
if ((tmp->extra & NODE_IS_PRESERVED) == 0) {
xmlUnlinkNode(tmp);
@@ -1459,8 +1458,7 @@ get_next_node:
#endif
(reader->entNr == 0) &&
(oldnode->type != XML_DTD_NODE) &&
- ((oldnode->extra & NODE_IS_PRESERVED) == 0) &&
- (reader->entNr == 0)) {
+ ((oldnode->extra & NODE_IS_PRESERVED) == 0)) {
xmlUnlinkNode(oldnode);
xmlTextReaderFreeNode(reader, oldnode);
}