From 33a1f8978db4fb66b85e6be6f07b4ac6c6baf043 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Sun, 16 Jun 2024 19:16:47 +0200 Subject: [PATCH] legacy: Merge SAX.c into legacy.c --- CMakeLists.txt | 1 - Makefile.am | 3 - SAX.c | 130 ------------------------------------------- doc/libxml2-api.xml | 8 +-- include/libxml/SAX.h | 4 -- legacy.c | 93 +++++++++++++++++++++++++++++++ meson.build | 1 - parser.c | 6 +- 8 files changed, 100 insertions(+), 146 deletions(-) delete mode 100644 SAX.c diff --git a/CMakeLists.txt b/CMakeLists.txt index eb6cfedf..27ddacdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -276,7 +276,6 @@ set( parserInternals.c pattern.c relaxng.c - SAX.c SAX2.c schematron.c threads.c diff --git a/Makefile.am b/Makefile.am index 1b0d5f5b..050f59b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,9 +62,6 @@ libxml2_la_SOURCES += nanohttp.c endif if WITH_LEGACY_SOURCES libxml2_la_SOURCES += legacy.c -if WITH_SAX1_SOURCES -libxml2_la_SOURCES += SAX.c -endif endif if WITH_LZMA_SOURCES libxml2_la_SOURCES += xzlib.c diff --git a/SAX.c b/SAX.c deleted file mode 100644 index 7f2f2974..00000000 --- a/SAX.c +++ /dev/null @@ -1,130 +0,0 @@ -/* - * SAX.c : Old SAX v1 handlers to build a tree. - * Deprecated except for compatibility - * - * See Copyright for the status of this software. - * - * Daniel Veillard - */ - - -#define IN_LIBXML -#include "libxml.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef LIBXML_LEGACY_ENABLED -#ifdef LIBXML_SAX1_ENABLED -/** - * initxmlDefaultSAXHandler: - * @hdlr: the SAX handler - * @warning: flag if non-zero sets the handler warning procedure - * - * Initialize the default XML SAX version 1 handler - * DEPRECATED: use xmlSAX2InitDefaultSAXHandler() for the new SAX2 blocks - */ -void -initxmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr, int warning) -{ - - if(hdlr->initialized == 1) - return; - - hdlr->internalSubset = xmlSAX2InternalSubset; - hdlr->externalSubset = xmlSAX2ExternalSubset; - hdlr->isStandalone = xmlSAX2IsStandalone; - hdlr->hasInternalSubset = xmlSAX2HasInternalSubset; - hdlr->hasExternalSubset = xmlSAX2HasExternalSubset; - hdlr->resolveEntity = xmlSAX2ResolveEntity; - hdlr->getEntity = xmlSAX2GetEntity; - hdlr->getParameterEntity = xmlSAX2GetParameterEntity; - hdlr->entityDecl = xmlSAX2EntityDecl; - hdlr->attributeDecl = xmlSAX2AttributeDecl; - hdlr->elementDecl = xmlSAX2ElementDecl; - hdlr->notationDecl = xmlSAX2NotationDecl; - hdlr->unparsedEntityDecl = xmlSAX2UnparsedEntityDecl; - hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator; - hdlr->startDocument = xmlSAX2StartDocument; - hdlr->endDocument = xmlSAX2EndDocument; - hdlr->startElement = xmlSAX2StartElement; - hdlr->endElement = xmlSAX2EndElement; - hdlr->reference = xmlSAX2Reference; - hdlr->characters = xmlSAX2Characters; - hdlr->cdataBlock = xmlSAX2CDataBlock; - hdlr->ignorableWhitespace = xmlSAX2Characters; - hdlr->processingInstruction = xmlSAX2ProcessingInstruction; - if (warning == 0) - hdlr->warning = NULL; - else - hdlr->warning = xmlParserWarning; - hdlr->error = xmlParserError; - hdlr->fatalError = xmlParserError; - - hdlr->initialized = 1; -} - -#ifdef LIBXML_HTML_ENABLED - -/** - * inithtmlDefaultSAXHandler: - * @hdlr: the SAX handler - * - * Initialize the default HTML SAX version 1 handler - * DEPRECATED: use xmlSAX2InitHtmlDefaultSAXHandler() for the new SAX2 blocks - */ -void -inithtmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr) -{ - if(hdlr->initialized == 1) - return; - - hdlr->internalSubset = xmlSAX2InternalSubset; - hdlr->externalSubset = NULL; - hdlr->isStandalone = NULL; - hdlr->hasInternalSubset = NULL; - hdlr->hasExternalSubset = NULL; - hdlr->resolveEntity = NULL; - hdlr->getEntity = xmlSAX2GetEntity; - hdlr->getParameterEntity = NULL; - hdlr->entityDecl = NULL; - hdlr->attributeDecl = NULL; - hdlr->elementDecl = NULL; - hdlr->notationDecl = NULL; - hdlr->unparsedEntityDecl = NULL; - hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator; - hdlr->startDocument = xmlSAX2StartDocument; - hdlr->endDocument = xmlSAX2EndDocument; - hdlr->startElement = xmlSAX2StartElement; - hdlr->endElement = xmlSAX2EndElement; - hdlr->reference = NULL; - hdlr->characters = xmlSAX2Characters; - hdlr->cdataBlock = xmlSAX2CDataBlock; - hdlr->ignorableWhitespace = xmlSAX2IgnorableWhitespace; - hdlr->processingInstruction = xmlSAX2ProcessingInstruction; - hdlr->comment = xmlSAX2Comment; - hdlr->warning = xmlParserWarning; - hdlr->error = xmlParserError; - hdlr->fatalError = xmlParserError; - - hdlr->initialized = 1; -} - -#endif /* LIBXML_HTML_ENABLED */ - -#endif /* LIBXML_SAX1_ENABLED */ - -#endif /* LIBXML_LEGACY_ENABLED */ diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 29c11faf..c60f90af 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -7607,14 +7607,14 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_LEGACY_ENABLED) && defined(LIBXML_SAX1_ENABLED) && defined(LIBXML_HTML_ENABLED) + + defined(LIBXML_LEGACY_ENABLED) Initialize the default HTML SAX version 1 handler DEPRECATED: use xmlSAX2InitHtmlDefaultSAXHandler() for the new SAX2 blocks - - defined(LIBXML_LEGACY_ENABLED) && defined(LIBXML_SAX1_ENABLED) + + defined(LIBXML_LEGACY_ENABLED) Initialize the default XML SAX version 1 handler DEPRECATED: use xmlSAX2InitDefaultSAXHandler() for the new SAX2 blocks diff --git a/include/libxml/SAX.h b/include/libxml/SAX.h index eea1057b..42e691f6 100644 --- a/include/libxml/SAX.h +++ b/include/libxml/SAX.h @@ -181,17 +181,13 @@ XMLPUBFUN void const xmlChar *value, int len); -#ifdef LIBXML_SAX1_ENABLED XML_DEPRECATED XMLPUBFUN void initxmlDefaultSAXHandler (xmlSAXHandlerV1 *hdlr, int warning); -#ifdef LIBXML_HTML_ENABLED XML_DEPRECATED XMLPUBFUN void inithtmlDefaultSAXHandler (xmlSAXHandlerV1 *hdlr); -#endif -#endif /* LIBXML_SAX1_ENABLED */ #ifdef __cplusplus } diff --git a/legacy.c b/legacy.c index 92a69721..20ce8b3e 100644 --- a/legacy.c +++ b/legacy.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -1350,6 +1351,98 @@ cdataBlock(void *ctx, const xmlChar * value, int len) xmlSAX2CDataBlock(ctx, value, len); } +/** + * initxmlDefaultSAXHandler: + * @hdlr: the SAX handler + * @warning: flag if non-zero sets the handler warning procedure + * + * Initialize the default XML SAX version 1 handler + * DEPRECATED: use xmlSAX2InitDefaultSAXHandler() for the new SAX2 blocks + */ +void +initxmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr, int warning) +{ + + if(hdlr->initialized == 1) + return; + + hdlr->internalSubset = xmlSAX2InternalSubset; + hdlr->externalSubset = xmlSAX2ExternalSubset; + hdlr->isStandalone = xmlSAX2IsStandalone; + hdlr->hasInternalSubset = xmlSAX2HasInternalSubset; + hdlr->hasExternalSubset = xmlSAX2HasExternalSubset; + hdlr->resolveEntity = xmlSAX2ResolveEntity; + hdlr->getEntity = xmlSAX2GetEntity; + hdlr->getParameterEntity = xmlSAX2GetParameterEntity; + hdlr->entityDecl = xmlSAX2EntityDecl; + hdlr->attributeDecl = xmlSAX2AttributeDecl; + hdlr->elementDecl = xmlSAX2ElementDecl; + hdlr->notationDecl = xmlSAX2NotationDecl; + hdlr->unparsedEntityDecl = xmlSAX2UnparsedEntityDecl; + hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator; + hdlr->startDocument = xmlSAX2StartDocument; + hdlr->endDocument = xmlSAX2EndDocument; + hdlr->startElement = xmlSAX2StartElement; + hdlr->endElement = xmlSAX2EndElement; + hdlr->reference = xmlSAX2Reference; + hdlr->characters = xmlSAX2Characters; + hdlr->cdataBlock = xmlSAX2CDataBlock; + hdlr->ignorableWhitespace = xmlSAX2Characters; + hdlr->processingInstruction = xmlSAX2ProcessingInstruction; + if (warning == 0) + hdlr->warning = NULL; + else + hdlr->warning = xmlParserWarning; + hdlr->error = xmlParserError; + hdlr->fatalError = xmlParserError; + + hdlr->initialized = 1; +} + +/** + * inithtmlDefaultSAXHandler: + * @hdlr: the SAX handler + * + * Initialize the default HTML SAX version 1 handler + * DEPRECATED: use xmlSAX2InitHtmlDefaultSAXHandler() for the new SAX2 blocks + */ +void +inithtmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr) +{ + if(hdlr->initialized == 1) + return; + + hdlr->internalSubset = xmlSAX2InternalSubset; + hdlr->externalSubset = NULL; + hdlr->isStandalone = NULL; + hdlr->hasInternalSubset = NULL; + hdlr->hasExternalSubset = NULL; + hdlr->resolveEntity = NULL; + hdlr->getEntity = xmlSAX2GetEntity; + hdlr->getParameterEntity = NULL; + hdlr->entityDecl = NULL; + hdlr->attributeDecl = NULL; + hdlr->elementDecl = NULL; + hdlr->notationDecl = NULL; + hdlr->unparsedEntityDecl = NULL; + hdlr->setDocumentLocator = xmlSAX2SetDocumentLocator; + hdlr->startDocument = xmlSAX2StartDocument; + hdlr->endDocument = xmlSAX2EndDocument; + hdlr->startElement = xmlSAX2StartElement; + hdlr->endElement = xmlSAX2EndElement; + hdlr->reference = NULL; + hdlr->characters = xmlSAX2Characters; + hdlr->cdataBlock = xmlSAX2CDataBlock; + hdlr->ignorableWhitespace = xmlSAX2IgnorableWhitespace; + hdlr->processingInstruction = xmlSAX2ProcessingInstruction; + hdlr->comment = xmlSAX2Comment; + hdlr->warning = xmlParserWarning; + hdlr->error = xmlParserError; + hdlr->fatalError = xmlParserError; + + hdlr->initialized = 1; +} + /* * nanoftp.h */ diff --git a/meson.build b/meson.build index db183a03..84afd74a 100644 --- a/meson.build +++ b/meson.build @@ -622,7 +622,6 @@ xml_opt_src = [ [want_pattern, ['pattern.c']], [want_reader, ['xmlreader.c']], [want_regexps, ['xmlregexp.c', 'xmlunicode.c']], - [want_sax1, ['SAX.c']], [want_schemas, ['relaxng.c', 'xmlschemas.c', 'xmlschemastypes.c']], [want_schemas and not want_xpath, ['xpath.c']], [want_schematron, ['schematron.c']], diff --git a/parser.c b/parser.c index fb6cee18..956945d8 100644 --- a/parser.c +++ b/parser.c @@ -20,7 +20,7 @@ * different ranges of character are actually implanted either in * parserInternals.h or parserInternals.c * The DOM tree build is realized from the default SAX callbacks in - * the module SAX.c. + * the module SAX2.c. * The routines doing the validation checks are in valid.c and called either * from the SAX callbacks or as standalone functions using a preparsed * document. @@ -4395,8 +4395,8 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *attlen, int *alloc, if ((val == '&') && (!replaceEntities)) { /* - * The reparsing will be done in xmlStringGetNodeList() - * called by the attribute() function in SAX.c + * The reparsing will be done in xmlNodeParseContent() + * called from SAX2.c */ xmlSBufAddCString(&buf, "&", 5); inSpace = 0;