diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2003-09-25 14:29:29 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2003-09-25 14:29:29 +0000 |
| commit | 092643b52d29e6b721c257c4c88efa8259eebfe9 (patch) | |
| tree | f7161c5825d308c54b833fc2c86e3957882283b6 /parserInternals.c | |
| parent | 7a02cfe0d7c5bd03dd51a945561b9c6e1df614e9 (diff) | |
| download | android_external_libxml2-092643b52d29e6b721c257c4c88efa8259eebfe9.tar.gz android_external_libxml2-092643b52d29e6b721c257c4c88efa8259eebfe9.tar.bz2 android_external_libxml2-092643b52d29e6b721c257c4c88efa8259eebfe9.zip | |
preparing a beta3 solving the ABI problems make sure the global variables
* configure.in: preparing a beta3 solving the ABI problems
* globals.c parser.c parserInternals.c testHTML.c HTMLparser.c SAX.c
include/libxml/globals.h include/libxml/SAX.h: make sure the
global variables for the default SAX handler are V1 ones to
avoid ABI compat problems.
* xmlreader.c: cleanup of uneeded code
* hash.c: fix a comment
Daniel
Diffstat (limited to 'parserInternals.c')
| -rw-r--r-- | parserInternals.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/parserInternals.c b/parserInternals.c index 02071b7b..5a9c8e05 100644 --- a/parserInternals.c +++ b/parserInternals.c @@ -2219,7 +2219,7 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt) return(-1); } else - memcpy(ctxt->sax, &xmlDefaultSAXHandler, sizeof(xmlSAXHandler)); + xmlSAXVersion(ctxt->sax, 2); ctxt->maxatts = 0; ctxt->atts = NULL; @@ -2371,7 +2371,8 @@ xmlFreeParserCtxt(xmlParserCtxtPtr ctxt) if (ctxt->encoding != NULL) xmlFree((char *) ctxt->encoding); if (ctxt->extSubURI != NULL) xmlFree((char *) ctxt->extSubURI); if (ctxt->extSubSystem != NULL) xmlFree((char *) ctxt->extSubSystem); - if ((ctxt->sax != NULL) && (ctxt->sax != &xmlDefaultSAXHandler)) + if ((ctxt->sax != NULL) && + (ctxt->sax != (xmlSAXHandlerPtr) &xmlDefaultSAXHandler)) xmlFree(ctxt->sax); if (ctxt->directory != NULL) xmlFree((char *) ctxt->directory); if (ctxt->vctxt.nodeTab != NULL) xmlFree(ctxt->vctxt.nodeTab); |