lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-21 14:53:44 +03:00
Code Activity

fixed to not send NULL to %s printing cleaning up some of the regression

Browse Source 
* HTMLparser.c: fixed to not send NULL to %s printing
* python/tests/error.py result/HTML/doc3.htm.err
  result/HTML/test3.html.err result/HTML/wired.html.err
  result/valid/t8.xml.err result/valid/t8a.xml.err: cleaning
  up some of the regression tests error
Daniel
This commit is contained in:
Daniel Veillard
2003-10-19 14:26:34 +00:00
parent a840b69261
commit 05bcb7ed30
8 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
Sun Oct 19 16:24:19 CEST 2003 Daniel Veillard <daniel@veillard.com>
* HTMLparser.c: fixed to not send NULL to %s printing
* python/tests/error.py result/HTML/doc3.htm.err
result/HTML/test3.html.err result/HTML/wired.html.err
result/valid/t8.xml.err result/valid/t8a.xml.err: cleaning
up some of the regression tests error
Sun Oct 19 15:31:43 CEST 2003 Daniel Veillard <daniel@veillard.com> Sun Oct 19 15:31:43 CEST 2003 Daniel Veillard <daniel@veillard.com>
* include/libxml/nanohttp.h include/libxml/parserInternals.h * include/libxml/nanohttp.h include/libxml/parserInternals.h

2
HTMLparser.c
View File

@@ -1132,7 +1132,7 @@ htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag)
if ((info != NULL) && (info->endTag == 3)) { if ((info != NULL) && (info->endTag == 3)) {
htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH, htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH,
"Opening and ending tag mismatch: %s and %s\n", "Opening and ending tag mismatch: %s and %s\n",
NULL, NULL); newtag, ctxt->name);
} }
if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL))
ctxt->sax->endElement(ctxt->userData, ctxt->name); ctxt->sax->endElement(ctxt->userData, ctxt->name);

2
python/tests/error.py
View File

@@ -9,7 +9,7 @@ import libxml2
# Memory debug specific # Memory debug specific
libxml2.debugMemory(1) libxml2.debugMemory(1)
expect='--> warning: --> failed to load external entity "missing.xml"\n' expect='--> I/O --> warning : --> failed to load external entity "missing.xml"\n'
err="" err=""
def callback(ctx, str): def callback(ctx, str):
global err global err

4
result/HTML/doc3.htm.err
View File

@@ -46,8 +46,8 @@ om/ad_static.asp?pid=2097&sid=1881&asid=7708"></a></IFRAME></CENTER></LI></FONT>
./test/HTML/doc3.htm:820: HTML parser error : Unexpected end tag : noscript ./test/HTML/doc3.htm:820: HTML parser error : Unexpected end tag : noscript
</A></A></B><B></NOSCRIPT></B><B><!-- END GoTo.com Search Box --></B </A></A></B><B></NOSCRIPT></B><B><!-- END GoTo.com Search Box --></B
^ ^
ID submit already defined ./test/HTML/doc3.htm:0: element input: validity error : ID submit already defined
./test/HTML/doc3.htm:826: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/doc3.htm:826: HTML parser error : Opening and ending tag mismatch: form and center
</FORM><!-- Pricewatch Search Box --><A </FORM><!-- Pricewatch Search Box --><A
^ ^
./test/HTML/doc3.htm:833: HTML parser error : Unexpected end tag : p ./test/HTML/doc3.htm:833: HTML parser error : Unexpected end tag : p

2
result/HTML/test3.html.err
View File

@@ -4,7 +4,7 @@
./test/HTML/test3.html:13: HTML parser error : Unexpected end tag : p ./test/HTML/test3.html:13: HTML parser error : Unexpected end tag : p
<p><hr></p> <p><hr></p>
^ ^
./test/HTML/test3.html:27: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/test3.html:27: HTML parser error : Opening and ending tag mismatch: h4 and b
<h4><b>Links</h4></b> <h4><b>Links</h4></b>
^ ^
./test/HTML/test3.html:27: HTML parser error : Unexpected end tag : b ./test/HTML/test3.html:27: HTML parser error : Unexpected end tag : b

26
result/HTML/wired.html.err
View File

@@ -190,19 +190,19 @@ MG SRC="http://barnesandnoble.bfast.com/booklink/serve?sourceid=383471&is_search
./test/HTML/wired.html:265: HTML parser error : Unexpected end tag : form ./test/HTML/wired.html:265: HTML parser error : Unexpected end tag : form
</tr> </form> </tr> </form>
^ ^
./test/HTML/wired.html:346: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:346: HTML parser error : Opening and ending tag mismatch: td and font
</td> </td>
^ ^
./test/HTML/wired.html:374: HTML parser error : htmlParseEntityRef: no name ./test/HTML/wired.html:374: HTML parser error : htmlParseEntityRef: no name
a, sans-serif"><b><a href="/news/commentarySection/0,1292,31926,00.html">Rants & a, sans-serif"><b><a href="/news/commentarySection/0,1292,31926,00.html">Rants &
^ ^
./test/HTML/wired.html:374: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:374: HTML parser error : Opening and ending tag mismatch: td and font
Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</font><br><br> </td Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</font><br><br> </td
^ ^
./test/HTML/wired.html:374: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:374: HTML parser error : Opening and ending tag mismatch: td and font
Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</font><br><br> </td Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux.</font><br><br> </td
^ ^
./test/HTML/wired.html:402: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:402: HTML parser error : Opening and ending tag mismatch: a and font
w.vignette.com/" style="text-decoration:none"><font color="#000000">Vignette</a> w.vignette.com/" style="text-decoration:none"><font color="#000000">Vignette</a>
^ ^
./test/HTML/wired.html:407: HTML parser error : htmlParseEntityRef: expecting ';' ./test/HTML/wired.html:407: HTML parser error : htmlParseEntityRef: expecting ';'
@@ -214,34 +214,34 @@ ervlet/appservlet?from=/wired/sprint/&template=/security/security.html&SITE=
./test/HTML/wired.html:408: HTML parser error : htmlParseEntityRef: expecting ';' ./test/HTML/wired.html:408: HTML parser error : htmlParseEntityRef: expecting ';'
wired.com&BANNER=Sprint" style="text-decoration:none"><font color="#000000">Spri wired.com&BANNER=Sprint" style="text-decoration:none"><font color="#000000">Spri
^ ^
./test/HTML/wired.html:408: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:408: HTML parser error : Opening and ending tag mismatch: a and font
com&BANNER=Sprint" style="text-decoration:none"><font color="#000000">Sprint</a> com&BANNER=Sprint" style="text-decoration:none"><font color="#000000">Sprint</a>
^ ^
./test/HTML/wired.html:408: HTML parser error : End tag : expected '>' ./test/HTML/wired.html:408: HTML parser error : End tag : expected '>'
=Sprint" style="text-decoration:none"><font color="#000000">Sprint</a></i></font =Sprint" style="text-decoration:none"><font color="#000000">Sprint</a></i></font
^ ^
./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
</td> </td>
^ ^
./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
</td> </td>
^ ^
./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
</td> </td>
^ ^
./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
</td> </td>
^ ^
./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
</td> </td>
^ ^
./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
</td> </td>
^ ^
./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
</td> </td>
^ ^
./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: (null) and (null) ./test/HTML/wired.html:414: HTML parser error : Opening and ending tag mismatch: td and font
</td> </td>
^ ^
./test/HTML/wired.html:432: HTML parser error : htmlParseEntityRef: expecting ';' ./test/HTML/wired.html:432: HTML parser error : htmlParseEntityRef: expecting ';'

3
result/valid/t8.xml.err
View File

@@ -1,4 +1,5 @@
Entity: line 1: parser error : internal error %defroot; Entity: line 1: parser error : internal error
%defroot;
^ ^
Entity: line 1: Entity: line 1:
&lt;!ELEMENT root (middle) > &lt;!ELEMENT root (middle) >

3
result/valid/t8a.xml.err
View File

@@ -1,4 +1,5 @@
Entity: line 1: parser error : internal error %defroot; Entity: line 1: parser error : internal error
%defroot;
^ ^
Entity: line 1: Entity: line 1:
&lt;!ELEMENT root (middle) > &lt;!ELEMENT root (middle) >