cleanup fixing bug #125653 sometimes the error handlers can get a parser
* Makefile.am: cleanup
* error.c valid.c include/libxml/xmlerror.h: fixing bug #125653
sometimes the error handlers can get a parser context on DTD
errors, and sometime they don't. So be very careful when trying
to grab those informations.
Daniel
diff --git a/valid.c b/valid.c
index 0a2cedc..8b9c429 100644
--- a/valid.c
+++ b/valid.c
@@ -62,12 +62,12 @@
}
if (extra)
__xmlRaiseError(NULL, channel, data,
- pctxt, NULL, XML_FROM_DTD, XML_ERR_NO_MEMORY,
+ pctxt, NULL, XML_FROM_VALID, XML_ERR_NO_MEMORY,
XML_ERR_FATAL, NULL, 0, extra, NULL, NULL, 0, 0,
"Memory allocation failed : %s\n", extra);
else
__xmlRaiseError(NULL, channel, data,
- pctxt, NULL, XML_FROM_DTD, XML_ERR_NO_MEMORY,
+ pctxt, NULL, XML_FROM_VALID, XML_ERR_NO_MEMORY,
XML_ERR_FATAL, NULL, 0, NULL, NULL, NULL, 0, 0,
"Memory allocation failed\n");
}
@@ -95,12 +95,12 @@
}
if (extra)
__xmlRaiseError(NULL, channel, data,
- pctxt, NULL, XML_FROM_DTD, error,
+ pctxt, NULL, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0, extra, NULL, NULL, 0, 0,
msg, extra);
else
__xmlRaiseError(NULL, channel, data,
- pctxt, NULL, XML_FROM_DTD, error,
+ pctxt, NULL, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0, NULL, NULL, NULL, 0, 0,
msg);
}
@@ -118,7 +118,7 @@
* Handle a validation error, provide contextual informations
*/
static void
-xmlErrValidNodeNr(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED,
+xmlErrValidNodeNr(xmlValidCtxtPtr ctxt,
xmlNodePtr node, xmlParserErrors error,
const char *msg, const xmlChar * str1,
int int2, const xmlChar * str3)
@@ -134,7 +134,7 @@
pctxt = ctxt->userData;
pctxt = ctxt->userData;
}
- __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_DTD, error,
+ __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0,
(const char *) str1,
(const char *) str3,
@@ -168,7 +168,7 @@
pctxt = ctxt->userData;
pctxt = ctxt->userData;
}
- __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_DTD, error,
+ __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
XML_ERR_ERROR, NULL, 0,
(const char *) str1,
(const char *) str1,
@@ -202,7 +202,7 @@
pctxt = ctxt->userData;
pctxt = ctxt->userData;
}
- __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_DTD, error,
+ __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
XML_ERR_WARNING, NULL, 0,
(const char *) str1,
(const char *) str1,