Commit db5850a2 authored by Daniel Veillard's avatar Daniel Veillard
Browse files

Keith Isdale complained rightly that xmlInitParser() did not preserve

* parser.c error.c: Keith Isdale complained rightly that
  xmlInitParser() did not preserve value set by xmlSetGenericErrorFunc
Daniel
parent cfa0d812
Fri Jan 18 12:47:15 CET 2002 Daniel Veillard <daniel@veillard.com>
* parser.c error.c: Keith Isdale complained rightly that
xmlInitParser() did not preserve value set by xmlSetGenericErrorFunc
Thu Jan 17 09:44:44 CET 2002 Daniel Veillard <daniel@veillard.com>
* tree.c: fixed the funxtion to set the xml: attributes
......@@ -108,7 +113,7 @@ Mon Jan 7 00:03:58 CET 2002 Daniel Veillard <daniel@veillard.com>
Sun Jan 6 13:45:49 CET 2002 Daniel Veillard <daniel@veillard.com>
* parser.c: patch from Jack J Franklin to remove a bug in
* parser.c: patch from Frank J Franklin to remove a bug in
xmlCreatePushParserCtxt() when the initial buffer passed
is large.
......
......@@ -75,12 +75,12 @@ xmlGenericErrorDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) {
}
void
initGenericErrorDefaultFunc(xmlGenericErrorFunc *handler)
initGenericErrorDefaultFunc(xmlGenericErrorFunc * handler)
{
if (handler == NULL)
xmlGenericError = xmlGenericErrorDefaultFunc;
else
(*handler) = xmlGenericErrorDefaultFunc;
if (handler == NULL)
xmlGenericError = xmlGenericErrorDefaultFunc;
else
(*handler) = xmlGenericErrorDefaultFunc;
}
/**
......
......@@ -10286,6 +10286,7 @@ xmlSetEntityReferenceFunc(xmlEntityReferenceFunc func)
#include <libxml/xpath.h>
#endif
extern void xmlGenericErrorDefaultFunc(void *ctx, const char *msg, ...);
static int xmlParserInitialized = 0;
/**
......@@ -10301,7 +10302,9 @@ xmlInitParser(void) {
if (xmlParserInitialized != 0)
return;
initGenericErrorDefaultFunc(NULL);
if ((xmlGenericError == xmlGenericErrorDefaultFunc) ||
(xmlGenericError == NULL))
initGenericErrorDefaultFunc(NULL);
xmlInitThreads();
xmlInitMemory();
xmlInitCharEncodingHandlers();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment