diff --git a/ChangeLog b/ChangeLog index ff6811e9..81285347 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Oct 19 16:24:19 CEST 2003 Daniel Veillard + + * 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 * include/libxml/nanohttp.h include/libxml/parserInternals.h diff --git a/HTMLparser.c b/HTMLparser.c index 881821a5..ba12eccb 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -1132,7 +1132,7 @@ htmlAutoCloseOnClose(htmlParserCtxtPtr ctxt, const xmlChar * newtag) if ((info != NULL) && (info->endTag == 3)) { htmlParseErr(ctxt, XML_ERR_TAG_NAME_MISMATCH, "Opening and ending tag mismatch: %s and %s\n", - NULL, NULL); + newtag, ctxt->name); } if ((ctxt->sax != NULL) && (ctxt->sax->endElement != NULL)) ctxt->sax->endElement(ctxt->userData, ctxt->name); diff --git a/python/tests/error.py b/python/tests/error.py index cc771de1..150f379b 100755 --- a/python/tests/error.py +++ b/python/tests/error.py @@ -9,7 +9,7 @@ import libxml2 # Memory debug specific 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="" def callback(ctx, str): global err diff --git a/result/HTML/doc3.htm.err b/result/HTML/doc3.htm.err index 1edc25b4..ef71f43d 100644 --- a/result/HTML/doc3.htm.err +++ b/result/HTML/doc3.htm.err @@ -46,8 +46,8 @@ om/ad_static.asp?pid=2097&sid=1881&asid=7708"> ./test/HTML/doc3.htm:820: HTML parser error : Unexpected end tag : noscript

^ -./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

Links

^ ./test/HTML/test3.html:27: HTML parser error : Unexpected end tag : b diff --git a/result/HTML/wired.html.err b/result/HTML/wired.html.err index 73779318..70db11b0 100644 --- a/result/HTML/wired.html.err +++ b/result/HTML/wired.html.err @@ -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: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 ^ ./test/HTML/wired.html:374: HTML parser error : htmlParseEntityRef: no name a, sans-serif">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.



Vignette ^ ./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 ';' wired.com&BANNER=Sprint" style="text-decoration:none">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">Sprint ^ ./test/HTML/wired.html:408: HTML parser error : End tag : expected '>' =Sprint" style="text-decoration:none">Sprint ^ -./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 ^ -./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 ^ -./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 ^ -./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 ^ -./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 ^ -./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 ^ -./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 ^ ./test/HTML/wired.html:432: HTML parser error : htmlParseEntityRef: expecting ';' diff --git a/result/valid/t8.xml.err b/result/valid/t8.xml.err index fa563161..7ae7bb4f 100644 --- a/result/valid/t8.xml.err +++ b/result/valid/t8.xml.err @@ -1,4 +1,5 @@ -Entity: line 1: parser error : internal error %defroot; +Entity: line 1: parser error : internal error + %defroot; ^ Entity: line 1: <!ELEMENT root (middle) > diff --git a/result/valid/t8a.xml.err b/result/valid/t8a.xml.err index fa563161..7ae7bb4f 100644 --- a/result/valid/t8a.xml.err +++ b/result/valid/t8a.xml.err @@ -1,4 +1,5 @@ -Entity: line 1: parser error : internal error %defroot; +Entity: line 1: parser error : internal error + %defroot; ^ Entity: line 1: <!ELEMENT root (middle) >