diff --git a/CMakeLists.txt b/CMakeLists.txt index f4dd490e..a8b4fc38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ if(LIBXML2_WITH_PYTHON) CACHE PATH "Python bindings install directory") endif() -foreach(VARIABLE IN ITEMS WITH_C14N WITH_CATALOG WITH_DEBUG WITH_HTML WITH_HTTP WITH_ICONV WITH_ICU WITH_ISO8859X WITH_LEGACY WITH_LZMA WITH_MODULES WITH_OUTPUT WITH_PATTERN WITH_PUSH WITH_READER WITH_REGEXPS WITH_RELAXNG WITH_SAX1 WITH_SCHEMAS WITH_SCHEMATRON WITH_THREADS WITH_THREAD_ALLOC WITH_VALID WITH_WRITER WITH_XINCLUDE WITH_XPATH WITH_XPTR WITH_ZLIB) +foreach(VARIABLE IN ITEMS WITH_C14N WITH_CATALOG WITH_DEBUG WITH_HTML WITH_HTTP WITH_ICONV WITH_ICU WITH_ISO8859X WITH_LZMA WITH_MODULES WITH_OUTPUT WITH_PATTERN WITH_PUSH WITH_READER WITH_REGEXPS WITH_RELAXNG WITH_SAX1 WITH_SCHEMAS WITH_SCHEMATRON WITH_THREADS WITH_THREAD_ALLOC WITH_VALID WITH_WRITER WITH_XINCLUDE WITH_XPATH WITH_XPTR WITH_ZLIB) if(LIBXML2_${VARIABLE}) set(${VARIABLE} 1) else() @@ -259,9 +259,6 @@ endif() if(LIBXML2_WITH_HTTP) list(APPEND LIBXML2_SRCS nanohttp.c) endif() -if(LIBXML2_WITH_LEGACY) - list(APPEND LIBXML2_SRCS legacy.c) -endif() if(LIBXML2_WITH_LZMA) list(APPEND LIBXML2_SRCS xzlib.c) endif() diff --git a/Makefile.am b/Makefile.am index 47f70437..519ecd1a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,9 +68,6 @@ endif if WITH_HTTP_SOURCES libxml2_la_SOURCES += nanohttp.c endif -if WITH_LEGACY_SOURCES -libxml2_la_SOURCES += legacy.c -endif if WITH_LZMA_SOURCES libxml2_la_SOURCES += xzlib.c endif diff --git a/configure.ac b/configure.ac index edb74915..7a454766 100644 --- a/configure.ac +++ b/configure.ac @@ -452,15 +452,6 @@ fi AC_SUBST(WITH_HTTP) AM_CONDITIONAL(WITH_HTTP_SOURCES, test "$WITH_HTTP" = "1") -if test "$with_legacy" != "yes" ; then - WITH_LEGACY=0 -else - echo Enabling deprecated APIs - WITH_LEGACY=1 -fi -AC_SUBST(WITH_LEGACY) -AM_CONDITIONAL(WITH_LEGACY_SOURCES, test "$WITH_LEGACY" = "1") - if test "$with_reader" = "no" ; then echo Disabling the xmlReader parsing interface WITH_READER=0 diff --git a/doc/apibuild.py b/doc/apibuild.py index 40a2ba0f..7bbb23f3 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -21,7 +21,6 @@ debugsym=None ignored_files = { "config.h": "generated portability layer", "libxml.h": "internal only", - "legacy.c": "legacy code", "testModule.c": "test tool", "testapi.c": "generated regression tests", "runtest.c": "regression tests program", diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 481e9310..ee9e22dc 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -3293,7 +3293,6 @@ - @@ -3850,9 +3849,6 @@ Whether ISO-8859-* support is made available in case iconv is not - - Whether the deprecated APIs are compiled in for compatibility - Whether the Lzma support is compiled in diff --git a/globals.c b/globals.c index ad5092e1..fd9c13f9 100644 --- a/globals.c +++ b/globals.c @@ -261,7 +261,7 @@ const int xmlParserDebugEntities = 0; * Global setting, indicate that the parser should work in validating mode. * Disabled by default. */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) int xmlDoValidityCheckingDefaultValue = 0; #endif static int xmlDoValidityCheckingDefaultValueThrDef = 0; @@ -273,7 +273,7 @@ static int xmlDoValidityCheckingDefaultValueThrDef = 0; * Global setting, indicate that the DTD validation should provide warnings. * Activated by default. */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) int xmlGetWarningsDefaultValue = 1; #endif static int xmlGetWarningsDefaultValueThrDef = 1; @@ -286,7 +286,7 @@ static int xmlGetWarningsDefaultValueThrDef = 1; * validating. * Disabled by default. */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) int xmlLoadExtDtdDefaultValue = 0; #endif static int xmlLoadExtDtdDefaultValueThrDef = 0; @@ -298,7 +298,7 @@ static int xmlLoadExtDtdDefaultValueThrDef = 0; * Global setting, indicate that the parser be pedantic * Disabled by default. */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) int xmlPedanticParserDefaultValue = 0; #endif static int xmlPedanticParserDefaultValueThrDef = 0; @@ -312,7 +312,7 @@ static int xmlPedanticParserDefaultValueThrDef = 0; * Disabled by default since this may not be safe for old classes of * application. */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) int xmlLineNumbersDefaultValue = 0; #endif static int xmlLineNumbersDefaultValueThrDef = 0; @@ -327,7 +327,7 @@ static int xmlLineNumbersDefaultValueThrDef = 0; * conformant to the XML Recommendation, however the option is kept * for some applications since this was libxml1 default behaviour. */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) int xmlKeepBlanksDefaultValue = 1; #endif static int xmlKeepBlanksDefaultValueThrDef = 1; @@ -342,7 +342,7 @@ static int xmlKeepBlanksDefaultValueThrDef = 1; * the XPath data model requires entities replacement and the XPath * engine does not handle entities references transparently. */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) int xmlSubstituteEntitiesDefaultValue = 0; #endif static int xmlSubstituteEntitiesDefaultValueThrDef = 0; @@ -352,7 +352,7 @@ static int xmlSubstituteEntitiesDefaultValueThrDef = 0; * * DEPRECATED: Don't use */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) xmlRegisterNodeFunc xmlRegisterNodeDefaultValue = NULL; #endif static xmlRegisterNodeFunc xmlRegisterNodeDefaultValueThrDef = NULL; @@ -362,7 +362,7 @@ static xmlRegisterNodeFunc xmlRegisterNodeDefaultValueThrDef = NULL; * * DEPRECATED: Don't use */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue = NULL; #endif static xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValueThrDef = NULL; @@ -372,7 +372,7 @@ static xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValueThrDef = NULL; * * DEPRECATED: Don't use */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) xmlParserInputBufferCreateFilenameFunc xmlParserInputBufferCreateFilenameValue = NULL; #endif @@ -384,7 +384,7 @@ xmlParserInputBufferCreateFilenameValueThrDef = NULL; * * DEPRECATED: Don't use */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) xmlOutputBufferCreateFilenameFunc xmlOutputBufferCreateFilenameValue = NULL; #endif static xmlOutputBufferCreateFilenameFunc @@ -397,7 +397,7 @@ xmlOutputBufferCreateFilenameValueThrDef = NULL; * * Global setting: function used for generic error callbacks */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) xmlGenericErrorFunc xmlGenericError = xmlGenericErrorDefaultFunc; #endif static xmlGenericErrorFunc xmlGenericErrorThrDef = xmlGenericErrorDefaultFunc; @@ -408,7 +408,7 @@ static xmlGenericErrorFunc xmlGenericErrorThrDef = xmlGenericErrorDefaultFunc; * * Global setting: function used for structured error callbacks */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) xmlStructuredErrorFunc xmlStructuredError = NULL; #endif static xmlStructuredErrorFunc xmlStructuredErrorThrDef = NULL; @@ -419,7 +419,7 @@ static xmlStructuredErrorFunc xmlStructuredErrorThrDef = NULL; * * Global setting passed to generic error callbacks */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) void *xmlGenericErrorContext = NULL; #endif static void *xmlGenericErrorContextThrDef = NULL; @@ -430,11 +430,11 @@ static void *xmlGenericErrorContextThrDef = NULL; * * Global setting passed to structured error callbacks */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) void *xmlStructuredErrorContext = NULL; #endif static void *xmlStructuredErrorContextThrDef = NULL; -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) xmlError xmlLastError; #endif @@ -450,7 +450,7 @@ xmlError xmlLastError; * Global setting, asking the serializer to indent the output tree by default * Enabled by default */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) int xmlIndentTreeOutput = 1; #endif static int xmlIndentTreeOutputThrDef = 1; @@ -463,7 +463,7 @@ static int xmlIndentTreeOutputThrDef = 1; * The string used to do one-level indent. By default is equal to * " " (two spaces) */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) const char *xmlTreeIndentString = " "; #endif static const char *xmlTreeIndentStringThrDef = " "; @@ -478,7 +478,7 @@ static const char *xmlTreeIndentStringThrDef = " "; * once parsed. * Disabled by default */ -#if !defined(LIBXML_THREAD_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if !defined(LIBXML_THREAD_ENABLED) int xmlSaveNoEmptyTags = 0; #endif static int xmlSaveNoEmptyTagsThrDef = 0; diff --git a/include/libxml/parser.h b/include/libxml/parser.h index 1f878adf..5eaea736 100644 --- a/include/libxml/parser.h +++ b/include/libxml/parser.h @@ -1284,28 +1284,6 @@ XMLPUBFUN void XMLPUBFUN xmlParserCtxtPtr xmlCreateDocParserCtxt (const xmlChar *cur); -#ifdef LIBXML_LEGACY_ENABLED -/** DOC_DISABLE */ -/* - * Reading/setting optional parsing features. - */ -XML_DEPRECATED -XMLPUBFUN int - xmlGetFeaturesList (int *len, - const char **result); -XML_DEPRECATED -XMLPUBFUN int - xmlGetFeature (xmlParserCtxtPtr ctxt, - const char *name, - void *result); -XML_DEPRECATED -XMLPUBFUN int - xmlSetFeature (xmlParserCtxtPtr ctxt, - const char *name, - void *value); -/** DOC_ENABLE */ -#endif /* LIBXML_LEGACY_ENABLED */ - #ifdef LIBXML_PUSH_ENABLED /* * Interfaces for the Push mode. diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in index c285a82f..6fc9bd2f 100644 --- a/include/libxml/xmlversion.h.in +++ b/include/libxml/xmlversion.h.in @@ -155,11 +155,9 @@ /** * LIBXML_LEGACY_ENABLED: * - * Whether the deprecated APIs are compiled in for compatibility + * Removed in 2.14 */ -#if @WITH_LEGACY@ -#define LIBXML_LEGACY_ENABLED -#endif +#undef LIBXML_LEGACY_ENABLED /** * LIBXML_C14N_ENABLED: diff --git a/legacy.c b/legacy.c deleted file mode 100644 index 14777e05..00000000 --- a/legacy.c +++ /dev/null @@ -1,1073 +0,0 @@ -/* - * legacy.c: set of deprecated routines, not to be used anymore but - * kept purely for ABI compatibility - * - * See Copyright for the status of this software. - * - * daniel@veillard.com - */ - -#define IN_LIBXML -#include "libxml.h" - -#ifdef LIBXML_LEGACY_ENABLED -#include -#include - -#include - -/************************************************************************ - * * - * Deprecated functions kept for compatibility * - * * - ************************************************************************/ - -#ifdef LIBXML_HTML_ENABLED -XMLPUBFUN xmlChar * -htmlDecodeEntities(void *ctxt, int len, xmlChar end, xmlChar end2, - xmlChar end3); - -xmlChar * -htmlDecodeEntities(void *ctxt ATTRIBUTE_UNUSED, int len ATTRIBUTE_UNUSED, - xmlChar end ATTRIBUTE_UNUSED, xmlChar end2 ATTRIBUTE_UNUSED, - xmlChar end3 ATTRIBUTE_UNUSED) { - return (NULL); -} -#endif - -/* - * entities.h - */ - -XMLPUBFUN void -xmlInitializePredefinedEntities(void); - -void -xmlInitializePredefinedEntities(void) { -} - -XMLPUBFUN void -xmlCleanupPredefinedEntities(void); - -void -xmlCleanupPredefinedEntities(void) { -} - -XMLPUBFUN const xmlChar * -xmlEncodeEntities(void *doc, const xmlChar *input); - -const xmlChar * -xmlEncodeEntities(void *doc ATTRIBUTE_UNUSED, - const xmlChar *input ATTRIBUTE_UNUSED) { - return (NULL); -} - -/* - * parser.h - * - * Headers are public for now. - */ - -int -xmlGetFeaturesList(int *len, const char **result ATTRIBUTE_UNUSED) { - *len = 0; - return(0); -} - -int -xmlGetFeature(xmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, - void *result ATTRIBUTE_UNUSED) { - return(-1); -} - -int -xmlSetFeature(xmlParserCtxtPtr ctxt ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, - void *value ATTRIBUTE_UNUSED) { - return(-1); -} - -/* - * parserInternals.h - */ - -XMLPUBFUN xmlChar * -xmlDecodeEntities(void *ctxt, int len, int what, xmlChar end, xmlChar end2, - xmlChar end3); - -xmlChar * -xmlDecodeEntities(void *ctxt ATTRIBUTE_UNUSED, int len ATTRIBUTE_UNUSED, - int what ATTRIBUTE_UNUSED, xmlChar end ATTRIBUTE_UNUSED, - xmlChar end2 ATTRIBUTE_UNUSED, - xmlChar end3 ATTRIBUTE_UNUSED) { - return (NULL); -} - -XMLPUBFUN xmlChar * -xmlNamespaceParseNCName(void *ctxt); - -xmlChar * -xmlNamespaceParseNCName(void *ctxt ATTRIBUTE_UNUSED) { - return (NULL); -} - -XMLPUBFUN xmlChar * -xmlNamespaceParseQName(void *ctxt, xmlChar **prefix); - -xmlChar * -xmlNamespaceParseQName(void *ctxt ATTRIBUTE_UNUSED, - xmlChar **prefix ATTRIBUTE_UNUSED) { - return (NULL); -} - -XMLPUBFUN xmlChar * -xmlNamespaceParseNSDef(void *ctxt); - -xmlChar * -xmlNamespaceParseNSDef(void *ctxt ATTRIBUTE_UNUSED) { - return (NULL); -} - -XMLPUBFUN xmlChar * -xmlParseQuotedString(void *ctxt); - -xmlChar * -xmlParseQuotedString(void *ctxt ATTRIBUTE_UNUSED) { - return (NULL); -} - -XMLPUBFUN void -xmlParseNamespace(void *ctxt); - -void -xmlParseNamespace(void *ctxt ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN xmlChar * -xmlScanName(void *ctxt); - -xmlChar * -xmlScanName(void *ctxt ATTRIBUTE_UNUSED) { - return (NULL); -} - -XMLPUBFUN void -xmlParserHandleReference(void *ctxt); - -void -xmlParserHandleReference(void *ctxt ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -xmlHandleEntity(void *ctxt, void *entity); - -void -xmlHandleEntity(void *ctxt ATTRIBUTE_UNUSED, void *entity ATTRIBUTE_UNUSED) { -} - -typedef void -(*xmlEntityReferenceFunc)(void *ent, void *firstNode, void *lastNode); - -XMLPUBFUN void -xmlSetEntityReferenceFunc(xmlEntityReferenceFunc func); - -void -xmlSetEntityReferenceFunc(xmlEntityReferenceFunc func ATTRIBUTE_UNUSED) { -} - -/* - * tree.h - */ - -XMLPUBFUN void * -xmlNewGlobalNs(void *doc, const xmlChar *href, const xmlChar *prefix); - -void * -xmlNewGlobalNs(void *doc ATTRIBUTE_UNUSED, - const xmlChar *href ATTRIBUTE_UNUSED, - const xmlChar *prefix ATTRIBUTE_UNUSED) { - return (NULL); -} - -XMLPUBFUN void -xmlUpgradeOldNs(void *doc); - -void -xmlUpgradeOldNs(void *doc ATTRIBUTE_UNUSED) { -} - -/* - * SAX.h - */ - -XMLPUBFUN const xmlChar * -getPublicId(void *ctx); - -const xmlChar * -getPublicId(void *ctx ATTRIBUTE_UNUSED){ - return(NULL); -} - -XMLPUBFUN const xmlChar * -getSystemId(void *ctx); - -const xmlChar * -getSystemId(void *ctx ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN int -getLineNumber(void *ctx); - -int -getLineNumber(void *ctx ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -getColumnNumber(void *ctx); - -int -getColumnNumber(void *ctx ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -isStandalone(void *ctx); - -int -isStandalone(void *ctx ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -hasInternalSubset(void *ctx); - -int -hasInternalSubset(void *ctx ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -hasExternalSubset(void *ctx); - -int -hasExternalSubset(void *ctx ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN void -internalSubset(void *ctx, const xmlChar *name, - const xmlChar *ExternalID, const xmlChar *SystemID); - -void -internalSubset(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *name ATTRIBUTE_UNUSED, - const xmlChar *ExternalID ATTRIBUTE_UNUSED, - const xmlChar *SystemID ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -externalSubset(void *ctx, const xmlChar *name, - const xmlChar *ExternalID, const xmlChar *SystemID); - -void -externalSubset(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *name ATTRIBUTE_UNUSED, - const xmlChar *ExternalID ATTRIBUTE_UNUSED, - const xmlChar *SystemID ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void * -resolveEntity(void *ctx, const xmlChar * publicId, - const xmlChar * systemId); - -void * -resolveEntity(void *ctx ATTRIBUTE_UNUSED, - const xmlChar * publicId ATTRIBUTE_UNUSED, - const xmlChar * systemId ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -getEntity(void *ctx, const xmlChar *name); - -void * -getEntity(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -getParameterEntity(void *ctx, const xmlChar *name); - -void * -getParameterEntity(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *name ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void -entityDecl(void *ctx, const xmlChar *name, int type, - const xmlChar *publicId, const xmlChar *systemId, - xmlChar *content); - -void -entityDecl(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name ATTRIBUTE_UNUSED, - int type ATTRIBUTE_UNUSED, const xmlChar *publicId ATTRIBUTE_UNUSED, - const xmlChar *systemId ATTRIBUTE_UNUSED, - xmlChar *content ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -attributeDecl(void *ctx, const xmlChar *elem, const xmlChar *fullname, - int type, int def, const xmlChar *defaultValue, void *tree); - -void -attributeDecl(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *elem ATTRIBUTE_UNUSED, - const xmlChar *fullname ATTRIBUTE_UNUSED, - int type ATTRIBUTE_UNUSED, int def ATTRIBUTE_UNUSED, - const xmlChar *defaultValue ATTRIBUTE_UNUSED, - void *tree ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -elementDecl(void *ctx, const xmlChar *name, int type, void *content); - -void -elementDecl(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name ATTRIBUTE_UNUSED, - int type ATTRIBUTE_UNUSED, void *content ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -notationDecl(void *ctx, const xmlChar *name, const xmlChar *publicId, - const xmlChar *systemId); - -void -notationDecl(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name ATTRIBUTE_UNUSED, - const xmlChar *publicId ATTRIBUTE_UNUSED, - const xmlChar *systemId ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -unparsedEntityDecl(void *ctx, const xmlChar *name, const xmlChar *publicId, - const xmlChar *systemId, const xmlChar *notationName); - -void -unparsedEntityDecl(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *name ATTRIBUTE_UNUSED, - const xmlChar *publicId ATTRIBUTE_UNUSED, - const xmlChar *systemId ATTRIBUTE_UNUSED, - const xmlChar *notationName ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -setDocumentLocator(void *ctx, void *loc); - -void -setDocumentLocator(void *ctx ATTRIBUTE_UNUSED, void *loc ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -startDocument(void *ctx); - -void -startDocument(void *ctx ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -endDocument(void *ctx); - -void -endDocument(void *ctx ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -attribute(void *ctx, const xmlChar *fullname, const xmlChar *value); - -void -attribute(void *ctx ATTRIBUTE_UNUSED, const xmlChar *fullname ATTRIBUTE_UNUSED, - const xmlChar *value ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -startElement(void *ctx, const xmlChar *fullname, const xmlChar **atts); - -void -startElement(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *fullname ATTRIBUTE_UNUSED, - const xmlChar **atts ATTRIBUTE_UNUSED) { - xmlSAX2StartElement(ctx, fullname, atts); -} - -XMLPUBFUN void -endElement(void *ctx, const xmlChar *name); - -void -endElement(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -reference(void *ctx, const xmlChar *name); - -void -reference(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -characters(void *ctx, const xmlChar *ch, int len); - -void -characters(void *ctx ATTRIBUTE_UNUSED, const xmlChar *ch ATTRIBUTE_UNUSED, - int len ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -ignorableWhitespace(void *ctx, const xmlChar *ch, int len); - -void -ignorableWhitespace(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *ch ATTRIBUTE_UNUSED, - int len ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -processingInstruction(void *ctx, const xmlChar *target, const xmlChar *data); - -void -processingInstruction(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *target ATTRIBUTE_UNUSED, - const xmlChar *data ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -globalNamespace(void *ctx, const xmlChar *href, const xmlChar *prefix); - -void -globalNamespace(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *href ATTRIBUTE_UNUSED, - const xmlChar *prefix ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -setNamespace(void *ctx, const xmlChar *name); - -void -setNamespace(void *ctx ATTRIBUTE_UNUSED, - const xmlChar *name ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void * -getNamespace(void *ctx); - -void * -getNamespace(void *ctx ATTRIBUTE_UNUSED) { - return (NULL); -} - -XMLPUBFUN int -checkNamespace(void *ctx, xmlChar *namespace); - -int -checkNamespace(void *ctx ATTRIBUTE_UNUSED, - xmlChar *namespace ATTRIBUTE_UNUSED) { - return (0); -} - -XMLPUBFUN void -namespaceDecl(void *ctx, const xmlChar *href, const xmlChar *prefix); - -void -namespaceDecl(void *ctx ATTRIBUTE_UNUSED, const xmlChar *href ATTRIBUTE_UNUSED, - const xmlChar *prefix ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -comment(void *ctx, const xmlChar *value); - -void -comment(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -cdataBlock(void *ctx, const xmlChar *value, int len); - -void -cdataBlock(void *ctx ATTRIBUTE_UNUSED, const xmlChar *value ATTRIBUTE_UNUSED, - int len ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -initxmlDefaultSAXHandler(void *hdlr, int warning); - -void -initxmlDefaultSAXHandler(void *hdlr ATTRIBUTE_UNUSED, - int warning ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -inithtmlDefaultSAXHandler(void *hdlr); - -void -inithtmlDefaultSAXHandler(void *hdlr ATTRIBUTE_UNUSED) { -} - -/* - * nanoftp.h - */ - -#ifdef _WIN32 - #include -#else - #define SOCKET int -#endif - -typedef void -(*ftpListCallback)(void *userData, const char *filename, const char *attrib, - const char *owner, const char *group, unsigned long size, - int links, int year, const char *month, int day, int hour, - int minute); - -typedef void -(*ftpDataCallback) (void *userData, const char *data, int len); - -XMLPUBFUN void -xmlNanoFTPInit(void); - -void -xmlNanoFTPInit(void) { -} - -XMLPUBFUN void -xmlNanoFTPCleanup(void); - -void -xmlNanoFTPCleanup(void) { -} - -XMLPUBFUN void -xmlNanoFTPProxy(const char *host, int port, const char *user, - const char *passwd, int type); - -void -xmlNanoFTPProxy(const char *host ATTRIBUTE_UNUSED, int port ATTRIBUTE_UNUSED, - const char *user ATTRIBUTE_UNUSED, - const char *passwd ATTRIBUTE_UNUSED, int type ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN int -xmlNanoFTPUpdateURL(void *ctx, const char *URL); - -int -xmlNanoFTPUpdateURL(void *ctx ATTRIBUTE_UNUSED, - const char *URL ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN void -xmlNanoFTPScanProxy(const char *URL); - -void -xmlNanoFTPScanProxy(const char *URL ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void * -xmlNanoFTPNewCtxt(const char *URL); - -void* -xmlNanoFTPNewCtxt(const char *URL ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void -xmlNanoFTPFreeCtxt(void *ctx); - -void -xmlNanoFTPFreeCtxt(void * ctx ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN int -xmlNanoFTPGetResponse(void *ctx); - -int -xmlNanoFTPGetResponse(void *ctx ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlNanoFTPCheckResponse(void *ctx); - -int -xmlNanoFTPCheckResponse(void *ctx ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlNanoFTPQuit(void *ctx); - -int -xmlNanoFTPQuit(void *ctx ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlNanoFTPConnect(void *ctx); - -int -xmlNanoFTPConnect(void *ctx ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN void * -xmlNanoFTPConnectTo(const char *server, int port); - -void* -xmlNanoFTPConnectTo(const char *server ATTRIBUTE_UNUSED, - int port ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN int -xmlNanoFTPCwd(void *ctx, const char *directory); - -int -xmlNanoFTPCwd(void *ctx ATTRIBUTE_UNUSED, - const char *directory ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlNanoFTPDele(void *ctx, const char *file); - -int -xmlNanoFTPDele(void *ctx ATTRIBUTE_UNUSED, const char *file ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN SOCKET -xmlNanoFTPGetConnection(void *ctx); - -SOCKET -xmlNanoFTPGetConnection(void *ctx ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlNanoFTPCloseConnection(void *ctx); - -int -xmlNanoFTPCloseConnection(void *ctx ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlNanoFTPList(void *ctx, ftpListCallback callback, void *userData, - const char *filename); - -int -xmlNanoFTPList(void *ctx ATTRIBUTE_UNUSED, - ftpListCallback callback ATTRIBUTE_UNUSED, - void *userData ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN SOCKET -xmlNanoFTPGetSocket(void *ctx, const char *filename); - -SOCKET -xmlNanoFTPGetSocket(void *ctx ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlNanoFTPGet(void *ctx, ftpDataCallback callback, void *userData, - const char *filename); - -int -xmlNanoFTPGet(void *ctx ATTRIBUTE_UNUSED, - ftpDataCallback callback ATTRIBUTE_UNUSED, - void *userData ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlNanoFTPRead(void *ctx, void *dest, int len); - -int -xmlNanoFTPRead(void *ctx ATTRIBUTE_UNUSED, void *dest ATTRIBUTE_UNUSED, - int len ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN void * -xmlNanoFTPOpen(const char *URL); - -void* -xmlNanoFTPOpen(const char *URL ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN int -xmlNanoFTPClose(void *ctx); - -int -xmlNanoFTPClose(void *ctx ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlIOFTPMatch(const char *filename); - -int -xmlIOFTPMatch(const char *filename ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN void * -xmlIOFTPOpen(const char *filename); - -void * -xmlIOFTPOpen(const char *filename ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN int -xmlIOFTPRead(void *context, char *buffer, int len); - -int -xmlIOFTPRead(void *context ATTRIBUTE_UNUSED, char *buffer ATTRIBUTE_UNUSED, - int len ATTRIBUTE_UNUSED) { - return(-1); -} - -XMLPUBFUN int -xmlIOFTPClose(void *context); - -int -xmlIOFTPClose(void *context ATTRIBUTE_UNUSED) { - return(-1); -} - -/* - * xpointer.h - */ - -XMLPUBFUN void * -xmlXPtrNewRange(void *start, int startindex, - void *end, int endindex); - -void * -xmlXPtrNewRange(void *start ATTRIBUTE_UNUSED, - int startindex ATTRIBUTE_UNUSED, - void *end ATTRIBUTE_UNUSED, - int endindex ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrNewRangePoints(void *start, void *end); - -void * -xmlXPtrNewRangePoints(void *start ATTRIBUTE_UNUSED, - void *end ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrNewRangePointNode(void *start, void *end); - -void * -xmlXPtrNewRangePointNode(void *start ATTRIBUTE_UNUSED, - void *end ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrNewRangeNodePoint(void *start, void *end); - -void * -xmlXPtrNewRangeNodePoint(void *start ATTRIBUTE_UNUSED, - void *end ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrNewRangeNodes(void *start, void *end); - -void * -xmlXPtrNewRangeNodes(void *start ATTRIBUTE_UNUSED, - void *end ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrNewCollapsedRange(void *start); - -void * -xmlXPtrNewCollapsedRange(void *start ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrNewRangeNodeObject(void *start, void *end); - -void * -xmlXPtrNewRangeNodeObject(void *start ATTRIBUTE_UNUSED, - void *end ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrLocationSetCreate(void *val); - -void * -xmlXPtrLocationSetCreate(void *val ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void -xmlXPtrLocationSetAdd(void *cur, void *val); - -void -xmlXPtrLocationSetAdd(void *cur ATTRIBUTE_UNUSED, - void *val ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void * -xmlXPtrLocationSetMerge(void *val1, void *val2); - -void * -xmlXPtrLocationSetMerge(void *val1 ATTRIBUTE_UNUSED, - void *val2 ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void -xmlXPtrLocationSetDel(void *cur, void *val); - -void -xmlXPtrLocationSetDel(void *cur ATTRIBUTE_UNUSED, - void *val ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -xmlXPtrLocationSetRemove(void *cur, int val); - -void -xmlXPtrLocationSetRemove(void *cur ATTRIBUTE_UNUSED, - int val ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -xmlXPtrFreeLocationSet(void *obj); - -void -xmlXPtrFreeLocationSet(void *obj ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void * -xmlXPtrNewLocationSetNodes(void *start, void *end); - -void * -xmlXPtrNewLocationSetNodes(void *start ATTRIBUTE_UNUSED, - void *end ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrNewLocationSetNodeSet(void *set); - -void * -xmlXPtrNewLocationSetNodeSet(void *set ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrWrapLocationSet(void *val); - -void * -xmlXPtrWrapLocationSet(void *val ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void * -xmlXPtrBuildNodeList(void *obj); - -void * -xmlXPtrBuildNodeList(void *obj ATTRIBUTE_UNUSED) { - return(NULL); -} - -XMLPUBFUN void -xmlXPtrRangeToFunction(void *ctxt, int nargs); - -void -xmlXPtrRangeToFunction(void *ctxt ATTRIBUTE_UNUSED, - int nargs ATTRIBUTE_UNUSED) { -} - -/* - * xmllint shell functions formerly in debugXML.h - */ - -XMLPUBFUN void -xmlLsOneNode(FILE *output, xmlNodePtr node); - -void -xmlLsOneNode(FILE *output ATTRIBUTE_UNUSED, xmlNodePtr node ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN int -xmlLsCountNode(xmlNodePtr node); - -int -xmlLsCountNode(xmlNodePtr node ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN const char * -xmlBoolToText(int boolval); - -const char * -xmlBoolToText(int boolval) { - if (boolval) - return("True"); - else - return("False"); -} - -#ifdef LIBXML_XPATH_ENABLED -XMLPUBFUN void -xmlShellPrintXPathError(int errorType, const char *arg); - -void -xmlShellPrintXPathError(int errorType ATTRIBUTE_UNUSED, - const char *arg ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN void -xmlShellPrintXPathResult(void *list); - -void -xmlShellPrintXPathResult(void *list ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN int -xmlShellList(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellList(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -xmlShellBase(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellBase(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -xmlShellDir(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellDir(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -xmlShellLoad(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellLoad(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} - -#ifdef LIBXML_OUTPUT_ENABLED -XMLPUBFUN void -xmlShellPrintNode(void *node); - -void -xmlShellPrintNode(void *ctxt ATTRIBUTE_UNUSED) { -} - -XMLPUBFUN int -xmlShellCat(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellCat(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -xmlShellWrite(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellWrite(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -xmlShellSave(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellSave(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} -#endif /* LIBXML_OUTPUT_ENABLED */ - -#ifdef LIBXML_VALID_ENABLED -XMLPUBFUN int -xmlShellValidate(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellValidate(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} -#endif /* LIBXML_VALID_ENABLED */ - -XMLPUBFUN int -xmlShellDu(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellDu(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} - -XMLPUBFUN int -xmlShellPwd(void *ctxt, char *arg, void *node, void *node2); - -int -xmlShellPwd(void *ctxt ATTRIBUTE_UNUSED, char *arg ATTRIBUTE_UNUSED, - void *node ATTRIBUTE_UNUSED, void *node2 ATTRIBUTE_UNUSED) { - return(0); -} - -typedef char * (*xmlShellReadlineFunc)(char *prompt); - -XMLPUBFUN void -xmlShell(void *doc, char *filename, xmlShellReadlineFunc input, void *output); - -void -xmlShell(void *doc ATTRIBUTE_UNUSED, char *filename ATTRIBUTE_UNUSED, - xmlShellReadlineFunc input ATTRIBUTE_UNUSED, - void *output ATTRIBUTE_UNUSED) { -} -#endif /* LIBXML_XPATH_ENABLED */ - -#endif /* LIBXML_LEGACY_ENABLED */ - diff --git a/meson.build b/meson.build index 37d7f0a7..b55699db 100644 --- a/meson.build +++ b/meson.build @@ -452,7 +452,6 @@ xml_opt_src = [ [want_debug, ['debugXML.c']], [want_html, ['HTMLparser.c', 'HTMLtree.c']], [want_http, ['nanohttp.c']], - [want_legacy, ['legacy.c']], [want_lzma, ['xzlib.c']], [want_modules, ['xmlmodule.c']], [want_output, ['xmlsave.c']], diff --git a/parser.c b/parser.c index 81b7e670..ef2a4b96 100644 --- a/parser.c +++ b/parser.c @@ -587,11 +587,7 @@ xmlHasFeature(xmlFeature feature) return(0); #endif case XML_WITH_LEGACY: -#ifdef LIBXML_LEGACY_ENABLED - return(1); -#else return(0); -#endif case XML_WITH_C14N: #ifdef LIBXML_C14N_ENABLED return(1); diff --git a/tools/gentest.py b/tools/gentest.py index d7c51390..b518299e 100755 --- a/tools/gentest.py +++ b/tools/gentest.py @@ -143,9 +143,6 @@ skipped_functions = [ "xmlParseXMLDecl", "xmlParseTextDecl", "xmlParseMisc", "xmlParseExternalSubset", "xmlParserHandlePEReference", "xmlSkipBlankChars", -# Legacy -"xmlCleanupPredefinedEntities", "xmlInitializePredefinedEntities", -"xmlSetFeature", "xmlGetFeature", "xmlGetFeaturesList", # Shouldn't free result "xmlCtxtGetDict", ]