commit 092643b52d29e6b721c257c4c88efa8259eebfe9
author Daniel Veillard <veillard@src.gnome.org> Thu Sep 25 14:29:29 2003 +0000
committer Daniel Veillard <veillard@src.gnome.org> Thu Sep 25 14:29:29 2003 +0000
tree f7161c5825d308c54b833fc2c86e3957882283b6
parent 7a02cfe0d7c5bd03dd51a945561b9c6e1df614e9

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

globals.c

diff --git a/globals.c b/globals.c
index 2d68dbf..bdbbc37 100644
--- a/globals.c
+++ b/globals.c
@@ -62,7 +62,7 @@
  * Memory allocation routines
  */
 #if defined(DEBUG_MEMORY_LOCATION) || defined(DEBUG_MEMORY)
-#ifndef _DEBUG_MEMORY_ALLOC_
+#ifndef __DEBUG_MEMORY_ALLOC__
 extern void xmlMemFree(void *ptr);
 extern void * xmlMemMalloc(size_t size);
 extern void * xmlMemRealloc(void *ptr,size_t size);
@@ -328,9 +328,9 @@
 /**
  * xmlDefaultSAXHandler:
  *
- * Default handler for XML, builds the DOM tree
+ * Default SAX version1 handler for XML, builds the DOM tree
  */
-xmlSAXHandler xmlDefaultSAXHandler = {
+xmlSAXHandlerV1 xmlDefaultSAXHandler = {
     xmlSAX2InternalSubset,
     xmlSAX2IsStandalone,
     xmlSAX2HasInternalSubset,
@@ -359,9 +359,6 @@
     xmlSAX2CDataBlock,
     xmlSAX2ExternalSubset,
     0,
-    NULL,
-    NULL,
-    NULL
 };
 
 /**
@@ -381,9 +378,9 @@
 /**
  * htmlDefaultSAXHandler:
  *
- * Default handler for HTML, builds the DOM tree
+ * Default old SAX v1 handler for HTML, builds the DOM tree
  */
-xmlSAXHandler htmlDefaultSAXHandler = {
+xmlSAXHandlerV1 htmlDefaultSAXHandler = {
     xmlSAX2InternalSubset,
     NULL,
     NULL,
@@ -412,9 +409,6 @@
     xmlSAX2CDataBlock,
     NULL,
     0,
-    NULL,
-    NULL,
-    NULL
 };
 #endif /* LIBXML_HTML_ENABLED */
 
@@ -422,9 +416,9 @@
 /**
  * docbDefaultSAXHandler:
  *
- * Default handler for SGML DocBook, builds the DOM tree
+ * Default old SAX v1 handler for SGML DocBook, builds the DOM tree
  */
-xmlSAXHandler docbDefaultSAXHandler = {
+xmlSAXHandlerV1 docbDefaultSAXHandler = {
     xmlSAX2InternalSubset,
     xmlSAX2IsStandalone,
     xmlSAX2HasInternalSubset,
@@ -453,9 +447,6 @@
     NULL,
     NULL,
     0,
-    NULL,
-    NULL,
-    NULL
 };
 #endif /* LIBXML_DOCB_ENABLED */
 
@@ -483,16 +474,16 @@
     xmlMutexLock(xmlThrDefMutex);
 
 #ifdef LIBXML_DOCB_ENABLED
-    xmlSAX2InitDocbDefaultSAXHandler(&gs->docbDefaultSAXHandler);
+    initdocbDefaultSAXHandler(&gs->docbDefaultSAXHandler);
 #endif
 #ifdef LIBXML_HTML_ENABLED
-    xmlSAX2InitHtmlDefaultSAXHandler(&gs->htmlDefaultSAXHandler);
+    inithtmlDefaultSAXHandler(&gs->htmlDefaultSAXHandler);
 #endif
 
     gs->oldXMLWDcompatibility = 0;
     gs->xmlBufferAllocScheme = xmlBufferAllocSchemeThrDef;
     gs->xmlDefaultBufferSize = xmlDefaultBufferSizeThrDef;
-    xmlSAX2InitDefaultSAXHandler(&gs->xmlDefaultSAXHandler, 1);
+    initxmlDefaultSAXHandler(&gs->xmlDefaultSAXHandler, 1);
     gs->xmlDefaultSAXLocator.getPublicId = getPublicId;
     gs->xmlDefaultSAXLocator.getSystemId = getSystemId;
     gs->xmlDefaultSAXLocator.getLineNumber = getLineNumber;
@@ -613,7 +604,7 @@
 
 #ifdef LIBXML_DOCB_ENABLED
 #undef	docbDefaultSAXHandler
-xmlSAXHandler *
+xmlSAXHandlerV1 *
 __docbDefaultSAXHandler(void) {
     if (IS_MAIN_THREAD)
 	return (&docbDefaultSAXHandler);
@@ -624,7 +615,7 @@
 
 #ifdef LIBXML_HTML_ENABLED
 #undef	htmlDefaultSAXHandler
-xmlSAXHandler *
+xmlSAXHandlerV1 *
 __htmlDefaultSAXHandler(void) {
     if (IS_MAIN_THREAD)
 	return (&htmlDefaultSAXHandler);
@@ -684,7 +675,7 @@
 }
 
 #undef	xmlDefaultSAXHandler
-xmlSAXHandler *
+xmlSAXHandlerV1 *
 __xmlDefaultSAXHandler(void) {
     if (IS_MAIN_THREAD)
 	return (&xmlDefaultSAXHandler);