1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-30 22:43:14 +03:00

A typo and an obscure bug fix:

- parser.c: fixed a function name header typo
- SAX.c: notations can also occur in external subset.
Daniel
This commit is contained in:
Daniel Veillard
2001-03-21 18:06:15 +00:00
parent e0c1d72a6f
commit e020c3a797
3 changed files with 20 additions and 5 deletions

View File

@ -1,3 +1,8 @@
Wed Mar 21 19:04:34 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* parser.c: fixed a function name header typo
* SAX.c: notations can also occur in external subset.
Tue Mar 20 14:21:28 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr> Tue Mar 20 14:21:28 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* error.c: removed a C++ like comment * error.c: removed a C++ like comment

18
SAX.c
View File

@ -621,12 +621,22 @@ unparsedEntityDecl(void *ctx, const xmlChar *name,
name, publicId, systemId, notationName); name, publicId, systemId, notationName);
#endif #endif
if (ctxt->validate && ctxt->wellFormed && if (ctxt->validate && ctxt->wellFormed &&
ctxt->myDoc && ctxt->myDoc->intSubset) ctxt->myDoc && ctxt->myDoc->extSubset)
ctxt->valid &= xmlValidateNotationUse(&ctxt->vctxt, ctxt->myDoc, ctxt->valid &= xmlValidateNotationUse(&ctxt->vctxt, ctxt->myDoc,
notationName); notationName);
xmlAddDocEntity(ctxt->myDoc, name, if (ctxt->inSubset == 1)
XML_EXTERNAL_GENERAL_UNPARSED_ENTITY, xmlAddDocEntity(ctxt->myDoc, name,
publicId, systemId, notationName); XML_EXTERNAL_GENERAL_UNPARSED_ENTITY,
publicId, systemId, notationName);
else if (ctxt->inSubset == 2)
xmlAddDtdEntity(ctxt->myDoc, name,
XML_EXTERNAL_GENERAL_UNPARSED_ENTITY,
publicId, systemId, notationName);
else {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt,
"SAX.unparsedEntityDecl(%s) called while not in subset\n", name);
}
} }
/** /**

View File

@ -9092,7 +9092,7 @@ xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data,
} }
/** /**
* xmlParseBalancedChunk: * xmlParseBalancedChunkMemory:
* @doc: the document the chunk pertains to * @doc: the document the chunk pertains to
* @sax: the SAX handler bloc (possibly NULL) * @sax: the SAX handler bloc (possibly NULL)
* @user_data: The user data returned on SAX callbacks (possibly NULL) * @user_data: The user data returned on SAX callbacks (possibly NULL)