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

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
This commit is contained in:
Daniel Veillard
2002-01-18 11:49:26 +00:00
parent cfa0d81221
commit db5850a23a
3 changed files with 15 additions and 7 deletions

View File

@ -1,3 +1,8 @@
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> Thu Jan 17 09:44:44 CET 2002 Daniel Veillard <daniel@veillard.com>
* tree.c: fixed the funxtion to set the xml: attributes * 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> 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 xmlCreatePushParserCtxt() when the initial buffer passed
is large. is large.

10
error.c
View File

@ -75,12 +75,12 @@ xmlGenericErrorDefaultFunc(void *ctx ATTRIBUTE_UNUSED, const char *msg, ...) {
} }
void void
initGenericErrorDefaultFunc(xmlGenericErrorFunc *handler) initGenericErrorDefaultFunc(xmlGenericErrorFunc * handler)
{ {
if (handler == NULL) if (handler == NULL)
xmlGenericError = xmlGenericErrorDefaultFunc; xmlGenericError = xmlGenericErrorDefaultFunc;
else else
(*handler) = xmlGenericErrorDefaultFunc; (*handler) = xmlGenericErrorDefaultFunc;
} }
/** /**

View File

@ -10286,6 +10286,7 @@ xmlSetEntityReferenceFunc(xmlEntityReferenceFunc func)
#include <libxml/xpath.h> #include <libxml/xpath.h>
#endif #endif
extern void xmlGenericErrorDefaultFunc(void *ctx, const char *msg, ...);
static int xmlParserInitialized = 0; static int xmlParserInitialized = 0;
/** /**
@ -10301,7 +10302,9 @@ xmlInitParser(void) {
if (xmlParserInitialized != 0) if (xmlParserInitialized != 0)
return; return;
initGenericErrorDefaultFunc(NULL); if ((xmlGenericError == xmlGenericErrorDefaultFunc) ||
(xmlGenericError == NULL))
initGenericErrorDefaultFunc(NULL);
xmlInitThreads(); xmlInitThreads();
xmlInitMemory(); xmlInitMemory();
xmlInitCharEncodingHandlers(); xmlInitCharEncodingHandlers();