diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 3032beee..91a440a8 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -1,29 +1,6 @@ - - old DocBook SGML parser - interface for a DocBook SGML non-verifying parser This code is DEPRECATED, and should not be used anymore. - Daniel Veillard - - - - - - - - - - - - - - - - - - - interface for an HTML 4.0 non-verifying parser this module implements an HTML 4.0 non-verifying parser with API compatible with the XML parser ones. It should be able to parse "real world" HTML, even if severely broken from a specification point of view. @@ -31,302 +8,299 @@ - + - - + - - - - + - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + specific APIs to process HTML tree, especially serialization this module implements a few function needed to process tree in an HTML specific way. Daniel Veillard - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Old SAX version 1 handler, deprecated DEPRECATED set of SAX version 1 interfaces used to build the DOM tree. Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SAX2 parser interface used to build the DOM tree those are the default SAX2 interfaces used by the library when building DOM tree. Daniel Veillard - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + Provide Canonical XML and Exclusive XML Canonicalization the c14n modules provides a "Canonical XML" implementation Aleksey Sanin <aleksey@aleksey.com> - + - - - - + + + + interfaces to the Catalog handling system the catalog module implements the support for XML Catalogs and SGML catalogs Daniel Veillard - + + + + - - - + - - - - - - + - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - Unicode character range checking this module exports interfaces for the character range validation APIs This file is automatically generated from the cvs source definition files using the genChRanges.py Python script William Brack <wbrack@mmm.com.hk> - - - - - + + + + + + - - - - - - + + + + + - + - - + + - - - - - - - - + + + + - - + + + + + + Tree debugging APIs @@ -335,36 +309,36 @@ - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + - + - - + + + + + + + + + string dictionary @@ -372,76 +346,73 @@ Daniel Veillard - - - + + - + + + + + + - - - - interface for the encoding conversion functions interface for the encoding conversion functions needed for XML basic encoding and iconv() support. Related specs are rfc2044 (UTF-8 and UTF-16) F. Yergeau Alis Technologies [ISO-10646] UTF-8 and UTF-16 in Annexes [ISO-8859-1] ISO Latin-1 characters codes. [UNICODE] The Unicode Consortium, "The Unicode Standard -- Worldwide Character Encoding -- Version 1.0", Addison- Wesley, Volume 1, 1991, Volume 2, 1992. UTF-8 is described in Unicode Technical Report #4. [US-ASCII] Coded Character Set--7-bit American Standard Code for Information Interchange, ANSI X3.4-1986. Daniel Veillard - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + - + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + interface for the XML entities handling @@ -449,101 +420,100 @@ Daniel Veillard - - - + + + - - - - + - - + - - + + + + + + interface for all global variables of the library all the global variables and thread handling for those variables is handled by this module. The bottom of this file is automatically generated by build_glob.py based on the description file global.data Gary Pennington <Gary.Pennington@uk.sun.com>, Daniel Veillard - + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + - - - - + + + @@ -553,35 +523,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + lists interfaces @@ -591,766 +561,767 @@ - - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + minimal FTP implementation - minimal FTP implementation allowing to fetch resources like external subset. + minimal FTP implementation allowing to fetch resources like external subset. This module is DEPRECATED, do not use any of its functions. Daniel Veillard + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + minimal HTTP implementation minimal HTTP implementation allowing to fetch resources like external subset. Daniel Veillard - - - - - - - - + + + + + + + - - - + + + + the core parser module Interfaces, constants and types related to the XML parser Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + - - - + + - - + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + - - - - - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + internals routines and limits exported by the parser. this module exports a number of internal parsing routines they are not really all intended for applications but can prove useful doing low level processing. Daniel Veillard - + + + + + - + + + + + - - - - - - - - - - - - - - + + - - - - - - - + - + + + + + + + + - + + + + - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + pattern expression handling allows to compile and test pattern expressions for nodes either in a tree or based on a parser state. Daniel Veillard + - - - - + - - - - - - - - - + + - - - - + + + + + + + + + + + + + implementation of the Relax-NG validation implementation of the Relax-NG validation Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - + + - - - - - - + - - + + - - + + + + + + + + + + + + - + + + internal interfaces for XML Schemas internal interfaces for the XML Schemas handling and schema validity checking The Schemas development is a Work In Progress. Some of those interfaces are not guaranteed to be API or ABI stable ! Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + @@ -1358,365 +1329,365 @@ XML Schemastron implementation interface to the XML Schematron validity checking. Daniel Veillard - - + - - + - - - - + + - + - - - - - - + + + + - + - + + + + + + + interfaces for thread handling set of generic threading related routines should work with pthreads, Windows native or TLS threads Daniel Veillard + - - - - - - - - - - - - + + + + + + + + + + + interfaces for tree manipulation this module describes the structures found in an tree resulting from an XML or HTML parsing, as well as the API provided for various processing on that tree Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + - + + + + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + library of generic URI related routines @@ -1725,1111 +1696,1112 @@ - - - - - - - - - - - + + + + + + + + + + - + + The DTD validation API for the DTD handling and the validity checking Daniel Veillard - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + implementation of XInclude API to handle XInclude processing, implements the World Wide Web Consortium Last Call Working Draft 10 November 2003 Daniel Veillard - - - - - + - - + + + + + + - - - - - - - + + + + + + + unfinished XLink detection module unfinished XLink detection module Daniel Veillard - - - - + + + + + - - + - - - + - + + + - - - - + - + + + + interface for the I/O interfaces used by the parser interface for the I/O interfaces used by the parser Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + API to build regexp automata the API to build regexp automata Daniel Veillard - - - - - - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + error handling the API used to report errors Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + macros for marking symbols as exportable/importable. macros for marking symbols as exportable/importable. - - - + + + interface for the memory allocator provides interfaces for the memory allocator, including debugging capabilities. Daniel Veillard - + - - - - - - - - - - - - - - - - - + - - - - + + - + + + + + + + + + + + + + + + + + + + dynamic module loading @@ -2838,338 +2810,338 @@ - - - - + + + + the XMLReader implementation API of the XML streaming API based on C# interfaces. Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + regular expressions handling basic API for libxml regular expressions handling used for XML Schemas and validation. Daniel Veillard + - - - - + + - + + - + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + the XML document serializer API to save document or subtree of document Daniel Veillard - + + + - - - - + - - + - - - - + + + + + + incomplete XML Schemas structure implementation interface to the XML Schemas handling and schema validity checking, it is incomplete right now. Daniel Veillard - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + implementation of XML Schema Datatypes module providing the XML Schema Datatypes implementation both definition and validity checking Daniel Veillard - - + + - - - - - - - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + - + + + + + + + + + set of routines to process strings @@ -3177,623 +3149,623 @@ Daniel Veillard - + + + + + + + + - - - - - - - - + + - - - - - - - - - - - - + + + + + + - + + + + + + Unicode character APIs API for the Unicode character APIs This file is automatically generated from the UCS description files of the Unicode Character Database Daniel Veillard + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + compile-time version information compile-time version information for the XML library Daniel Veillard - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + + + + + + - - + - - - + - + + + + + + + + + + + + + text writing API for XML text writing API for XML Alfred Mickautsch <alfred@mickautsch.de> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + - + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + XML Path Language implementation API for the XML Path Language implementation XML Path Language implementation XPath is a language for addressing parts of an XML document, designed to be used by both XSLT and XPointer Daniel Veillard - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + - - - - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + - + - - - - + - - - - - - - - - - - - - - - + - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + internal interfaces for XML Path Language implementation internal interfaces for XML Path Language implementation used to build new modules on top of XPath like XPointer and XSLT Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + API to handle XML Pointers @@ -3802,27 +3774,27 @@ - - - - + + - - - - - - - - - - + + + + + + + + + + + + @@ -3883,8 +3855,6 @@ Macro. A text node in a HTML document is really implemented the same way as a text node in an XML document. - - The parser tries to always have that amount of input ready. One of the point is providing context when reporting errors. @@ -3993,9 +3963,6 @@ - - Whether the SGML Docbook support is configured in - the version string like "1.2.3" @@ -4177,18 +4144,17 @@ Bit in the loadsubset context field to tell to do complete the elements attributes lists with the ones defaulted from the DTDs. Use it to initialize xmlLoadExtDtdDefaultValue. - - Special value for finishDtd field when embedded in an xmlParserCtxt - - - Special value for finishDtd field when embedded in an xmlParserCtxt - The default version of XML used: 1.0 + + Macro used to indicate that a function, variable, type or struct member is deprecated. + Bit in the loadsubset context field to tell to do ID/REFs lookups. Use it to initialize xmlLoadExtDtdDefaultValue. + + Macro to extract the content pointer of a node. @@ -4477,6 +4443,12 @@ Whether general entities need to be substituted. + + Set after xmlValidateDtdFinal was called. + + + Set if the validation context is part of a parser context. + This is the name for the special xml:id attribute @@ -4807,7 +4779,6 @@ - @@ -4892,6 +4863,7 @@ and not by parsing an instance'/> + @@ -5839,7 +5811,7 @@ crash if you try to modify the tree)'/> - + @@ -5921,13 +5893,6 @@ crash if you try to modify the tree)'/> - - - - - - - @@ -5972,13 +5937,6 @@ if necessary or NULL'/> - - - - - - - @@ -6082,8 +6040,8 @@ if necessary or NULL'/> - - + + @@ -6249,7 +6207,7 @@ set at the end of parsing'/> - + @@ -6374,7 +6332,7 @@ set at the end of parsing'/> - @@ -6878,7 +6836,7 @@ Could we use @subtypes for this?'/> - + @@ -6991,7 +6949,6 @@ Could we use @subtypes for this?'/> - @@ -7146,92 +7103,6 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_DOCB_ENABLED) - Create a parser context for a file content. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. - - - - - - defined(LIBXML_DOCB_ENABLED) - Create a parser context for using the DocBook SGML parser in push mode To allow content encoding detection, @size should be >= 4 The value of @filename is used for fetching external entities and error/warning reports. - - - - - - - - - - defined(LIBXML_DOCB_ENABLED) - Initialize the default SAX handler - - - - defined(LIBXML_DOCB_ENABLED) - Take a block of UTF-8 chars in and try to convert it to an ASCII plus SGML entities block of chars out. - - - - - - - - - defined(LIBXML_DOCB_ENABLED) - Free all the memory used by a parser context. However the parsed document in ctxt->myDoc is not freed. - - - - - defined(LIBXML_DOCB_ENABLED) - Parse a Chunk of memory - - - - - - - - defined(LIBXML_DOCB_ENABLED) - parse an SGML in-memory document and build a tree. - - - - - - defined(LIBXML_DOCB_ENABLED) - parse an SGML document (and build a tree if using the standard SAX interface). - - - - - defined(LIBXML_DOCB_ENABLED) - parse a Docbook SGML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. - - - - - - defined(LIBXML_DOCB_ENABLED) - parse an SGML in-memory document and build a tree. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines. - - - - - - - - defined(LIBXML_DOCB_ENABLED) - parse an SGML file and build a tree. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. It use the given SAX function block to handle the parsing callback. If sax is NULL, fallback to the default DOM tree building routines. - - - - - - defined(LIBXML_LEGACY_ENABLED) An element definition has been parsed DEPRECATED: use xmlSAX2ElementDecl() @@ -7552,7 +7423,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_HTML_ENABLED) - Initialize the default SAX handler + DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the default SAX handler @@ -7652,7 +7523,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_HTML_ENABLED) - This is a no-op now. + DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. This is a no-op now. @@ -7915,12 +7786,6 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_LEGACY_ENABLED) && defined(LIBXML_SAX1_ENABLED) && defined(LIBXML_DOCB_ENABLED) - Initialize the default DocBook SAX version 1 handler DEPRECATED: use xmlSAX2InitDocbDefaultSAXHandler() for the new SAX2 blocks - - - defined(LIBXML_LEGACY_ENABLED) && defined(LIBXML_SAX1_ENABLED) && defined(LIBXML_HTML_ENABLED) Initialize the default HTML SAX version 1 handler DEPRECATED: use xmlSAX2InitHtmlDefaultSAXHandler() for the new SAX2 blocks @@ -8389,7 +8254,7 @@ Could we use @subtypes for this?'/> - Register a new ref declaration + DEPRECATED, do not use. This function will be removed from the public API. Register a new ref declaration @@ -9035,7 +8900,7 @@ Could we use @subtypes for this?'/> - Cleanup the memory allocated for the char encoding support, it unregisters all the encoding handlers and the aliases. + DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Cleanup the memory allocated for the char encoding support, it unregisters all the encoding handlers and the aliases. @@ -9043,7 +8908,7 @@ Could we use @subtypes for this?'/> - Additional cleanup for multi-threading + DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Additional cleanup for multi-threading @@ -9051,7 +8916,7 @@ Could we use @subtypes for this?'/> - Free up all the memory allocated by the library for its own use. This should not be called by user level code. + DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Free up all the memory allocated by the library for its own use. This should not be called by user level code. @@ -9069,7 +8934,7 @@ Could we use @subtypes for this?'/> - xmlCleanupThreads() is used to to cleanup all the thread related data of the libxml2 library once processing has ended. WARNING: if your application is multithreaded or has plugin support calling this may crash the application if another thread or a plugin is still using libxml2. It's sometimes very hard to guess if libxml2 is in use in the application, some libraries or plugins may use it without notice. In case of doubt abstain from calling this function or do it just before calling exit() to avoid leak reports from valgrind ! + DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. xmlCleanupThreads() is used to to cleanup all the thread related data of the libxml2 library once processing has ended. WARNING: if your application is multithreaded or has plugin support calling this may crash the application if another thread or a plugin is still using libxml2. It's sometimes very hard to guess if libxml2 is in use in the application, some libraries or plugins may use it without notice. In case of doubt abstain from calling this function or do it just before calling exit() to avoid leak reports from valgrind ! @@ -9495,7 +9360,7 @@ Could we use @subtypes for this?'/> - Initialize the default SAX2 handler + DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the default SAX2 handler @@ -9520,7 +9385,7 @@ Could we use @subtypes for this?'/> - Free the dictionary mutex. Do not call unless sure the library is not in use anymore ! + DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Free the dictionary mutex. Do not call unless sure the library is not in use anymore ! @@ -10081,7 +9946,7 @@ Could we use @subtypes for this?'/> - Deallocate the memory used by an Ref hash table. + DEPRECATED, do not use. This function will be removed from the public API. Deallocate the memory used by an Ref hash table. @@ -10305,7 +10170,7 @@ Could we use @subtypes for this?'/> - Find the set of references for the supplied ID. + DEPRECATED, do not use. This function will be removed from the public API. Find the set of references for the supplied ID. @@ -10632,15 +10497,15 @@ Could we use @subtypes for this?'/> - Initialize the char encoding support, it registers the default encoding supported. NOTE: while public, this function usually doesn't need to be called in normal processing. + DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the char encoding support, it registers the default encoding supported. NOTE: while public, this function usually doesn't need to be called in normal processing. - Additional initialisation for multi-threading + DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Additional initialisation for multi-threading - Initialize the memory layer. + DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the memory layer. @@ -10658,7 +10523,7 @@ Could we use @subtypes for this?'/> - xmlInitThreads() is used to to initialize all the thread related data of the libxml2 library. + DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. xmlInitThreads() is used to to initialize all the thread related data of the libxml2 library. @@ -10667,7 +10532,7 @@ Could we use @subtypes for this?'/> - Do the dictionary mutex initialization. this function is deprecated + DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Do the dictionary mutex initialization. @@ -10770,7 +10635,7 @@ Could we use @subtypes for this?'/> - Determine whether an attribute is of type Ref. In case we have DTD(s) then this is simple, otherwise we use an heuristic: name Ref (upper or lowercase). + DEPRECATED, do not use. This function will be removed from the public API. Determine whether an attribute is of type Ref. In case we have DTD(s) then this is simple, otherwise we use an heuristic: name Ref (upper or lowercase). @@ -13004,7 +12869,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_SCHEMAS_ENABLED) - Cleanup the default Schemas type library associated to RelaxNG + DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Cleanup the default Schemas type library associated to RelaxNG @@ -13201,7 +13066,7 @@ Could we use @subtypes for this?'/> - Remove the given attribute from the Ref table maintained internally. + DEPRECATED, do not use. This function will be removed from the public API. Remove the given attribute from the Ref table maintained internally. @@ -13267,7 +13132,7 @@ Could we use @subtypes for this?'/> - defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED) + defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED) called when the end of an element has been detected. @@ -13354,12 +13219,6 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_DOCB_ENABLED) - Initialize the default DocBook SAX2 handler - - - defined(LIBXML_HTML_ENABLED) Initialize the default HTML SAX2 handler @@ -13419,7 +13278,7 @@ Could we use @subtypes for this?'/> - defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED) + defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED) called when an opening tag has been processed. @@ -13681,7 +13540,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_SCHEMAS_ENABLED) - Cleanup the default XML Schemas type library + DEPRECATED: This function will be made private. Call xmlCleanupParser to free global state but see the warnings there. xmlCleanupParser should be only called once at program exit. In most cases, you don't have call cleanup functions at all. Cleanup the default XML Schemas type library @@ -14725,7 +14584,7 @@ Could we use @subtypes for this?'/> - change the input functions when discovering the character encoding of a given entity. + DEPRECATED: Use xmlSwitchToEncoding change the input functions when discovering the character encoding of a given entity. @@ -17105,7 +16964,7 @@ Could we use @subtypes for this?'/> - defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || 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_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || 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_LEGACY_ENABLED) Check that a value conforms to the lexical space of NCName @@ -17715,7 +17574,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) - Initialize the XPath environment + DEPRECATED: This function will be made private. Call xmlInitParser to initialize the library. Initialize the XPath environment diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index 4ecf1a46..5bae726c 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -34,7 +34,6 @@ - @@ -65,7 +64,6 @@ - @@ -246,9 +244,8 @@ - - + @@ -334,6 +331,7 @@ + @@ -1328,6 +1326,8 @@ + + @@ -1463,7 +1463,6 @@ - @@ -1531,25 +1530,6 @@ - - - - - - - - - - - - - - - - - - - @@ -1661,7 +1641,6 @@ - @@ -1693,7 +1672,6 @@ - @@ -2692,7 +2670,6 @@ - @@ -3630,7 +3607,6 @@ - @@ -3663,7 +3639,6 @@ - @@ -3854,9 +3829,8 @@ - - + @@ -3942,6 +3916,7 @@ + @@ -4936,6 +4911,8 @@ + + @@ -5073,7 +5050,6 @@ - @@ -5146,27 +5122,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -5287,7 +5242,6 @@ - @@ -5331,7 +5285,6 @@ - @@ -6336,7 +6289,6 @@ - @@ -7284,16 +7236,6 @@ - - - - - - - - - - @@ -8114,7 +8056,6 @@ - @@ -8624,16 +8565,6 @@ - - - - - - - - - - @@ -8680,7 +8611,6 @@ - @@ -8719,7 +8649,6 @@ - @@ -8779,9 +8708,6 @@ - - - @@ -9187,8 +9113,6 @@ - - @@ -9227,7 +9151,6 @@ - @@ -10206,7 +10129,6 @@ - @@ -10232,7 +10154,6 @@ - @@ -10764,25 +10685,6 @@ - - - - - - - - - - - - - - - - - - - @@ -10906,7 +10808,6 @@ - @@ -10923,7 +10824,6 @@ - @@ -10946,7 +10846,6 @@ - @@ -11118,7 +11017,6 @@ - @@ -11144,10 +11042,8 @@ - - @@ -11202,7 +11098,6 @@ - @@ -12425,8 +12320,8 @@ - - + + @@ -12762,6 +12657,7 @@ + @@ -14025,7 +13921,6 @@ - @@ -14062,6 +13957,7 @@ + @@ -14481,7 +14377,6 @@ - @@ -14687,9 +14582,6 @@ - - - @@ -14933,7 +14825,23 @@ + + + + + + + + + + + + + + + + @@ -15083,7 +14991,6 @@ - @@ -15167,9 +15074,6 @@ - - - @@ -15345,8 +15249,11 @@ + + + @@ -15355,7 +15262,9 @@ + + @@ -15491,16 +15400,6 @@ - - - - - - - - - - @@ -15542,7 +15441,6 @@ - @@ -16164,7 +16062,6 @@ - @@ -16331,9 +16228,7 @@ - - @@ -16347,7 +16242,6 @@ - @@ -17080,7 +16974,6 @@ - @@ -17644,14 +17537,12 @@ - - @@ -17669,16 +17560,6 @@ - - - - - - - - - - @@ -17949,8 +17830,6 @@ - - @@ -18109,7 +17988,6 @@ - @@ -18283,9 +18161,6 @@ - - - @@ -18373,6 +18248,7 @@ + @@ -18798,9 +18674,6 @@ - - - @@ -19120,8 +18993,8 @@ + - @@ -19228,7 +19101,6 @@ - @@ -19643,7 +19515,6 @@ - @@ -19868,7 +19739,6 @@ - @@ -19918,7 +19788,6 @@ - @@ -20027,8 +19896,6 @@ - - @@ -20107,6 +19974,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -20211,8 +20107,15 @@ + + + + + + + @@ -20418,7 +20321,6 @@ - @@ -20446,10 +20348,15 @@ + + + + + @@ -20674,9 +20581,6 @@ - - - @@ -20758,9 +20662,6 @@ - - - @@ -20842,7 +20743,6 @@ - @@ -20950,7 +20850,6 @@ - @@ -21102,7 +21001,6 @@ - @@ -21122,7 +21020,6 @@ - @@ -21309,7 +21206,6 @@ - @@ -21618,6 +21514,7 @@ + @@ -21627,7 +21524,6 @@ - @@ -21678,10 +21574,6 @@ - - - - @@ -21786,7 +21678,6 @@ - @@ -22038,8 +21929,13 @@ + + + + + @@ -22050,6 +21946,8 @@ + + @@ -22278,16 +22176,11 @@ - - - - - @@ -22519,7 +22412,6 @@ - @@ -22689,8 +22581,14 @@ + + + + + + @@ -22873,7 +22771,6 @@ - @@ -22885,8 +22782,6 @@ - - @@ -22946,15 +22841,12 @@ - - - @@ -23025,12 +22917,7 @@ - - - - - @@ -23077,6 +22964,7 @@ + @@ -23154,10 +23042,6 @@ - - - - @@ -23323,38 +23207,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -23525,14 +23377,21 @@ + + + + + + + @@ -23957,8 +23816,6 @@ - - @@ -24103,6 +23960,7 @@ + @@ -24151,7 +24009,6 @@ - @@ -24248,17 +24105,25 @@ + + + + + + + + @@ -24388,7 +24253,6 @@ - @@ -24779,29 +24643,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -25086,11 +24927,27 @@ + + + + + + + + + + + + + + + + @@ -25287,6 +25144,7 @@ + @@ -25410,7 +25268,6 @@ - @@ -25493,7 +25350,14 @@ + + + + + + + @@ -25538,7 +25402,6 @@ - @@ -26043,7 +25906,6 @@ - @@ -26102,7 +25964,11 @@ + + + + @@ -26113,6 +25979,8 @@ + + @@ -26334,7 +26202,6 @@ - @@ -26649,7 +26516,6 @@ - @@ -26939,10 +26805,26 @@ + + + + + + + + + + + + + + + + @@ -27043,6 +26925,13 @@ + + + + + + + @@ -27197,7 +27086,6 @@ - @@ -27255,7 +27143,6 @@ - @@ -27716,31 +27603,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -27802,7 +27664,6 @@ - @@ -28106,8 +27967,6 @@ - - @@ -28228,8 +28087,6 @@ - - @@ -28940,7 +28797,6 @@ - @@ -29078,7 +28934,6 @@ - @@ -29212,6 +29067,7 @@ + @@ -29857,7 +29713,6 @@ - @@ -29968,7 +29823,6 @@ - @@ -30210,7 +30064,6 @@ - @@ -30482,7 +30335,6 @@ - @@ -30509,7 +30361,14 @@ + + + + + + + @@ -31051,7 +30910,14 @@ + + + + + + + @@ -31224,7 +31090,16 @@ + + + + + + + + + @@ -31465,10 +31340,6 @@ - - - - @@ -31477,7 +31348,6 @@ - @@ -31623,9 +31493,6 @@ - - - @@ -31711,6 +31578,9 @@ + + + @@ -31779,6 +31649,9 @@ + + + @@ -31919,12 +31792,19 @@ + + + + + + + @@ -31935,8 +31815,6 @@ - - diff --git a/testapi.c b/testapi.c index 54a8092b..9ab5b9bb 100644 --- a/testapi.c +++ b/testapi.c @@ -665,21 +665,6 @@ static void des_xmlOutputBufferPtr(int no ATTRIBUTE_UNUSED, xmlOutputBufferPtr v } #endif -#ifdef LIBXML_FTP_ENABLED -#define gen_nb_xmlNanoFTPCtxtPtr 4 -static void *gen_xmlNanoFTPCtxtPtr(int no, int nr ATTRIBUTE_UNUSED) { - if (no == 0) return(xmlNanoFTPNewCtxt(REMOTE2GOOD)); - if (no == 1) return(xmlNanoFTPNewCtxt(REMOTE1GOOD)); - if (no == 2) return(xmlNanoFTPNewCtxt("foo")); - return(NULL); -} -static void des_xmlNanoFTPCtxtPtr(int no ATTRIBUTE_UNUSED, void *val, int nr ATTRIBUTE_UNUSED) { - if (val != NULL) { - xmlNanoFTPFreeCtxt(val); - } -} -#endif - #ifdef LIBXML_HTTP_ENABLED #define gen_nb_xmlNanoHTTPCtxtPtr 1 static void *gen_xmlNanoHTTPCtxtPtr(int no, int nr ATTRIBUTE_UNUSED) { @@ -874,11 +859,6 @@ static void desret_xmlNanoHTTPCtxtPtr(void *val) { xmlNanoHTTPClose(val); } #endif -#ifdef LIBXML_FTP_ENABLED -static void desret_xmlNanoFTPCtxtPtr(void *val) { - xmlNanoFTPClose(val); -} -#endif /* cut and pasted from autogenerated to avoid troubles */ #define gen_nb_const_xmlChar_ptr_ptr 1 static xmlChar ** gen_const_xmlChar_ptr_ptr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { @@ -1172,7 +1152,6 @@ static void des_xmlSchemaWhitespaceValueType(int no ATTRIBUTE_UNUSED, xmlSchemaW #include #include #include -#include #include #include #include @@ -1211,7 +1190,6 @@ static int test_encoding(void); static int test_entities(void); static int test_hash(void); static int test_list(void); -static int test_nanoftp(void); static int test_nanohttp(void); static int test_parser(void); static int test_parserInternals(void); @@ -1264,7 +1242,6 @@ testlibxml2(void) test_ret += test_entities(); test_ret += test_hash(); test_ret += test_list(); - test_ret += test_nanoftp(); test_ret += test_nanohttp(); test_ret += test_parser(); test_ret += test_parserInternals(); @@ -3716,33 +3693,6 @@ test_HTMLtree(void) { return(test_ret); } -static int -test_docbDefaultSAXHandlerInit(void) { - int test_ret = 0; - -#if defined(LIBXML_DOCB_ENABLED) -#ifdef LIBXML_DOCB_ENABLED - int mem_base; - - mem_base = xmlMemBlocks(); - - docbDefaultSAXHandlerInit(); - call_tests++; - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in docbDefaultSAXHandlerInit", - xmlMemBlocks() - mem_base); - test_ret++; - printf("\n"); - } - function_tests++; -#endif -#endif - - return(test_ret); -} - - static int test_htmlDefaultSAXHandlerInit(void) { int test_ret = 0; @@ -4088,7 +4038,7 @@ static int test_xmlSAX2EndElement(void) { int test_ret = 0; -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED) #ifdef LIBXML_SAX1_ENABLED int mem_base; void * ctx; /* the user data (XML parser context) */ @@ -4653,38 +4603,6 @@ test_xmlSAX2InitDefaultSAXHandler(void) { } -static int -test_xmlSAX2InitDocbDefaultSAXHandler(void) { - int test_ret = 0; - -#if defined(LIBXML_DOCB_ENABLED) - int mem_base; - xmlSAXHandler * hdlr; /* the SAX handler */ - int n_hdlr; - - for (n_hdlr = 0;n_hdlr < gen_nb_xmlSAXHandler_ptr;n_hdlr++) { - mem_base = xmlMemBlocks(); - hdlr = gen_xmlSAXHandler_ptr(n_hdlr, 0); - - xmlSAX2InitDocbDefaultSAXHandler(hdlr); - call_tests++; - des_xmlSAXHandler_ptr(n_hdlr, hdlr, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlSAX2InitDocbDefaultSAXHandler", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_hdlr); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - static int test_xmlSAX2InitHtmlDefaultSAXHandler(void) { int test_ret = 0; @@ -5056,7 +4974,7 @@ static int test_xmlSAX2StartElement(void) { int test_ret = 0; -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_LEGACY_ENABLED) #ifdef LIBXML_SAX1_ENABLED int mem_base; void * ctx; /* the user data (XML parser context) */ @@ -5322,8 +5240,7 @@ static int test_SAX2(void) { int test_ret = 0; - if (quiet == 0) printf("Testing SAX2 : 38 of 38 functions ...\n"); - test_ret += test_docbDefaultSAXHandlerInit(); + if (quiet == 0) printf("Testing SAX2 : 36 of 36 functions ...\n"); test_ret += test_htmlDefaultSAXHandlerInit(); test_ret += test_xmlDefaultSAXHandlerInit(); test_ret += test_xmlSAX2AttributeDecl(); @@ -5346,7 +5263,6 @@ test_SAX2(void) { test_ret += test_xmlSAX2HasInternalSubset(); test_ret += test_xmlSAX2IgnorableWhitespace(); test_ret += test_xmlSAX2InitDefaultSAXHandler(); - test_ret += test_xmlSAX2InitDocbDefaultSAXHandler(); test_ret += test_xmlSAX2InitHtmlDefaultSAXHandler(); test_ret += test_xmlSAX2InternalSubset(); test_ret += test_xmlSAX2IsStandalone(); @@ -11519,569 +11435,6 @@ test_list(void) { return(test_ret); } -static int -test_xmlNanoFTPCheckResponse(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * ctx; /* an FTP context */ - int n_ctx; - - for (n_ctx = 0;n_ctx < gen_nb_xmlNanoFTPCtxtPtr;n_ctx++) { - mem_base = xmlMemBlocks(); - ctx = gen_xmlNanoFTPCtxtPtr(n_ctx, 0); - - ret_val = xmlNanoFTPCheckResponse(ctx); - desret_int(ret_val); - call_tests++; - des_xmlNanoFTPCtxtPtr(n_ctx, ctx, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPCheckResponse", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctx); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPCleanup(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - - mem_base = xmlMemBlocks(); - - xmlNanoFTPCleanup(); - call_tests++; - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPCleanup", - xmlMemBlocks() - mem_base); - test_ret++; - printf("\n"); - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPCloseConnection(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * ctx; /* an FTP context */ - int n_ctx; - - for (n_ctx = 0;n_ctx < gen_nb_xmlNanoFTPCtxtPtr;n_ctx++) { - mem_base = xmlMemBlocks(); - ctx = gen_xmlNanoFTPCtxtPtr(n_ctx, 0); - - ret_val = xmlNanoFTPCloseConnection(ctx); - desret_int(ret_val); - call_tests++; - des_xmlNanoFTPCtxtPtr(n_ctx, ctx, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPCloseConnection", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctx); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPCwd(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * ctx; /* an FTP context */ - int n_ctx; - char * directory; /* a directory on the server */ - int n_directory; - - for (n_ctx = 0;n_ctx < gen_nb_xmlNanoFTPCtxtPtr;n_ctx++) { - for (n_directory = 0;n_directory < gen_nb_const_char_ptr;n_directory++) { - mem_base = xmlMemBlocks(); - ctx = gen_xmlNanoFTPCtxtPtr(n_ctx, 0); - directory = gen_const_char_ptr(n_directory, 1); - - ret_val = xmlNanoFTPCwd(ctx, (const char *)directory); - desret_int(ret_val); - call_tests++; - des_xmlNanoFTPCtxtPtr(n_ctx, ctx, 0); - des_const_char_ptr(n_directory, (const char *)directory, 1); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPCwd", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctx); - printf(" %d", n_directory); - printf("\n"); - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPDele(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * ctx; /* an FTP context */ - int n_ctx; - const char * file; /* a file or directory on the server */ - int n_file; - - for (n_ctx = 0;n_ctx < gen_nb_xmlNanoFTPCtxtPtr;n_ctx++) { - for (n_file = 0;n_file < gen_nb_filepath;n_file++) { - mem_base = xmlMemBlocks(); - ctx = gen_xmlNanoFTPCtxtPtr(n_ctx, 0); - file = gen_filepath(n_file, 1); - - ret_val = xmlNanoFTPDele(ctx, file); - desret_int(ret_val); - call_tests++; - des_xmlNanoFTPCtxtPtr(n_ctx, ctx, 0); - des_filepath(n_file, file, 1); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPDele", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctx); - printf(" %d", n_file); - printf("\n"); - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPGet(void) { - int test_ret = 0; - - - /* missing type support */ - return(test_ret); -} - - -static int -test_xmlNanoFTPGetConnection(void) { - int test_ret = 0; - - - /* missing type support */ - return(test_ret); -} - - -static int -test_xmlNanoFTPGetResponse(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * ctx; /* an FTP context */ - int n_ctx; - - for (n_ctx = 0;n_ctx < gen_nb_xmlNanoFTPCtxtPtr;n_ctx++) { - mem_base = xmlMemBlocks(); - ctx = gen_xmlNanoFTPCtxtPtr(n_ctx, 0); - - ret_val = xmlNanoFTPGetResponse(ctx); - desret_int(ret_val); - call_tests++; - des_xmlNanoFTPCtxtPtr(n_ctx, ctx, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPGetResponse", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctx); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPGetSocket(void) { - int test_ret = 0; - - - /* missing type support */ - return(test_ret); -} - - -static int -test_xmlNanoFTPInit(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - - mem_base = xmlMemBlocks(); - - xmlNanoFTPInit(); - call_tests++; - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPInit", - xmlMemBlocks() - mem_base); - test_ret++; - printf("\n"); - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPList(void) { - int test_ret = 0; - - - /* missing type support */ - return(test_ret); -} - - -static int -test_xmlNanoFTPNewCtxt(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - void * ret_val; - const char * URL; /* The URL used to initialize the context */ - int n_URL; - - for (n_URL = 0;n_URL < gen_nb_filepath;n_URL++) { - mem_base = xmlMemBlocks(); - URL = gen_filepath(n_URL, 0); - - ret_val = xmlNanoFTPNewCtxt(URL); - desret_xmlNanoFTPCtxtPtr(ret_val); - call_tests++; - des_filepath(n_URL, URL, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPNewCtxt", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_URL); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPOpen(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - void * ret_val; - const char * URL; /* the URL to the resource */ - int n_URL; - - for (n_URL = 0;n_URL < gen_nb_filepath;n_URL++) { - mem_base = xmlMemBlocks(); - URL = gen_filepath(n_URL, 0); - - ret_val = xmlNanoFTPOpen(URL); - desret_xmlNanoFTPCtxtPtr(ret_val); - call_tests++; - des_filepath(n_URL, URL, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPOpen", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_URL); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPProxy(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - char * host; /* the proxy host name */ - int n_host; - int port; /* the proxy port */ - int n_port; - char * user; /* the proxy user name */ - int n_user; - char * passwd; /* the proxy password */ - int n_passwd; - int type; /* the type of proxy 1 for using SITE, 2 for USER a@b */ - int n_type; - - for (n_host = 0;n_host < gen_nb_const_char_ptr;n_host++) { - for (n_port = 0;n_port < gen_nb_int;n_port++) { - for (n_user = 0;n_user < gen_nb_const_char_ptr;n_user++) { - for (n_passwd = 0;n_passwd < gen_nb_const_char_ptr;n_passwd++) { - for (n_type = 0;n_type < gen_nb_int;n_type++) { - host = gen_const_char_ptr(n_host, 0); - port = gen_int(n_port, 1); - user = gen_const_char_ptr(n_user, 2); - passwd = gen_const_char_ptr(n_passwd, 3); - type = gen_int(n_type, 4); - - xmlNanoFTPProxy((const char *)host, port, (const char *)user, (const char *)passwd, type); - call_tests++; - des_const_char_ptr(n_host, (const char *)host, 0); - des_int(n_port, port, 1); - des_const_char_ptr(n_user, (const char *)user, 2); - des_const_char_ptr(n_passwd, (const char *)passwd, 3); - des_int(n_type, type, 4); - xmlResetLastError(); - } - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPQuit(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * ctx; /* an FTP context */ - int n_ctx; - - for (n_ctx = 0;n_ctx < gen_nb_xmlNanoFTPCtxtPtr;n_ctx++) { - mem_base = xmlMemBlocks(); - ctx = gen_xmlNanoFTPCtxtPtr(n_ctx, 0); - - ret_val = xmlNanoFTPQuit(ctx); - desret_int(ret_val); - call_tests++; - des_xmlNanoFTPCtxtPtr(n_ctx, ctx, 0); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPQuit", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctx); - printf("\n"); - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPRead(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * ctx; /* the FTP context */ - int n_ctx; - void * dest; /* a buffer */ - int n_dest; - int len; /* the buffer length */ - int n_len; - - for (n_ctx = 0;n_ctx < gen_nb_xmlNanoFTPCtxtPtr;n_ctx++) { - for (n_dest = 0;n_dest < gen_nb_void_ptr;n_dest++) { - for (n_len = 0;n_len < gen_nb_int;n_len++) { - mem_base = xmlMemBlocks(); - ctx = gen_xmlNanoFTPCtxtPtr(n_ctx, 0); - dest = gen_void_ptr(n_dest, 1); - len = gen_int(n_len, 2); - - ret_val = xmlNanoFTPRead(ctx, dest, len); - desret_int(ret_val); - call_tests++; - des_xmlNanoFTPCtxtPtr(n_ctx, ctx, 0); - des_void_ptr(n_dest, dest, 1); - des_int(n_len, len, 2); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPRead", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctx); - printf(" %d", n_dest); - printf(" %d", n_len); - printf("\n"); - } - } - } - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPScanProxy(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - const char * URL; /* The proxy URL used to initialize the proxy context */ - int n_URL; - - for (n_URL = 0;n_URL < gen_nb_filepath;n_URL++) { - URL = gen_filepath(n_URL, 0); - - xmlNanoFTPScanProxy(URL); - call_tests++; - des_filepath(n_URL, URL, 0); - xmlResetLastError(); - } - function_tests++; -#endif - - return(test_ret); -} - - -static int -test_xmlNanoFTPUpdateURL(void) { - int test_ret = 0; - -#if defined(LIBXML_FTP_ENABLED) - int mem_base; - int ret_val; - void * ctx; /* an FTP context */ - int n_ctx; - const char * URL; /* The URL used to update the context */ - int n_URL; - - for (n_ctx = 0;n_ctx < gen_nb_xmlNanoFTPCtxtPtr;n_ctx++) { - for (n_URL = 0;n_URL < gen_nb_filepath;n_URL++) { - mem_base = xmlMemBlocks(); - ctx = gen_xmlNanoFTPCtxtPtr(n_ctx, 0); - URL = gen_filepath(n_URL, 1); - - ret_val = xmlNanoFTPUpdateURL(ctx, URL); - desret_int(ret_val); - call_tests++; - des_xmlNanoFTPCtxtPtr(n_ctx, ctx, 0); - des_filepath(n_URL, URL, 1); - xmlResetLastError(); - if (mem_base != xmlMemBlocks()) { - printf("Leak of %d blocks found in xmlNanoFTPUpdateURL", - xmlMemBlocks() - mem_base); - test_ret++; - printf(" %d", n_ctx); - printf(" %d", n_URL); - printf("\n"); - } - } - } - function_tests++; -#endif - - return(test_ret); -} - -static int -test_nanoftp(void) { - int test_ret = 0; - - if (quiet == 0) printf("Testing nanoftp : 14 of 22 functions ...\n"); - test_ret += test_xmlNanoFTPCheckResponse(); - test_ret += test_xmlNanoFTPCleanup(); - test_ret += test_xmlNanoFTPCloseConnection(); - test_ret += test_xmlNanoFTPCwd(); - test_ret += test_xmlNanoFTPDele(); - test_ret += test_xmlNanoFTPGet(); - test_ret += test_xmlNanoFTPGetConnection(); - test_ret += test_xmlNanoFTPGetResponse(); - test_ret += test_xmlNanoFTPGetSocket(); - test_ret += test_xmlNanoFTPInit(); - test_ret += test_xmlNanoFTPList(); - test_ret += test_xmlNanoFTPNewCtxt(); - test_ret += test_xmlNanoFTPOpen(); - test_ret += test_xmlNanoFTPProxy(); - test_ret += test_xmlNanoFTPQuit(); - test_ret += test_xmlNanoFTPRead(); - test_ret += test_xmlNanoFTPScanProxy(); - test_ret += test_xmlNanoFTPUpdateURL(); - - if (test_ret != 0) - printf("Module nanoftp: %d errors\n", test_ret); - return(test_ret); -} - static int test_xmlNanoHTTPAuthHeader(void) { int test_ret = 0; @@ -23940,7 +23293,7 @@ static int test_xmlValidateNCName(void) { int test_ret = 0; -#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || 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) +#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || 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_LEGACY_ENABLED) #ifdef LIBXML_TREE_ENABLED int mem_base; int ret_val; @@ -52141,7 +51494,6 @@ test_module(const char *module) { if (!strcmp(module, "entities")) return(test_entities()); if (!strcmp(module, "hash")) return(test_hash()); if (!strcmp(module, "list")) return(test_list()); - if (!strcmp(module, "nanoftp")) return(test_nanoftp()); if (!strcmp(module, "nanohttp")) return(test_nanohttp()); if (!strcmp(module, "parser")) return(test_parser()); if (!strcmp(module, "parserInternals")) return(test_parserInternals());