diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2007-03-09 16:59:05 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2007-03-09 16:59:05 +0000 |
| commit | a9c5677c2260c3372eac80622a28bd7357fdc96c (patch) | |
| tree | 6100218a749a1fb42506f4207972a8136bb241fa | |
| parent | ee0b982fe81018f8a190f62335c0e7957f4c5bcd (diff) | |
| download | android_external_libxml2-a9c5677c2260c3372eac80622a28bd7357fdc96c.tar.gz android_external_libxml2-a9c5677c2260c3372eac80622a28bd7357fdc96c.tar.bz2 android_external_libxml2-a9c5677c2260c3372eac80622a28bd7357fdc96c.zip | |
applied patch from Julien Reichel cleaning up mode and state internal
* xmlreader.c: applied patch from Julien Reichel cleaning up mode
and state internal flags mixups
Daniel
svn path=/trunk/; revision=3588
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | xmlreader.c | 33 |
2 files changed, 27 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Fri Mar 9 17:54:40 CET 2007 Daniel Veillard <daniel@veillard.com> + + * xmlreader.c: applied patch from Julien Reichel cleaning up mode + and state internal flags mixups + Wed Mar 7 16:18:18 HKT 2007 William Brack <wbrack@mmm.com.hk> * xpath.c: fixed xmlXPathCmpNodes for incorrect result on certain diff --git a/xmlreader.c b/xmlreader.c index f2bfa30a..ce66b826 100644 --- a/xmlreader.c +++ b/xmlreader.c @@ -869,13 +869,13 @@ xmlTextReaderPushData(xmlTextReaderPtr reader) { * parser. */ else if (reader->mode == XML_TEXTREADER_MODE_EOF) { - if (reader->mode != XML_TEXTREADER_DONE) { + if (reader->state != XML_TEXTREADER_DONE) { s = inbuf->use - reader->cur; val = xmlParseChunk(reader->ctxt, (const char *) &inbuf->content[reader->cur], s, 1); reader->cur = inbuf->use; - reader->mode = XML_TEXTREADER_DONE; + reader->state = XML_TEXTREADER_DONE; if ((val != 0) || (reader->ctxt->wellFormed == 0)) return(-1); } @@ -1169,8 +1169,10 @@ xmlTextReaderDoExpand(xmlTextReaderPtr reader) { if (reader->mode == XML_TEXTREADER_MODE_EOF) return(1); val = xmlTextReaderPushData(reader); - if (val < 0) + if (val < 0){ + reader->mode == XML_TEXTREADER_MODE_ERROR; return(-1); + } } while(reader->mode != XML_TEXTREADER_MODE_EOF); return(1); } @@ -1257,17 +1259,23 @@ xmlTextReaderRead(xmlTextReaderPtr reader) { */ do { val = xmlTextReaderPushData(reader); - if (val < 0) + if (val < 0){ + reader->mode = XML_TEXTREADER_MODE_ERROR; + reader->state = XML_TEXTREADER_ERROR; return(-1); + } } while ((reader->ctxt->node == NULL) && ((reader->mode != XML_TEXTREADER_MODE_EOF) && - (reader->mode != XML_TEXTREADER_DONE))); + (reader->state != XML_TEXTREADER_DONE))); if (reader->ctxt->node == NULL) { if (reader->ctxt->myDoc != NULL) { reader->node = reader->ctxt->myDoc->children; } - if (reader->node == NULL) + if (reader->node == NULL){ + reader->mode = XML_TEXTREADER_MODE_ERROR; + reader->state = XML_TEXTREADER_ERROR; return(-1); + } reader->state = XML_TEXTREADER_ELEMENT; } else { if (reader->ctxt->myDoc != NULL) { @@ -1287,7 +1295,7 @@ xmlTextReaderRead(xmlTextReaderPtr reader) { get_next_node: if (reader->node == NULL) { - if (reader->mode == XML_TEXTREADER_DONE) + if (reader->mode == XML_TEXTREADER_MODE_EOF) return(0); else return(-1); @@ -1314,8 +1322,11 @@ get_next_node: (reader->ctxt->node == reader->node->parent)) && (reader->ctxt->instate != XML_PARSER_EOF)) { val = xmlTextReaderPushData(reader); - if (val < 0) + if (val < 0){ + reader->mode = XML_TEXTREADER_MODE_ERROR; + reader->state = XML_TEXTREADER_ERROR; return(-1); + } if (reader->node == NULL) goto node_end; } @@ -1394,9 +1405,9 @@ get_next_node: (reader->node->type == XML_DOCB_DOCUMENT_NODE) || #endif (reader->node->type == XML_HTML_DOCUMENT_NODE)) { - if (reader->mode != XML_TEXTREADER_DONE) { + if (reader->mode != XML_TEXTREADER_MODE_EOF) { val = xmlParseChunk(reader->ctxt, "", 0, 1); - reader->mode = XML_TEXTREADER_DONE; + reader->state = XML_TEXTREADER_DONE; if (val != 0) return(-1); } @@ -1550,7 +1561,7 @@ node_found: #endif /* LIBXML_PATTERN_ENABLED */ return(1); node_end: - reader->mode = XML_TEXTREADER_DONE; + reader->state = XML_TEXTREADER_DONE; return(0); } |