summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNick Wellnhofer <wellnhofer@aevum.de>2022-03-04 03:35:57 +0100
committerNick Wellnhofer <wellnhofer@aevum.de>2022-03-04 22:56:21 +0100
commit4a8c71eb7cc1c9001afaeefbd454f06f5fdaa046 (patch)
tree2a385cc9d8010a510b1aae66c0fd3b17a33e7a1f /include
parentebb17970301b8ca39aa953c0ebd343dd7912fd0e (diff)
downloadlibxml2-4a8c71eb7cc1c9001afaeefbd454f06f5fdaa046.tar.gz
Remove DOCBparser
This code has been broken and deprecated since version 2.6.0, released in 2003. Because of a bug in commit 961b535c, DOCBparser.c was never compiled since 2012. I couldn't find a Debian package using any of its symbols, so it seems safe to remove this module.
Diffstat (limited to 'include')
-rw-r--r--include/libxml/DOCBparser.h106
-rw-r--r--include/libxml/Makefile.am1
-rw-r--r--include/libxml/SAX.h5
-rw-r--r--include/libxml/SAX2.h9
-rw-r--r--include/libxml/globals.h13
-rw-r--r--include/libxml/parser.h2
-rw-r--r--include/libxml/tree.h8
-rw-r--r--include/libxml/xmlversion.h.in9
8 files changed, 7 insertions, 146 deletions
diff --git a/include/libxml/DOCBparser.h b/include/libxml/DOCBparser.h
deleted file mode 100644
index 748e1ab3..00000000
--- a/include/libxml/DOCBparser.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Summary: old DocBook SGML parser
- * Description: interface for a DocBook SGML non-verifying parser
- * This code is DEPRECATED, and should not be used anymore.
- *
- * Copy: See Copyright for the status of this software.
- *
- * Author: Daniel Veillard
- */
-
-#ifndef __DOCB_PARSER_H__
-#define __DOCB_PARSER_H__
-#include <libxml/xmlversion.h>
-
-#ifdef LIBXML_DOCB_ENABLED
-
-#include <libxml/parser.h>
-#include <libxml/parserInternals.h>
-
-#ifndef IN_LIBXML
-#ifdef __GNUC__
-#warning "The DOCBparser module has been deprecated in libxml2-2.6.0"
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Most of the back-end structures from XML and SGML are shared.
- */
-typedef xmlParserCtxt docbParserCtxt;
-typedef xmlParserCtxtPtr docbParserCtxtPtr;
-typedef xmlSAXHandler docbSAXHandler;
-typedef xmlSAXHandlerPtr docbSAXHandlerPtr;
-typedef xmlParserInput docbParserInput;
-typedef xmlParserInputPtr docbParserInputPtr;
-typedef xmlDocPtr docbDocPtr;
-
-/*
- * There is only few public functions.
- */
-XML_DEPRECATED
-XMLPUBFUN int XMLCALL
- docbEncodeEntities(unsigned char *out,
- int *outlen,
- const unsigned char *in,
- int *inlen, int quoteChar);
-
-XML_DEPRECATED
-XMLPUBFUN docbDocPtr XMLCALL
- docbSAXParseDoc (xmlChar *cur,
- const char *encoding,
- docbSAXHandlerPtr sax,
- void *userData);
-XML_DEPRECATED
-XMLPUBFUN docbDocPtr XMLCALL
- docbParseDoc (xmlChar *cur,
- const char *encoding);
-XML_DEPRECATED
-XMLPUBFUN docbDocPtr XMLCALL
- docbSAXParseFile (const char *filename,
- const char *encoding,
- docbSAXHandlerPtr sax,
- void *userData);
-XML_DEPRECATED
-XMLPUBFUN docbDocPtr XMLCALL
- docbParseFile (const char *filename,
- const char *encoding);
-
-/**
- * Interfaces for the Push mode.
- */
-XML_DEPRECATED
-XMLPUBFUN void XMLCALL
- docbFreeParserCtxt (docbParserCtxtPtr ctxt);
-XML_DEPRECATED
-XMLPUBFUN docbParserCtxtPtr XMLCALL
- docbCreatePushParserCtxt(docbSAXHandlerPtr sax,
- void *user_data,
- const char *chunk,
- int size,
- const char *filename,
- xmlCharEncoding enc);
-XML_DEPRECATED
-XMLPUBFUN int XMLCALL
- docbParseChunk (docbParserCtxtPtr ctxt,
- const char *chunk,
- int size,
- int terminate);
-XML_DEPRECATED
-XMLPUBFUN docbParserCtxtPtr XMLCALL
- docbCreateFileParserCtxt(const char *filename,
- const char *encoding);
-XML_DEPRECATED
-XMLPUBFUN int XMLCALL
- docbParseDocument (docbParserCtxtPtr ctxt);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LIBXML_DOCB_ENABLED */
-
-#endif /* __DOCB_PARSER_H__ */
diff --git a/include/libxml/Makefile.am b/include/libxml/Makefile.am
index cf9297aa..6373bc71 100644
--- a/include/libxml/Makefile.am
+++ b/include/libxml/Makefile.am
@@ -27,7 +27,6 @@ xmlinc_HEADERS = \
valid.h \
xlink.h \
xmlversion.h \
- DOCBparser.h \
catalog.h \
threads.h \
globals.h \
diff --git a/include/libxml/SAX.h b/include/libxml/SAX.h
index ce58bcbd..fa50568f 100644
--- a/include/libxml/SAX.h
+++ b/include/libxml/SAX.h
@@ -193,11 +193,6 @@ XML_DEPRECATED
XMLPUBFUN void XMLCALL
inithtmlDefaultSAXHandler (xmlSAXHandlerV1 *hdlr);
#endif
-#ifdef LIBXML_DOCB_ENABLED
-XML_DEPRECATED
-XMLPUBFUN void XMLCALL
- initdocbDefaultSAXHandler (xmlSAXHandlerV1 *hdlr);
-#endif
#endif /* LIBXML_SAX1_ENABLED */
#ifdef __cplusplus
diff --git a/include/libxml/SAX2.h b/include/libxml/SAX2.h
index 842748fc..25047914 100644
--- a/include/libxml/SAX2.h
+++ b/include/libxml/SAX2.h
@@ -98,8 +98,7 @@ XMLPUBFUN void XMLCALL
XMLPUBFUN void XMLCALL
xmlSAX2EndDocument (void *ctx);
#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
- defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || \
- defined(LIBXML_LEGACY_ENABLED)
+ defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED)
XMLPUBFUN void XMLCALL
xmlSAX2StartElement (void *ctx,
const xmlChar *fullname,
@@ -163,12 +162,6 @@ XMLPUBFUN void XMLCALL
XMLPUBFUN void XMLCALL
htmlDefaultSAXHandlerInit (void);
#endif
-#ifdef LIBXML_DOCB_ENABLED
-XMLPUBFUN void XMLCALL
- xmlSAX2InitDocbDefaultSAXHandler(xmlSAXHandler *hdlr);
-XMLPUBFUN void XMLCALL
- docbDefaultSAXHandlerInit (void);
-#endif
XMLPUBFUN void XMLCALL
xmlDefaultSAXHandlerInit (void);
#ifdef __cplusplus
diff --git a/include/libxml/globals.h b/include/libxml/globals.h
index 5e41b7bb..40815217 100644
--- a/include/libxml/globals.h
+++ b/include/libxml/globals.h
@@ -67,7 +67,6 @@ XMLCALL xmlOutputBufferCreateFilenameDefault (xmlOutputBufferCreateFilenameFunc
* compatibility support.
*/
-#undef docbDefaultSAXHandler
#undef htmlDefaultSAXHandler
#undef oldXMLWDcompatibility
#undef xmlBufferAllocScheme
@@ -124,7 +123,7 @@ struct _xmlGlobalState
xmlSAXLocator xmlDefaultSAXLocator;
xmlSAXHandlerV1 xmlDefaultSAXHandler;
- xmlSAXHandlerV1 docbDefaultSAXHandler;
+ xmlSAXHandlerV1 docbDefaultSAXHandler; /* unused */
xmlSAXHandlerV1 htmlDefaultSAXHandler;
xmlFreeFunc xmlFree;
@@ -251,16 +250,6 @@ XMLPUBVAR xmlFreeFunc xmlFree;
XMLPUBVAR xmlStrdupFunc xmlMemStrdup;
#endif /* LIBXML_THREAD_ALLOC_ENABLED */
-#ifdef LIBXML_DOCB_ENABLED
-XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __docbDefaultSAXHandler(void);
-#ifdef LIBXML_THREAD_ENABLED
-#define docbDefaultSAXHandler \
-(*(__docbDefaultSAXHandler()))
-#else
-XMLPUBVAR xmlSAXHandlerV1 docbDefaultSAXHandler;
-#endif
-#endif
-
#ifdef LIBXML_HTML_ENABLED
XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __htmlDefaultSAXHandler(void);
#ifdef LIBXML_THREAD_ENABLED
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 44581808..82c61d67 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -190,7 +190,7 @@ struct _xmlParserCtxt {
const xmlChar *version; /* the XML version string */
const xmlChar *encoding; /* the declared encoding, if any */
int standalone; /* standalone document */
- int html; /* an HTML(1)/Docbook(2) document
+ int html; /* an HTML(1) document
* 3 is HTML after <head>
* 10 is HTML after <body>
*/
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index 9823654a..98e20874 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -177,11 +177,11 @@ typedef enum {
XML_NAMESPACE_DECL= 18,
XML_XINCLUDE_START= 19,
XML_XINCLUDE_END= 20
-#ifdef LIBXML_DOCB_ENABLED
- ,XML_DOCB_DOCUMENT_NODE= 21
-#endif
+ /* XML_DOCB_DOCUMENT_NODE= 21 */ /* removed */
} xmlElementType;
+/* For backward compatibility */
+#define XML_DOCB_DOCUMENT_NODE 21
/**
* xmlNotation:
@@ -659,7 +659,7 @@ struct _xmlDOMWrapCtxt {
defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || \
defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || \
defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || \
- defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED)
+ defined(LIBXML_LEGACY_ENABLED)
XMLPUBFUN int XMLCALL
xmlValidateNCName (const xmlChar *value,
int space);
diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
index b1d2a208..944920b2 100644
--- a/include/libxml/xmlversion.h.in
+++ b/include/libxml/xmlversion.h.in
@@ -230,15 +230,6 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
#endif
/**
- * LIBXML_DOCB_ENABLED:
- *
- * Whether the SGML Docbook support is configured in
- */
-#if @WITH_DOCB@
-#define LIBXML_DOCB_ENABLED
-#endif
-
-/**
* LIBXML_XPATH_ENABLED:
*
* Whether XPath is configured in