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

fixed a URI-Reference computation problem when validating small cleanup

Browse Source 
* SAX.c: fixed a URI-Reference computation problem when validating
* xmlIO.c: small cleanup
Daniel
This commit is contained in:
Daniel Veillard
2001-07-04 22:54:28 +00:00
parent 4d65a1c55b
commit 1fd36d2723
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
Thu Jul 5 00:52:25 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* SAX.c: fixed a URI-Reference computation problem when validating
* xmlIO.c: small cleanup
Thu Jul 5 00:04:58 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr> Thu Jul 5 00:04:58 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* parser.c: improved the description of a couple of interfaces * parser.c: improved the description of a couple of interfaces

22
SAX.c
View File

@@ -26,12 +26,6 @@
/* #define DEBUG_SAX */ /* #define DEBUG_SAX */
/* #define DEBUG_SAX_TREE */ /* #define DEBUG_SAX_TREE */
#ifdef __GNUC__
#ifdef DEBUG_SAX
#define ATTRIBUTE_UNUSED
#endif
#endif
/** /**
* getPublicId: * getPublicId:
* @ctx: the user data (XML parser context) * @ctx: the user data (XML parser context)
@@ -369,7 +363,7 @@ getEntity(void *ctx, const xmlChar *name)
xmlNodePtr children; xmlNodePtr children;
parse = xmlParseCtxtExternalEntity(ctxt, parse = xmlParseCtxtExternalEntity(ctxt,
ret->SystemID, ret->ExternalID, &children); ret->URI, ret->ExternalID, &children);
xmlAddChildList((xmlNodePtr) ret, children); xmlAddChildList((xmlNodePtr) ret, children);
} }
return(ret); return(ret);
@@ -530,7 +524,7 @@ attributeDecl(void *ctx, const xmlChar *elem, const xmlChar *fullname,
* An element definition has been parsed * An element definition has been parsed
*/ */
void void
elementDecl(void *ctx, const xmlChar *name, int type, elementDecl(void *ctx, const xmlChar * name, int type,
xmlElementContentPtr content) xmlElementContentPtr content)
{ {
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
@@ -538,8 +532,7 @@ elementDecl(void *ctx, const xmlChar *name, int type,
#ifdef DEBUG_SAX #ifdef DEBUG_SAX
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"SAX.elementDecl(%s, %d, ...)\n", "SAX.elementDecl(%s, %d, ...)\n", name, type);
fullname, type);
#endif #endif
if (ctxt->inSubset == 1) if (ctxt->inSubset == 1)
@@ -551,13 +544,16 @@ elementDecl(void *ctx, const xmlChar *name, int type,
else { else {
if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL))
ctxt->sax->error(ctxt, ctxt->sax->error(ctxt,
"SAX.elementDecl(%s) called while not in subset\n", name); "SAX.elementDecl(%s) called while not in subset\n",
name);
return; return;
} }
if (elem == NULL) ctxt->valid = 0; if (elem == NULL)
ctxt->valid = 0;
if (ctxt->validate && ctxt->wellFormed && if (ctxt->validate && ctxt->wellFormed &&
ctxt->myDoc && ctxt->myDoc->intSubset) ctxt->myDoc && ctxt->myDoc->intSubset)
ctxt->valid &= xmlValidateElementDecl(&ctxt->vctxt, ctxt->myDoc, elem); ctxt->valid &=
xmlValidateElementDecl(&ctxt->vctxt, ctxt->myDoc, elem);
} }
/** /**

2
xmlIO.c
View File

@@ -74,7 +74,7 @@
#define xmlRegisterDefaultOutputCallbacks xmlRegisterDefOutputCallbacks #define xmlRegisterDefaultOutputCallbacks xmlRegisterDefOutputCallbacks
#endif #endif
#define DEBUG_EXTERNAL_ENTITIES /* #define DEBUG_EXTERNAL_ENTITIES */
/* #define DEBUG_INPUT */ /* #define DEBUG_INPUT */
#ifdef DEBUG_INPUT #ifdef DEBUG_INPUT