From ce1b704e336b579270c38efe1c06a2b5459c388a Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Tue, 25 Feb 2025 20:09:36 +0100 Subject: [PATCH] doc: Regenerate libxml2-api.xml --- doc/libxml2-api.xml | 127 +++++++++++++++++++++++++++++++++++++------- xmllint.c | 3 +- 2 files changed, 110 insertions(+), 20 deletions(-) diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index af18f826..cebf4abd 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -554,6 +554,7 @@ + @@ -570,9 +571,7 @@ - - @@ -585,6 +584,7 @@ + @@ -796,8 +796,25 @@ 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 + + + + + + + + + + + + + + + + + @@ -3285,6 +3302,7 @@ + @@ -3723,6 +3741,18 @@ Macro. A text node in a HTML document is really implemented the same way as a text node in an XML document. + + Macro to check [0-9] + + + + Macro to check [a-zA-Z] + + + + Macro to check the following production in the XML spec: [85] BaseChar ::= ... long list see REC ... + + Macro to check the following production in the XML spec: [3] S ::= (#x20 | #x9 | #xD | #xA)+ @@ -3731,6 +3761,62 @@ Behaviour same as IS_BLANK + + Macro to check the following production in the XML spec: [2] Char ::= #x9 | #xA | #xD | [#x20...] any byte character in the accepted range + + + + Macro to check the following production in the XML spec: [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] any Unicode character, excluding the surrogate blocks, FFFE, and FFFF. + + + + Behaves like IS_CHAR on single-byte value + + + + Macro to check the following production in the XML spec: [87] CombiningChar ::= ... long list see REC ... + + + + Always false (all combining chars > 0xff) + + + + Macro to check the following production in the XML spec: [88] Digit ::= ... long list see REC ... + + + + Behaves like IS_DIGIT but with a single byte argument + + + + Macro to check the following production in the XML spec: [89] Extender ::= #x00B7 | #x02D0 | #x02D1 | #x0387 | #x0640 | #x0E46 | #x0EC6 | #x3005 | [#x3031-#x3035] | [#x309D-#x309E] | [#x30FC-#x30FE] + + + + Behaves like IS_EXTENDER but with a single-byte argument + + + + Macro to check the following production in the XML spec: [86] Ideographic ::= [#x4E00-#x9FA5] | #x3007 | [#x3021-#x3029] + + + + Macro to check the following production in the XML spec: [84] Letter ::= BaseChar | Ideographic + + + + Macro behaves like IS_LETTER, but only check base chars + + + + Macro to check the following production in the XML spec: [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%] + + + + Same as IS_PUBIDCHAR but for single-byte value + + Macro used to express that the API use the new buffers for xmlParserInputBuffer and xmlOutputBuffer. The change was introduced in 2.9.0. @@ -3791,6 +3877,9 @@ Whether the regular expressions interfaces are compiled in + + Whether the RelaxNG validation interfaces are compiled in + Whether the older SAX1 interface is configured in @@ -4872,6 +4961,7 @@ and not by parsing an instance'/> + @@ -4890,9 +4980,7 @@ crash if you try to modify the tree)'/> - - @@ -4905,6 +4993,7 @@ crash if you try to modify the tree)'/> + @@ -7611,8 +7700,8 @@ crash if you try to modify the tree)'/> - Unlink @cur and append it to the children of @parent. If @cur is a text node, it may be merged with an adjacent text node and freed. In this case the text node containing the merged content is returned. If @cur is an attribute node, it is appended to the attributes of @parent. If the attribute list contains an attribute with a name matching @elem, the old attribute is destroyed. General notes: Move operations like xmlAddChild can cause element or attribute nodes to reference namespaces that aren't declared in one of their ancestors. This can lead to use-after-free errors if the elements containing the declarations are freed later, especially when moving nodes from one document to another. You should consider calling xmlReconciliateNs after a move operation to normalize namespaces. Another option is to call xmlDOMWrapAdoptNode with the target parent before moving a node. For the most part, move operations don't check whether the resulting tree structure is valid. Users must make sure that parent nodes only receive children of valid types. Inserted child nodes must never be an ancestor of the parent node to avoid cycles in the tree structure. In general, only document, document fragments, elements and attributes should be used as parent nodes. When moving a node between documents and a memory allocation fails, the node's content will be corrupted and it will be unlinked. In this case, the node must be freed manually. Moving DTDs between documents isn't supported. - + Unlink @cur and append it to the children of @parent. If @cur is a text node, it may be merged with an adjacent text node and freed. In this case the text node containing the merged content is returned. If @cur is an attribute node, it is appended to the attributes of @parent. If the attribute list contains an attribute with a name matching @cur, the old attribute is destroyed. General notes: Move operations like xmlAddChild can cause element or attribute nodes to reference namespaces that aren't declared in one of their ancestors. This can lead to use-after-free errors if the elements containing the declarations are freed later, especially when moving nodes from one document to another. You should consider calling xmlReconciliateNs after a move operation to normalize namespaces. Another option is to call xmlDOMWrapAdoptNode with the target parent before moving a node. For the most part, move operations don't check whether the resulting tree structure is valid. Users must make sure that parent nodes only receive children of valid types. Inserted child nodes must never be an ancestor of the parent node to avoid cycles in the tree structure. In general, only document, document fragments, elements and attributes should be used as parent nodes. When moving a node between documents and a memory allocation fails, the node's content will be corrupted and it will be unlinked. In this case, the node must be freed manually. Moving DTDs between documents isn't supported. + @@ -8182,7 +8271,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_CATALOG_ENABLED) - DEPRECATED: Use XML_PARSE_NO_SYS_CATALOG and XML_PARSE_NO_CATALOG_PI. Used to get the user preference w.r.t. to what catalogs should be accepted + DEPRECATED: Use XML_PARSE_NO_SYS_CATALOG and XML_PARSE_CATALOG_PI. Used to get the user preference w.r.t. to what catalogs should be accepted @@ -8263,7 +8352,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_CATALOG_ENABLED) - DEPRECATED: Use XML_PARSE_NO_SYS_CATALOG and XML_PARSE_NO_CATALOG_PI. Used to set the user preference w.r.t. to what catalogs should be accepted + DEPRECATED: Use XML_PARSE_NO_SYS_CATALOG and XML_PARSE_CATALOG_PI. Used to set the user preference w.r.t. to what catalogs should be accepted @@ -8586,7 +8675,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_PUSH_ENABLED) - Create a parser context for using the XML parser in push mode. See xmlParseChunk. Passing an initial chunk is useless and deprecated. @filename is used as base URI to fetch external entities and for error reports. + Create a parser context for using the XML parser in push mode. See xmlParseChunk. Passing an initial chunk is useless and deprecated. The push parser doesn't support recovery mode or the XML_PARSE_NOBLANKS option. @filename is used as base URI to fetch external entities and for error reports. @@ -8707,7 +8796,7 @@ crash if you try to modify the tree)'/> - Parse an XML file from the filesystem, the network or a user-defined resource loader. + Parse an XML file from the filesystem, the network or a user-defined resource loader. This function always enables the XML_PARSE_UNZIP option for backward compatibility. This feature is potentially insecure and might be removed from later versions. @@ -8787,7 +8876,7 @@ crash if you try to modify the tree)'/> - Applies the options to the parser context. Unset options are cleared. Available since 2.13.0. With older versions, you can use xmlCtxtUseOptions. XML_PARSE_RECOVER Enable "recovery" mode which allows non-wellformed documents. How this mode behaves exactly is unspecified and may change without further notice. Use of this feature is DISCOURAGED. XML_PARSE_NOENT Despite the confusing name, this option enables substitution of entities. The resulting tree won't contain any entity reference nodes. This option also enables loading of external entities (both general and parameter entities) which is dangerous. If you process untrusted data, it's recommended to set the XML_PARSE_NO_XXE option to disable loading of external entities. XML_PARSE_DTDLOAD Enables loading of an external DTD and the loading and substitution of external parameter entities. Has no effect if XML_PARSE_NO_XXE is set. XML_PARSE_DTDATTR Adds default attributes from the DTD to the result document. Implies XML_PARSE_DTDLOAD, but loading of external content can be disabled with XML_PARSE_NO_XXE. XML_PARSE_DTDVALID This option enables DTD validation which requires to load external DTDs and external entities (both general and parameter entities) unless XML_PARSE_NO_XXE was set. XML_PARSE_NO_XXE Disables loading of external DTDs or entities. Available since 2.13.0. XML_PARSE_NOERROR Disable error and warning reports to the error handlers. Errors are still accessible with xmlCtxtGetLastError. XML_PARSE_NOWARNING Disable warning reports. XML_PARSE_PEDANTIC Enable some pedantic warnings. XML_PARSE_NOBLANKS Remove some text nodes containing only whitespace from the result document. Which nodes are removed depends on DTD element declarations or a conservative heuristic. The reindenting feature of the serialization code relies on this option to be set when parsing. Use of this option is DISCOURAGED. XML_PARSE_SAX1 Always invoke the deprecated SAX1 startElement and endElement handlers. This option is DEPRECATED. XML_PARSE_NONET Disable network access with the builtin HTTP client. XML_PARSE_NODICT Create a document without interned strings, making all strings separate memory allocations. XML_PARSE_NSCLEAN Remove redundant namespace declarations from the result document. XML_PARSE_NOCDATA Output normal text nodes instead of CDATA nodes. XML_PARSE_COMPACT Store small strings directly in the node struct to save memory. XML_PARSE_OLD10 Use old Name productions from before XML 1.0 Fifth Edition. This options is DEPRECATED. XML_PARSE_HUGE Relax some internal limits. Maximum size of text nodes, tags, comments, processing instructions, CDATA sections, entity values normal: 10M huge: 1B Maximum size of names, system literals, pubid literals normal: 50K huge: 10M Maximum nesting depth of elements normal: 256 huge: 2048 Maximum nesting depth of entities normal: 20 huge: 40 XML_PARSE_OLDSAX Enable an unspecified legacy mode for SAX parsers. This option is DEPRECATED. XML_PARSE_IGNORE_ENC Ignore the encoding in the XML declaration. This option is mostly unneeded these days. The only effect is to enforce UTF-8 decoding of ASCII-like data. XML_PARSE_BIG_LINES Enable reporting of line numbers larger than 65535. XML_PARSE_NO_UNZIP Disables input decompression. Setting this option is recommended to avoid zip bombs. Available since 2.14.0. XML_PARSE_NO_SYS_CATALOG Disables the global system XML catalog. Available since 2.14.0. XML_PARSE_NO_CATALOG_PI Ignore XML catalog processing instructions. Available since 2.14.0. + Applies the options to the parser context. Unset options are cleared. Available since 2.13.0. With older versions, you can use xmlCtxtUseOptions. XML_PARSE_RECOVER Enable "recovery" mode which allows non-wellformed documents. How this mode behaves exactly is unspecified and may change without further notice. Use of this feature is DISCOURAGED. Not supported by the push parser. XML_PARSE_NOENT Despite the confusing name, this option enables substitution of entities. The resulting tree won't contain any entity reference nodes. This option also enables loading of external entities (both general and parameter entities) which is dangerous. If you process untrusted data, it's recommended to set the XML_PARSE_NO_XXE option to disable loading of external entities. XML_PARSE_DTDLOAD Enables loading of an external DTD and the loading and substitution of external parameter entities. Has no effect if XML_PARSE_NO_XXE is set. XML_PARSE_DTDATTR Adds default attributes from the DTD to the result document. Implies XML_PARSE_DTDLOAD, but loading of external content can be disabled with XML_PARSE_NO_XXE. XML_PARSE_DTDVALID This option enables DTD validation which requires to load external DTDs and external entities (both general and parameter entities) unless XML_PARSE_NO_XXE was set. XML_PARSE_NO_XXE Disables loading of external DTDs or entities. Available since 2.13.0. XML_PARSE_NOERROR Disable error and warning reports to the error handlers. Errors are still accessible with xmlCtxtGetLastError. XML_PARSE_NOWARNING Disable warning reports. XML_PARSE_PEDANTIC Enable some pedantic warnings. XML_PARSE_NOBLANKS Remove some whitespace from the result document. Where to remove whitespace depends on DTD element declarations or a broken heuristic with unfixable bugs. Use of this option is DISCOURAGED. Not supported by the push parser. XML_PARSE_SAX1 Always invoke the deprecated SAX1 startElement and endElement handlers. This option is DEPRECATED. XML_PARSE_NONET Disable network access with the builtin HTTP client. XML_PARSE_NODICT Create a document without interned strings, making all strings separate memory allocations. XML_PARSE_NSCLEAN Remove redundant namespace declarations from the result document. XML_PARSE_NOCDATA Output normal text nodes instead of CDATA nodes. XML_PARSE_COMPACT Store small strings directly in the node struct to save memory. XML_PARSE_OLD10 Use old Name productions from before XML 1.0 Fifth Edition. This options is DEPRECATED. XML_PARSE_HUGE Relax some internal limits. Maximum size of text nodes, tags, comments, processing instructions, CDATA sections, entity values normal: 10M huge: 1B Maximum size of names, system literals, pubid literals normal: 50K huge: 10M Maximum nesting depth of elements normal: 256 huge: 2048 Maximum nesting depth of entities normal: 20 huge: 40 XML_PARSE_OLDSAX Enable an unspecified legacy mode for SAX parsers. This option is DEPRECATED. XML_PARSE_IGNORE_ENC Ignore the encoding in the XML declaration. This option is mostly unneeded these days. The only effect is to enforce UTF-8 decoding of ASCII-like data. XML_PARSE_BIG_LINES Enable reporting of line numbers larger than 65535. XML_PARSE_UNZIP Enable input decompression. Setting this option is discouraged to avoid zip bombs. Available since 2.14.0. XML_PARSE_NO_SYS_CATALOG Disables the global system XML catalog. Available since 2.14.0. XML_PARSE_CATALOG_PI Enable XML catalog processing instructions. Available since 2.14.0. @@ -10715,11 +10804,11 @@ crash if you try to modify the tree)'/> - Creates a new parser input to read from a zero-terminated string. @url is used as base to resolve external entities and for error reporting. @fd is closed after parsing has finished. Available since 2.14.0. + Creates a new parser input to read from a zero-terminated string. @url is used as base to resolve external entities and for error reporting. @fd is closed after parsing has finished. Supported @flags are XML_INPUT_UNZIP to decompress data automatically. This feature is deprecated and will be removed in a future release. Available since 2.14.0. - + DEPRECATED: Use xmlNewInputFromUrl. Create a new input stream based on a file or an URL. @@ -11284,7 +11373,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_PUSH_ENABLED) - Parse a chunk of memory in push parser mode. Assumes that the parser context was initialized with xmlCreatePushParserCtxt. The last chunk, which will often be empty, must be marked with the @terminate flag. With the default SAX callbacks, the resulting document will be available in ctxt->myDoc. This pointer will not be freed by the library. If the document isn't well-formed, ctxt->myDoc is set to NULL. The push parser doesn't support recovery mode. + Parse a chunk of memory in push parser mode. Assumes that the parser context was initialized with xmlCreatePushParserCtxt. The last chunk, which will often be empty, must be marked with the @terminate flag. With the default SAX callbacks, the resulting document will be available in ctxt->myDoc. This pointer will not be freed when calling xmlFreeParserCtxt and must be freed by the caller. If the document isn't well-formed, it will still be returned in ctxt->myDoc. As an exception, xmlCtxtResetPush will free the document in ctxt->myDoc. So ctxt->myDoc should be set to NULL after extracting the document. @@ -11865,7 +11954,7 @@ crash if you try to modify the tree)'/> - Convenience function to parse an XML file from the filesystem, the network or a global user-define resource loader. See xmlCtxtReadFile for details. + Convenience function to parse an XML file from the filesystem, the network or a global user-define resource loader. This function always enables the XML_PARSE_UNZIP option for backward compatibility. If a "-" filename is passed, it will read from stdin. Both of these features are potentially insecure and might be removed from later versions. See xmlCtxtReadFile for details. @@ -12129,7 +12218,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_REGEXP_ENABLED) - Print the content of the compiled regular expression + DEPRECATED: Don't use. No-op since 2.14.0. @@ -12907,7 +12996,7 @@ crash if you try to modify the tree)'/> - defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) + defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_DEBUG_ENABLED) Dump a Schema structure. @@ -13289,7 +13378,7 @@ crash if you try to modify the tree)'/> - + @@ -14184,7 +14273,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_READER_ENABLED) Reads the contents of an element or a text node as a string. - + diff --git a/xmllint.c b/xmllint.c index e6ebc7f0..b003288c 100644 --- a/xmllint.c +++ b/xmllint.c @@ -208,7 +208,8 @@ typedef struct { char *htmlBuf; int htmlBufLen; - xmlTime begin, end; + xmlTime begin; + xmlTime end; } xmllintState; static int xmllintMaxmem;