commit 1af9a41f24deb04ababc4075de0005bd75f320f6
author Daniel Veillard <veillard@src.gnome.org> Wed Aug 20 22:54:39 2003 +0000
committer Daniel Veillard <veillard@src.gnome.org> Wed Aug 20 22:54:39 2003 +0000
tree c2dd16d93ab61d45942e7db29e11a59c8a07f768
parent e5984080eab3f723c54df177dbfecc9bc9812927

Adding new version of the SAX interface, it's not there yet, currently

* Makefile.am SAX2.c include/libxml/Makefile.am include/libxml/SAX2.h:
  Adding new version of the SAX interface, it's not there yet,
  currently just preparing the work
* globals.c parser.c SAX.c include/libxml/SAX.h
  include/libxml/globals.h include/libxml/parser.h: doing some
  refactoring of the SAXv1 interfaces, obsoleting a bunch of them
  while keeping functionalities, preparing SAX2 integration.
* dict.c: small cleanup.
Daniel

globals.c

diff --git a/globals.c b/globals.c
index aec4873..5342340 100644
--- a/globals.c
+++ b/globals.c
@@ -331,34 +331,38 @@
  * Default handler for XML, builds the DOM tree
  */
 xmlSAXHandler xmlDefaultSAXHandler = {
-    internalSubset,
-    isStandalone,
-    hasInternalSubset,
-    hasExternalSubset,
-    resolveEntity,
-    getEntity,
-    entityDecl,
-    notationDecl,
-    attributeDecl,
-    elementDecl,
-    unparsedEntityDecl,
-    setDocumentLocator,
-    startDocument,
-    endDocument,
-    startElement,
-    endElement,
-    reference,
-    characters,
-    characters,
-    processingInstruction,
-    comment,
+    xmlSAX2InternalSubset,
+    xmlSAX2IsStandalone,
+    xmlSAX2HasInternalSubset,
+    xmlSAX2HasExternalSubset,
+    xmlSAX2ResolveEntity,
+    xmlSAX2GetEntity,
+    xmlSAX2EntityDecl,
+    xmlSAX2NotationDecl,
+    xmlSAX2AttributeDecl,
+    xmlSAX2ElementDecl,
+    xmlSAX2UnparsedEntityDecl,
+    xmlSAX2SetDocumentLocator,
+    xmlSAX2StartDocument,
+    xmlSAX2EndDocument,
+    xmlSAX2StartElement,
+    xmlSAX2EndElement,
+    xmlSAX2Reference,
+    xmlSAX2Characters,
+    xmlSAX2Characters,
+    xmlSAX2ProcessingInstruction,
+    xmlSAX2Comment,
     xmlParserWarning,
     xmlParserError,
     xmlParserError,
-    getParameterEntity,
-    cdataBlock,
-    externalSubset,
-    0
+    xmlSAX2GetParameterEntity,
+    xmlSAX2CDataBlock,
+    xmlSAX2ExternalSubset,
+    0,
+    NULL,
+    NULL,
+    NULL,
+    NULL
 };
 
 /**
@@ -368,7 +372,10 @@
  * { getPublicId, getSystemId, getLineNumber, getColumnNumber}
  */
 xmlSAXLocator xmlDefaultSAXLocator = {
-    getPublicId, getSystemId, getLineNumber, getColumnNumber
+    xmlSAX2GetPublicId,
+    xmlSAX2GetSystemId,
+    xmlSAX2GetLineNumber,
+    xmlSAX2GetColumnNumber
 };
 
 #ifdef LIBXML_HTML_ENABLED
@@ -378,34 +385,38 @@
  * Default handler for HTML, builds the DOM tree
  */
 xmlSAXHandler htmlDefaultSAXHandler = {
-    internalSubset,
+    xmlSAX2InternalSubset,
     NULL,
     NULL,
     NULL,
     NULL,
-    getEntity,
+    xmlSAX2GetEntity,
     NULL,
     NULL,
     NULL,
     NULL,
     NULL,
-    setDocumentLocator,
-    startDocument,
-    endDocument,
-    startElement,
-    endElement,
+    xmlSAX2SetDocumentLocator,
+    xmlSAX2StartDocument,
+    xmlSAX2EndDocument,
+    xmlSAX2StartElement,
+    xmlSAX2EndElement,
     NULL,
-    characters,
-    ignorableWhitespace,
+    xmlSAX2Characters,
+    xmlSAX2IgnorableWhitespace,
     NULL,
-    comment,
+    xmlSAX2Comment,
     xmlParserWarning,
     xmlParserError,
     xmlParserError,
-    getParameterEntity,
-    cdataBlock,
+    xmlSAX2GetParameterEntity,
+    xmlSAX2CDataBlock,
     NULL,
-    0
+    0,
+    NULL,
+    NULL,
+    NULL,
+    NULL
 };
 #endif /* LIBXML_HTML_ENABLED */
 
@@ -416,34 +427,38 @@
  * Default handler for SGML DocBook, builds the DOM tree
  */
 xmlSAXHandler docbDefaultSAXHandler = {
-    internalSubset,
-    isStandalone,
-    hasInternalSubset,
-    hasExternalSubset,
-    resolveEntity,
-    getEntity,
-    entityDecl,
+    xmlSAX2InternalSubset,
+    xmlSAX2IsStandalone,
+    xmlSAX2HasInternalSubset,
+    xmlSAX2HasExternalSubset,
+    xmlSAX2ResolveEntity,
+    xmlSAX2GetEntity,
+    xmlSAX2EntityDecl,
     NULL,
     NULL,
     NULL,
     NULL,
-    setDocumentLocator,
-    startDocument,
-    endDocument,
-    startElement,
-    endElement,
-    reference,
-    characters,
-    ignorableWhitespace,
+    xmlSAX2SetDocumentLocator,
+    xmlSAX2StartDocument,
+    xmlSAX2EndDocument,
+    xmlSAX2StartElement,
+    xmlSAX2EndElement,
+    xmlSAX2Reference,
+    xmlSAX2Characters,
+    xmlSAX2IgnorableWhitespace,
     NULL,
-    comment,
+    xmlSAX2Comment,
     xmlParserWarning,
     xmlParserError,
     xmlParserError,
-    getParameterEntity,
+    xmlSAX2GetParameterEntity,
     NULL,
     NULL,
-    0
+    0,
+    NULL,
+    NULL,
+    NULL,
+    NULL
 };
 #endif /* LIBXML_DOCB_ENABLED */