shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-03 08:58:17 +03:00
Code

fix from Steve Ball and update of the comment. William pointed out that

Browse Source 
* xmlreader.c: fix from Steve Ball and update of the comment.
* Makefile.am result/errors/*.str: William pointed out that
  the streaming error checking part wasn't streaming, fixing
Daniel
This commit is contained in:
Daniel Veillard 2004-06-14 19:58:20 +00:00
parent ab690c5e9e
commit 4a14fb8fa2
8 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Jun 14 21:56:31 CEST 2004 Daniel Veillard <daniel@veillard.com>
* xmlreader.c: fix from Steve Ball and update of the comment.
* Makefile.am result/errors/*.str: William pointed out that
the streaming error checking part wasn't streaming, fixing
Mon Jun 14 14:11:52 CEST 2004 Daniel Veillard <daniel@veillard.com> Mon Jun 14 14:11:52 CEST 2004 Daniel Veillard <daniel@veillard.com>
* catalog.c: patch from Igor for the default catalog path on Windows * catalog.c: patch from Igor for the default catalog path on Windows

4
Makefile.am
View File

@ -328,12 +328,12 @@ Errtests : xmllint$(EXEEXT)
if [ ! -d $$i ] ; then \ if [ ! -d $$i ] ; then \
if [ ! -f $(srcdir)/result/errors/$$name.str ] ; then \ if [ ! -f $(srcdir)/result/errors/$$name.str ] ; then \
echo New test file $$name ; \ echo New test file $$name ; \
$(CHECKER) $(top_builddir)/xmllint $$i \ $(CHECKER) $(top_builddir)/xmllint --stream $$i \
2> $(srcdir)/result/errors/$$name.str \ 2> $(srcdir)/result/errors/$$name.str \
> $(srcdir)/result/errors/$$name ; \ > $(srcdir)/result/errors/$$name ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
else \ else \
log=`$(CHECKER) $(top_builddir)/xmllint $$i 2> error.$$name > result.$$name ; \ log=`$(CHECKER) $(top_builddir)/xmllint --stream $$i 2> error.$$name > result.$$name ; \
grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0"; \
diff $(srcdir)/result/errors/$$name result.$$name ; \ diff $(srcdir)/result/errors/$$name result.$$name ; \
diff $(srcdir)/result/errors/$$name.str error.$$name` ; \ diff $(srcdir)/result/errors/$$name.str error.$$name` ; \

10
result/errors/attr1.xml.str
View File

@ -1,6 +1,10 @@
./test/errors/attr1.xml:2: parser error : AttValue: ' expected ./test/errors/attr1.xml:2: parser error : AttValue: ' expected
^ ^
./test/errors/attr1.xml:2: parser error : Extra content at the end of the document ./test/errors/attr1.xml:2: parser error : attributes construct error
<foo foo="oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
^ ^
./test/errors/attr1.xml:2: parser error : Couldn't find end of Start Tag foo
^
./test/errors/attr1.xml : failed to parse

10
result/errors/attr2.xml.str
View File

@ -1,6 +1,10 @@
./test/errors/attr2.xml:2: parser error : AttValue: ' expected ./test/errors/attr2.xml:2: parser error : AttValue: ' expected
^ ^
./test/errors/attr2.xml:2: parser error : Extra content at the end of the document ./test/errors/attr2.xml:2: parser error : attributes construct error
<foo foo=">ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo
^ ^
./test/errors/attr2.xml:2: parser error : Couldn't find end of Start Tag foo
^
./test/errors/attr2.xml : failed to parse

1
result/errors/charref1.xml.str
View File

@ -1,3 +1,4 @@
./test/errors/charref1.xml:1: parser error : xmlParseCharRef: invalid xmlChar value 60 ./test/errors/charref1.xml:1: parser error : xmlParseCharRef: invalid xmlChar value 60
<bla>&#010100000000000000000000000000000000000000000000000060;</bla> <bla>&#010100000000000000000000000000000000000000000000000060;</bla>
^ ^
./test/errors/charref1.xml : failed to parse

3
result/errors/name.xml.str
View File

File diff suppressed because one or more lines are too long

10
result/errors/name2.xml.str
View File

File diff suppressed because one or more lines are too long

8
xmlreader.c
View File

@ -3547,9 +3547,9 @@ xmlTextReaderCurrentNode(xmlTextReaderPtr reader) {
* xmlTextReaderPreserve: * xmlTextReaderPreserve:
* @reader: the xmlTextReaderPtr used * @reader: the xmlTextReaderPtr used
* *
* * This tells the XML Reader to preserve the current node.
* current node being accessed by the xmlTextReader. This is dangerous * The caller must also use xmlTextReaderCurrentDoc() to
* because the underlying node may be destroyed on the next Reads. * keep an handle on the resulting document once parsing has finished
* *
* Returns the xmlNodePtr or NULL in case of error. * Returns the xmlNodePtr or NULL in case of error.
*/ */
@ -3567,7 +3567,7 @@ xmlTextReaderPreserve(xmlTextReaderPtr reader) {
if (cur == NULL) if (cur == NULL)
return(NULL); return(NULL);
if (cur->type != XML_DOCUMENT_NODE) { if ((cur->type != XML_DOCUMENT_NODE) && (cur->type != XML_DTD_NODE)) {
cur->extra |= NODE_IS_PRESERVED; cur->extra |= NODE_IS_PRESERVED;
cur->extra |= NODE_IS_SPRESERVED; cur->extra |= NODE_IS_SPRESERVED;
} }