aboutsummaryrefslogtreecommitdiffstats
path: root/result
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@redhat.com>2012-07-30 20:09:25 +0800
committerDaniel Veillard <veillard@redhat.com>2012-07-30 20:09:25 +0800
commite7bf892d8cb3feff085fde5c029092d4f81245bf (patch)
treeb90ed05f7a0e73dd9f588cca8ece05e5207a94f0 /result
parent48b4cdde3483e054af8ea02e0cd7ee467b0e9a50 (diff)
downloadandroid_external_libxml2-e7bf892d8cb3feff085fde5c029092d4f81245bf.tar.gz
android_external_libxml2-e7bf892d8cb3feff085fde5c029092d4f81245bf.tar.bz2
android_external_libxml2-e7bf892d8cb3feff085fde5c029092d4f81245bf.zip
Improve error reporting on parser errors
The extra string was being dismissed when provided. * parser.c: handle bot case properly * result/: this changes a few error reports
Diffstat (limited to 'result')
-rw-r--r--result/errors/content1.xml.err3
-rw-r--r--result/errors/content1.xml.str3
-rw-r--r--result/valid/t8.xml.err3
-rw-r--r--result/valid/t8a.xml.err3
4 files changed, 8 insertions, 4 deletions
diff --git a/result/errors/content1.xml.err b/result/errors/content1.xml.err
index e86c7f98..425be393 100644
--- a/result/errors/content1.xml.err
+++ b/result/errors/content1.xml.err
@@ -4,7 +4,8 @@
./test/errors/content1.xml:7: parser error : expected '>'
<!ELEMENT aElement (a |b * >
^
-./test/errors/content1.xml:7: parser error : internal error
+./test/errors/content1.xml:7: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
<!ELEMENT aElement (a |b * >
^
./test/errors/content1.xml:7: parser error : DOCTYPE improperly terminated
diff --git a/result/errors/content1.xml.str b/result/errors/content1.xml.str
index da346f84..d806a63d 100644
--- a/result/errors/content1.xml.str
+++ b/result/errors/content1.xml.str
@@ -4,7 +4,8 @@
./test/errors/content1.xml:7: parser error : expected '>'
<!ELEMENT aElement (a |b * >
^
-./test/errors/content1.xml:7: parser error : internal error
+./test/errors/content1.xml:7: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
<!ELEMENT aElement (a |b * >
^
./test/errors/content1.xml:7: parser error : DOCTYPE improperly terminated
diff --git a/result/valid/t8.xml.err b/result/valid/t8.xml.err
index 7ae7bb4f..d795788c 100644
--- a/result/valid/t8.xml.err
+++ b/result/valid/t8.xml.err
@@ -1,4 +1,5 @@
-Entity: line 1: parser error : internal error
+Entity: line 1: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
%defroot;
^
Entity: line 1:
diff --git a/result/valid/t8a.xml.err b/result/valid/t8a.xml.err
index 7ae7bb4f..d795788c 100644
--- a/result/valid/t8a.xml.err
+++ b/result/valid/t8a.xml.err
@@ -1,4 +1,5 @@
-Entity: line 1: parser error : internal error
+Entity: line 1: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
%defroot;
^
Entity: line 1: