lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-08-01 10:06:59 +03:00
Code Activity

Various small bugfixes, Daniel.

Browse Source
This commit is contained in:
Daniel Veillard
1999-10-09 09:11:45 +00:00
parent 2673d3c856
commit 6077d03d0e
6 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Sat Oct 9 11:02:57 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
* Makefile.am: Arturo patch for xmlConf.sh version info
* parser.c: Tim Josling patch for single quoted items
* tester.c: Tim Josling patch for tester options usage
* tree.h: indent cleanup
Fri Oct 8 16:35:37 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org> Fri Oct 8 16:35:37 CEST 1999 Daniel Veillard <Daniel.Veillard@w3.org>
* HTMLparser.c parser.h : Fixed problems with HTML parsing * HTMLparser.c parser.h : Fixed problems with HTML parsing

1
Makefile.am
View File

@ -259,5 +259,6 @@ xmlConf.sh: xmlConf.sh.in Makefile
sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \ sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
-e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \ -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
-e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \ -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
-e 's?\@VERSION\@?$(VERSION)?g' \
< $(srcdir)/xmlConf.sh.in > xmlConf.tmp \ < $(srcdir)/xmlConf.sh.in > xmlConf.tmp \
&& mv xmlConf.tmp xmlConf.sh && mv xmlConf.tmp xmlConf.sh

9
parser.c
View File

@ -2615,9 +2615,7 @@ xmlChar *
xmlParsePubidLiteral(xmlParserCtxtPtr ctxt) { xmlParsePubidLiteral(xmlParserCtxtPtr ctxt) {
const xmlChar *q; const xmlChar *q;
xmlChar *ret = NULL; xmlChar *ret = NULL;
/*
* Name ::= (Letter | '_') (NameChar)*
*/
SHRINK; SHRINK;
if (CUR == '"') { if (CUR == '"') {
NEXT; NEXT;
@ -2635,9 +2633,8 @@ xmlParsePubidLiteral(xmlParserCtxtPtr ctxt) {
} else if (CUR == '\'') { } else if (CUR == '\'') {
NEXT; NEXT;
q = CUR_PTR; q = CUR_PTR;
while ((IS_LETTER(CUR)) && (CUR != '\'')) while (IS_PUBIDCHAR(CUR)) NEXT;
NEXT; if (CUR != '\'') {
if (!IS_LETTER(CUR)) {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt->userData, "Unfinished PubidLiteral\n"); ctxt->sax->error(ctxt->userData, "Unfinished PubidLiteral\n");
ctxt->errNo = XML_ERR_LITERAL_NOT_FINISHED; ctxt->errNo = XML_ERR_LITERAL_NOT_FINISHED;

3
tester.c
View File

@ -228,7 +228,7 @@ int main(int argc, char **argv) {
} }
} }
if (files == 0) { if (files == 0) {
printf("Usage : %s [--debug] [--copy] [--recover] [--noent] [--noout] XMLfiles ...\n", printf("Usage : %s [--debug] [--copy] [--recover] [--noent] [--noout] [--valid] [--repeat] XMLfiles ...\n",
argv[0]); argv[0]);
printf("\tParse the XML files and output the result of the parsing\n"); printf("\tParse the XML files and output the result of the parsing\n");
printf("\t--debug : dump a debug tree of the in-memory document\n"); printf("\t--debug : dump a debug tree of the in-memory document\n");
@ -236,6 +236,7 @@ int main(int argc, char **argv) {
printf("\t--recover : output what is parsable on broken XmL documents\n"); printf("\t--recover : output what is parsable on broken XmL documents\n");
printf("\t--noent : substitute entity references by their value\n"); printf("\t--noent : substitute entity references by their value\n");
printf("\t--noout : don't output the result\n"); printf("\t--noout : don't output the result\n");
printf("\t--valid : validate the document in addition to std well-formed check\n");
printf("\t--repeat : parse the file 100 times, for timing or profiling\n"); printf("\t--repeat : parse the file 100 times, for timing or profiling\n");
} }
xmlMemoryDump(); xmlMemoryDump();