diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2003-10-11 11:26:42 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2003-10-11 11:26:42 +0000 |
| commit | 73000574ac208f34eb59c9da1abdc5490be3a4c1 (patch) | |
| tree | 340616be47a689cad8b687cdaa496d097a1c3d14 /valid.c | |
| parent | 9bcc7c5a8e75ba3ad135e1e4ca58202ff08e309b (diff) | |
| download | android_external_libxml2-73000574ac208f34eb59c9da1abdc5490be3a4c1.tar.gz android_external_libxml2-73000574ac208f34eb59c9da1abdc5490be3a4c1.tar.bz2 android_external_libxml2-73000574ac208f34eb59c9da1abdc5490be3a4c1.zip | |
adding an serror field to the validation context breaks the ABI for the
* valid.c include/libxml/valid.h: adding an serror field to
the validation context breaks the ABI for the xmlParserCtxt
structure since it's embedded by content and not by reference
Daniel
Diffstat (limited to 'valid.c')
| -rw-r--r-- | valid.c | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -53,7 +53,6 @@ static xmlElementPtr xmlGetDtdElementDesc2(xmlDtdPtr dtd, const xmlChar *name, static void xmlVErrMemory(xmlValidCtxtPtr ctxt, const char *extra) { - xmlStructuredErrorFunc schannel = NULL; xmlGenericErrorFunc channel = NULL; xmlParserCtxtPtr pctxt = NULL; void *data = NULL; @@ -62,15 +61,14 @@ xmlVErrMemory(xmlValidCtxtPtr ctxt, const char *extra) channel = ctxt->error; data = ctxt->userData; pctxt = ctxt->userData; - schannel = ctxt->serror; } if (extra) - __xmlRaiseError(schannel, channel, data, + __xmlRaiseError(NULL, channel, data, pctxt, NULL, XML_FROM_DTD, XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, extra, NULL, NULL, 0, 0, "Memory allocation failed : %s\n", extra); else - __xmlRaiseError(schannel, channel, data, + __xmlRaiseError(NULL, channel, data, pctxt, NULL, XML_FROM_DTD, XML_ERR_NO_MEMORY, XML_ERR_FATAL, NULL, 0, NULL, NULL, NULL, 0, 0, "Memory allocation failed\n"); @@ -88,24 +86,22 @@ static void xmlErrValid(xmlValidCtxtPtr ctxt ATTRIBUTE_UNUSED, xmlParserErrors error, const char *msg, const char *extra) { - xmlStructuredErrorFunc schannel = NULL; xmlGenericErrorFunc channel = NULL; xmlParserCtxtPtr pctxt = NULL; void *data = NULL; if (ctxt != NULL) { channel = ctxt->error; - schannel = ctxt->serror; data = ctxt->userData; pctxt = ctxt->userData; } if (extra) - __xmlRaiseError(schannel, channel, data, + __xmlRaiseError(NULL, channel, data, pctxt, NULL, XML_FROM_DTD, error, XML_ERR_ERROR, NULL, 0, extra, NULL, NULL, 0, 0, msg, extra); else - __xmlRaiseError(schannel, channel, data, + __xmlRaiseError(NULL, channel, data, pctxt, NULL, XML_FROM_DTD, error, XML_ERR_ERROR, NULL, 0, NULL, NULL, NULL, 0, 0, msg); |