1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00

fixed bug #121210 (callback to sax->error, sax->warning with wrong

* SAX2.c, xmlIO.c: fixed bug #121210 (callback to sax->error,
  sax->warning with wrong params).
This commit is contained in:
William M. Brack
2003-09-06 18:02:53 +00:00
parent 93625d300f
commit 4811ba3bc2
3 changed files with 28 additions and 21 deletions

View File

@ -2609,10 +2609,10 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
ID = "NULL";
if ((ctxt->validate) && (ctxt->sax != NULL) &&
(ctxt->sax->error != NULL))
ctxt->sax->error(ctxt,
ctxt->sax->error(ctxt->userData,
"failed to load external entity \"%s\"\n", ID);
else if ((ctxt->sax != NULL) && (ctxt->sax->warning != NULL))
ctxt->sax->warning(ctxt,
ctxt->sax->warning(ctxt->userData,
"failed to load external entity \"%s\"\n", ID);
return(NULL);
}
@ -2620,10 +2620,10 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
if (ret == NULL) {
if ((ctxt->validate) && (ctxt->sax != NULL) &&
(ctxt->sax->error != NULL))
ctxt->sax->error(ctxt,
ctxt->sax->error(ctxt->userData,
"failed to load external entity \"%s\"\n", resource);
else if ((ctxt->sax != NULL) && (ctxt->sax->warning != NULL))
ctxt->sax->warning(ctxt,
ctxt->sax->warning(ctxt->userData,
"failed to load external entity \"%s\"\n", resource);
}
if ((resource != NULL) && (resource != (xmlChar *) URL))