From 0cf25b3de2872ce07bac1e62dcdc986d07e9ec6b Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Thu, 26 Dec 2024 20:32:35 +0100 Subject: [PATCH] Regenerate docs and testapi.c --- doc/libxml2-api.xml | 424 +++++++++++++++++++++----------------------- doc/xmllint.1 | 68 +++++-- doc/xmllint.html | 37 +++- testapi.c | 328 ++++++++++++++++++++++++++++++---- 4 files changed, 579 insertions(+), 278 deletions(-) diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 2e857751..af18f826 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -11,7 +11,10 @@ + + + @@ -54,6 +57,7 @@ + @@ -697,6 +701,7 @@ + @@ -713,6 +718,8 @@ + + @@ -789,26 +796,8 @@ 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 - - - - - - - - - - - - - - - - - - @@ -837,6 +826,8 @@ + + @@ -1438,6 +1429,8 @@ + + @@ -3730,21 +3723,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. - - - 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)+ @@ -3753,62 +3731,6 @@ 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. @@ -4466,16 +4388,19 @@ + - + + + - + - - + + @@ -5754,6 +5679,7 @@ crash if you try to modify the tree)'/> + @@ -6730,6 +6656,12 @@ crash if you try to modify the tree)'/> DEPRECATED, always 0. + + DEPRECATED: Don't use. Global setting, default allocation policy for buffers, default is XML_BUFFER_ALLOC_EXACT + + + DEPRECATED: Don't use. Global setting, default buffer size. Default value is BASE_BUFFER_SIZE + DEPRECATED: This handler is unused and will be removed from future versions. Default SAX version1 handler for XML, builds the DOM tree @@ -6912,15 +6844,15 @@ crash if you try to modify the tree)'/> defined(LIBXML_HTML_ENABLED) - Checks whether an attribute is valid for an element Has full knowledge of Required and Deprecated attributes - + DEPRECATED: Don't use. + defined(LIBXML_HTML_ENABLED) - The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if the element or one of it's children would autoclose the given tag. + DEPRECATED: Internal function, don't use. The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if the element or one of it's children would autoclose the given tag. @@ -7016,9 +6948,16 @@ crash if you try to modify the tree)'/> + + defined(LIBXML_HTML_ENABLED) + Applies the options to the parser context. Unset options are cleared. Available since 2.14.0. With older versions, you can use htmlCtxtUseOptions. HTML_PARSE_RECOVER No effect as of 2.14.0. HTML_PARSE_HTML5 Make the tokenizer emit a SAX callback for each token. This results in unbalanced invocations of startElement and endElement. For now, this is only usable with custom SAX callbacks. HTML_PARSE_NODEFDTD Do not default to a doctype if none was found. HTML_PARSE_NOERROR Disable error and warning reports to the error handlers. Errors are still accessible with xmlCtxtGetLastError. HTML_PARSE_NOWARNING Disable warning reports. HTML_PARSE_PEDANTIC No effect. HTML_PARSE_NOBLANKS Remove some text nodes containing only whitespace from the result document. Which nodes are removed depends on 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. HTML_PARSE_NONET No effect. HTML_PARSE_NOIMPLIED Do not add implied html, head or body elements. HTML_PARSE_COMPACT Store small strings directly in the node struct to save memory. HTML_PARSE_HUGE Relax some internal limits. Available since 2.14.0. Use XML_PARSE_HUGE works with older versions. Maximum size of text nodes, tags, comments, CDATA sections 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 HTML_PARSE_IGNORE_ENC Ignore the encoding in the HTML declaration. This option is mostly unneeded these days. The only effect is to enforce UTF-8 decoding of ASCII-like data. HTML_PARSE_BIG_LINES Enable reporting of line numbers larger than 65535. Available since 2.14.0. + + + + defined(LIBXML_HTML_ENABLED) - Applies the options to the parser context + DEPRECATED: Use htmlCtxtSetOptions. Applies the options to the parser context. The following options are never cleared and can only be enabled: HTML_PARSE_NODEFDTD HTML_PARSE_NOERROR HTML_PARSE_NOWARNING HTML_PARSE_NOIMPLIED HTML_PARSE_COMPACT HTML_PARSE_HUGE HTML_PARSE_IGNORE_ENC HTML_PARSE_BIG_LINES @@ -7071,15 +7010,15 @@ crash if you try to modify the tree)'/> defined(LIBXML_HTML_ENABLED) - Checks whether an HTML element may be a direct child of a parent element. Note - doesn't check for deprecated elements - + DEPRECATED: Don't use. + defined(LIBXML_HTML_ENABLED) - Checks whether an HTML element may be a direct child of a parent element. and if so whether it is valid or deprecated. - + DEPRECATED: Don't use. + @@ -7130,14 +7069,14 @@ crash if you try to modify the tree)'/> defined(LIBXML_HTML_ENABLED) - The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if a tag is autoclosed by one of it's child + DEPRECATED: Internal function, don't use. The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if a tag is autoclosed by one of it's child defined(LIBXML_HTML_ENABLED) - Determine if a given attribute is a boolean attribute. + DEPRECATED: Internal function, don't use. Determine if a given attribute is a boolean attribute. @@ -7220,15 +7159,15 @@ crash if you try to modify the tree)'/> defined(LIBXML_HTML_ENABLED) - Checks whether the tree node is valid. Experimental (the author only uses the HTML enhancements in a SAX parser) - + DEPRECATED: Don't use. + defined(LIBXML_HTML_ENABLED) - DEPRECATED: Internal function, don't use. parse Reference declarations [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' - + DEPRECATED: Internal function, don't use. + @@ -7261,8 +7200,8 @@ crash if you try to modify the tree)'/> defined(LIBXML_HTML_ENABLED) - DEPRECATED: Internal function, don't use. parse an HTML ENTITY references [68] EntityRef ::= '&' Name ';' - + DEPRECATED: Internal function, don't use. + @@ -7659,7 +7598,7 @@ crash if you try to modify the tree)'/> - Register a new attribute declaration Note that @tree becomes the ownership of the DTD + DEPRECATED: Internal function, don't use. Register a new attribute declaration Note that @tree becomes the ownership of the DTD @@ -7704,7 +7643,7 @@ crash if you try to modify the tree)'/> - Register a new element declaration + DEPRECATED: Internal function, don't use. Register a new element declaration @@ -7751,7 +7690,7 @@ crash if you try to modify the tree)'/> - Register a new notation declaration + DEPRECATED: Internal function, don't use. Register a new notation declaration @@ -7781,12 +7720,12 @@ crash if you try to modify the tree)'/> defined(LIBXML_OUTPUT_ENABLED) - Create a buffered parser output + Create a buffered parser output Consumes @encoder even in error case. - Create a buffered parser input for progressive parsing. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. + DEPRECATED: Use xmlNewInputFrom*. Create a buffered parser input for progressive parsing. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. @@ -7982,7 +7921,7 @@ crash if you try to modify the tree)'/> - Remove the beginning of an XML buffer. NOTE that this routine behaviour differs from xmlBufferShrink() as it will return 0 on error instead of -1 due to size_t being used as the return type. + DEPRECATED: Don't use. Remove the beginning of an XML buffer. NOTE that this routine behaviour differs from xmlBufferShrink() as it will return 0 on error instead of -1 due to size_t being used as the return type. @@ -7992,115 +7931,115 @@ crash if you try to modify the tree)'/> - + Add a string range to an XML buffer. if len == -1, the length of str is recomputed. - + - + Add a string range to the beginning of an XML buffer. if len == -1, the length of @str is recomputed. - + - + Append a zero terminated C string to an XML buffer. - + Append a zero terminated string to an XML buffer. - + Function to extract the content of a buffer - + routine to create an XML buffer. - + routine to create an XML buffer. - + - + Remove the string contained in a buffer and gie it back to the caller. The buffer is reset to an empty content. This doesn't work with immutable buffers as they can't be reset. - + Dumps an XML buffer to a FILE *. - + empty a buffer. - + Frees an XML buffer. It frees both the content and the structure which encapsulate it. - - Grow the available space of an XML buffer. + + DEPRECATED: Don't use. Grow the available space of an XML buffer. - + Function to get the length of a buffer - - Resize a buffer to accommodate minimum size of @size. + + DEPRECATED: Don't use. Resize a buffer to accommodate minimum size of @size. - - Sets the allocation scheme for this buffer + + Sets the allocation scheme for this buffer. For libxml2 before 2.14, it is recommended to set this to XML_BUFFER_ALLOC_DOUBLE_IT. Has no effect on 2.14 or later. - - Remove the beginning of an XML buffer. + + DEPRECATED: Don't use. Remove the beginning of an XML buffer. - + routine which manages and grows an output buffer. This one adds xmlChars at the end of the buffer. - + routine which manage and grows an output buffer. This one add C chars at the end of the array. - + routine which manage and grows an output buffer. This one writes a quoted or double quoted #xmlChar string, checking first if it holds quote or double-quotes internally @@ -8141,7 +8080,7 @@ crash if you try to modify the tree)'/> - This function provides the current index of the parser relative to the start of the current entity. This function is computed in bytes from the beginning starting at zero and finishing at the size in byte of the file if parsing a file. The function is of constant cost if the input is UTF-8 but can be costly if run on non-UTF-8 input. + DEPRECATED: Don't use. This function provides the current index of the parser relative to the start of the current entity. This function is computed in bytes from the beginning starting at zero and finishing at the size in byte of the file if parsing a file. The function is of constant cost if the input is UTF-8 but can be costly if run on non-UTF-8 input. @@ -8426,7 +8365,7 @@ crash if you try to modify the tree)'/> Check whether thread-local storage could be allocated. In cross-platform code running in multithreaded environments, this function should be called once in each thread before calling other library functions to make sure that thread-local storage was allocated properly. - + Checks @utf for being valid UTF-8. @utf is assumed to be null-terminated. This function is not super-strict, as it will allow longer UTF-8 sequences than necessary. Note that Java is capable of producing these sequences if provoked. Also note, this routine checks for the 4-byte maximum size, but does not check for 0x10ffff maximum value. @@ -8464,7 +8403,7 @@ crash if you try to modify the tree)'/> - This function name is somewhat misleading. It does not clean up parser state, it cleans up memory allocated by the library itself. It is a cleanup function for the XML library. It tries to reclaim all related global memory allocated for the library processing. It doesn't deallocate any document related memory. One should call xmlCleanupParser() only when the process has finished using the library and all XML/HTML documents built with it. See also xmlInitParser() which has the opposite function of preparing the library for operations. 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 ! + This function is named somewhat misleadingly. It does not clean up parser state but global memory allocated by the library itself. Since 2.9.11, cleanup is performed automatically if a shared or dynamic libxml2 library is unloaded. This function should only be used to avoid false positives from memory leak checkers in static builds. WARNING: xmlCleanupParser assumes that all other threads that called libxml2 functions have terminated. No library calls must be made after calling this function. In general, THIS FUNCTION SHOULD ONLY BE CALLED RIGHT BEFORE THE WHOLE PROCESS EXITS. @@ -8488,7 +8427,7 @@ crash if you try to modify the tree)'/> - Build a copy of an attribute table. + DEPRECATED: Internal function, don't use. Build a copy of an attribute table. @@ -8500,7 +8439,7 @@ crash if you try to modify the tree)'/> - append the char value in the array + DEPRECATED: Internal function, don't use. append the char value in the array @@ -8512,7 +8451,7 @@ crash if you try to modify the tree)'/> - Build a copy of an element content description. + DEPRECATED: Internal function, don't use. Build a copy of an element content description. @@ -8523,12 +8462,12 @@ crash if you try to modify the tree)'/> - Build a copy of an element content description. Deprecated, use xmlCopyDocElementContent instead + DEPRECATED: Internal function, don't use. Build a copy of an element content description. Deprecated, use xmlCopyDocElementContent instead - Build a copy of an element table. + DEPRECATED: Internal function, don't use. Build a copy of an element table. @@ -8538,7 +8477,7 @@ crash if you try to modify the tree)'/> - Copy an enumeration attribute node (recursive). + DEPRECATED: Internal function, don't use. Copy an enumeration attribute node (recursive). @@ -8570,7 +8509,7 @@ crash if you try to modify the tree)'/> - Build a copy of a notation table. + DEPRECATED: Internal function, don't use. Build a copy of a notation table. @@ -8612,7 +8551,7 @@ crash if you try to modify the tree)'/> - create and initialize an enumeration attribute node. + DEPRECATED: Internal function, don't use. create and initialize an enumeration attribute node. @@ -8671,19 +8610,19 @@ crash if you try to modify the tree)'/> - ctxt: parser context Available since 2.14.0. + Available since 2.14.0. - + - ctxt: parser context Available since 2.14.0. + Available since 2.14.0. - + - ctxt: parser context Available since 2.14.0. + Available since 2.14.0. - + Get the last parsing error registered. @@ -8696,14 +8635,14 @@ crash if you try to modify the tree)'/> - ctxt: parser context Available since 2.14.0. + Available since 2.14.0. - + - ctxt: parser context Available since 2.14.0. + Available since 2.14.0. - + Get well-formedness and validation status after parsing. Also reports catastrophic errors which are not related to parsing like out-of-memory, I/O or other errors. Available since 2.14.0. @@ -8711,9 +8650,9 @@ crash if you try to modify the tree)'/> - ctxt: parser context Available since 2.14.0. + Available since 2.14.0. - + Parse a well-balanced chunk of XML matching the 'content' production. Namespaces in scope of @node and entities of @node's document are recognized. When validating, the DTD of @node's document is used. Always consumes @input even in error case. Available since 2.14.0. @@ -8729,6 +8668,26 @@ crash if you try to modify the tree)'/> + + defined(LIBXML_VALID_ENABLED) + Parse a DTD. Option XML_PARSE_DTDLOAD should be enabled in the parser context to make external entities work. Availabe since 2.14.0. + + + + + + + + Pops the top parser input from the input stack + + + + + Pushes a new parser input on top of the input stack + + + + Parse an XML in-memory document and build a tree. @URL is used as base to resolve external entities and for error reporting. See xmlCtxtUseOptions for details. @@ -8796,10 +8755,10 @@ crash if you try to modify the tree)'/> - ctxt: parser context catalogs: catalogs pointer Available since 2.14.0. Set the local catalogs. + Available since 2.14.0. Set the local catalogs. - - + + Installs a custom implementation to convert between character encodings. This bypasses legacy feature like global encoding handlers or encoding aliases. Available since 2.14.0. @@ -8809,10 +8768,10 @@ crash if you try to modify the tree)'/> - ctxt: parser context dict: dictionary Available since 2.14.0. Set the dictionary. This should only be done immediately after creating a parser context. + Available since 2.14.0. Set the dictionary. This should only be done immediately after creating a parser context. - - + + Register a callback function that will be called on errors and warnings. If handler is NULL, the error handler will be deactivated. This is the recommended way to collect errors from the parser and takes precedence over all other error reporting mechanisms. These are (in order of precedence): - per-context structured handler (xmlCtxtSetErrorHandler) - per-context structured "serror" SAX handler - global structured handler (xmlSetStructuredErrorFunc) - per-context generic "error" and "warning" SAX handlers - global generic handler (xmlSetGenericErrorFunc) - print to stderr Available since 2.13.0. @@ -8828,16 +8787,16 @@ 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. 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. 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. - ctxt: parser context priv: private application data Available since 2.14.0. Set the private application data. + Available since 2.14.0. Set the private application data. - - + + Installs a custom callback to load documents, DTDs or external entities. Available since 2.14.0. @@ -8852,6 +8811,21 @@ crash if you try to modify the tree)'/> + + defined(LIBXML_VALID_ENABLED) + Validate a document. Like xmlValidateDocument but uses the parser context's error handler. Option XML_PARSE_DTDLOAD should be enabled in the parser context to make external entities work. Availabe since 2.14.0. + + + + + + defined(LIBXML_VALID_ENABLED) + Validate a document against a DTD. Like xmlValidateDtd but uses the parser context's error handler. Availabe since 2.14.0. + + + + + DEPRECATED: Internal function, do not use. The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. Implement the end of line normalization: 2.11 End-of-Line Handling Wherever an external parsed entity or the literal entity value of an internal parsed entity contains either the literal two-character sequence "#xD#xA" or a standalone literal #xD, an XML processor must pass to the application the single character #xA. This behavior can conveniently be produced by normalizing all line breaks to #xA on input, before parsing.) @@ -9225,15 +9199,15 @@ crash if you try to modify the tree)'/> - Do a global encoding of a string, replacing the predefined entities and non ASCII values with their entities and CharRef counterparts. Contrary to xmlEncodeEntities, this routine is reentrant, and result must be deallocated. + Do a global encoding of a string, replacing the predefined entities and non ASCII values with their entities and CharRef counterparts. Contrary to xmlEncodeEntities, this routine is reentrant, and result must be deallocated. This escapes '<', '>', '&' and '\r'. If the document has no encoding, non-ASCII codepoints are escaped. There is some special handling for HTML documents. - Do a global encoding of a string, replacing the predefined entities this routine is reentrant, and result must be deallocated. + Do a global encoding of a string, replacing the predefined entities this routine is reentrant, and result must be deallocated. This escapes '<', '>', '&', '"' and '\r' chars. - + @@ -9283,7 +9257,7 @@ crash if you try to modify the tree)'/> - Deallocate the memory used by an entities hash table. + DEPRECATED: Internal function, don't use. Deallocate the memory used by an entities hash table. @@ -9305,7 +9279,7 @@ crash if you try to modify the tree)'/> - Free an element content structure. The whole subtree is removed. + DEPRECATED: Internal function, don't use. Free an element content structure. The whole subtree is removed. @@ -9316,12 +9290,12 @@ crash if you try to modify the tree)'/> - Free an element content structure. The whole subtree is removed. Deprecated, use xmlFreeDocElementContent instead + DEPRECATED: Internal function, don't use. Free an element content structure. The whole subtree is removed. Deprecated, use xmlFreeDocElementContent instead - Deallocate the memory used by an element hash table. + DEPRECATED: Internal function, don't use. Deallocate the memory used by an element hash table. @@ -9371,7 +9345,7 @@ crash if you try to modify the tree)'/> - Deallocate the memory used by an entities hash table. + DEPRECATED: Internal function, don't use. Deallocate the memory used by an entities hash table. @@ -9457,7 +9431,7 @@ crash if you try to modify the tree)'/> - Provides the memory access functions set currently in use The mallocAtomicFunc is specialized for atomic block allocations (i.e. of areas useful for garbage collected memory allocators + DEPRECATED: xmlMemGet. Provides the memory access functions set currently in use The mallocAtomicFunc is specialized for atomic block allocations (i.e. of areas useful for garbage collected memory allocators @@ -9466,7 +9440,7 @@ crash if you try to modify the tree)'/> - Override the default memory access functions with a new set This has to be called before any other libxml routines ! The mallocAtomicFunc is specialized for atomic block allocations (i.e. of areas useful for garbage collected memory allocators Should this be blocked if there was already some allocations done ? + DEPRECATED: Use xmlMemSetup. Override the default memory access functions with a new set This has to be called before any other libxml routines ! The mallocAtomicFunc is specialized for atomic block allocations (i.e. of areas useful for garbage collected memory allocators Should this be blocked if there was already some allocations done ? @@ -9481,8 +9455,8 @@ crash if you try to modify the tree)'/> - - Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance XML_BUFFER_ALLOC_HYBRID - use exact sizes on small strings to keep memory usage tight in normal usage, and doubleit on large strings to avoid pathological performance. + + DEPRECATED: Use xmlBufferSetAllocationScheme. Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance XML_BUFFER_ALLOC_HYBRID - use exact sizes on small strings to keep memory usage tight in normal usage, and doubleit on large strings to avoid pathological performance. @@ -9955,7 +9929,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_VALID_ENABLED) - Load and parse a DTD + DEPRECATED: Use xmlCtxtParseDtd. Load and parse a DTD @@ -9979,7 +9953,7 @@ crash if you try to modify the tree)'/> - Initialization function for the XML parser. Call once from the main thread before using the library in multithreaded programs. + Initialization function for the XML parser. For older versions, it's recommended to call this function once from the main thread before using the library in multithreaded programs. Since 2.14.0, there's no distinction between threads. It should be unnecessary to call this function. @@ -10641,7 +10615,7 @@ crash if you try to modify the tree)'/> - Allocate an element content structure for the document. + DEPRECATED: Internal function, don't use. Allocate an element content structure for the document. @@ -10712,7 +10686,7 @@ crash if you try to modify the tree)'/> - Allocate an element content structure. Deprecated in favor of xmlNewDocElementContent + DEPRECATED: Internal function, don't use. Allocate an element content structure. Deprecated in favor of xmlNewDocElementContent @@ -11045,17 +11019,17 @@ crash if you try to modify the tree)'/> - Serializes attribute children (text and entity reference nodes) into a string. An empty list produces an empty string. If @inLine is true, entity references will be substituted. Otherwise, entity references will be kept and special characters like '&' will be escaped. + Serializes attribute children (text and entity reference nodes) into a string. If @inLine is true, entity references will be substituted. Otherwise, entity references will be kept and special characters like '&' will be escaped. - + - Serializes attribute children (text and entity reference nodes) into a string. An empty list produces an empty string. If @inLine is true, entity references will be substituted. Otherwise, entity references will be kept and special characters like '&' as well as non-ASCII chars will be escaped. See xmlNodeListGetRawString for an alternative option. + Serializes attribute children (text and entity reference nodes) into a string. If @inLine is true, entity references will be substituted. Otherwise, entity references will be kept and special characters like '&' as well as non-ASCII chars will be escaped. See xmlNodeListGetRawString for an alternative option. - + @@ -11120,28 +11094,28 @@ crash if you try to modify the tree)'/> defined(LIBXML_OUTPUT_ENABLED) - Create a buffered output for the progressive saving to a xmlBuffer + Create a buffered output for the progressive saving to a xmlBuffer Consumes @encoder even in error case. defined(LIBXML_OUTPUT_ENABLED) - Create a buffered output for the progressive saving to a file descriptor + Create a buffered output for the progressive saving to a file descriptor Consumes @encoder even in error case. defined(LIBXML_OUTPUT_ENABLED) - Create a buffered output for the progressive saving to a FILE * buffered C I/O + Create a buffered output for the progressive saving to a FILE * buffered C I/O Consumes @encoder even in error case. defined(LIBXML_OUTPUT_ENABLED) - Create a buffered output for the progressive saving of a file If filename is "-' then we use stdout as the output. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. TODO: currently if compression is set, the library only support writing to a local file. + Create a buffered output for the progressive saving of a file If filename is "-' then we use stdout as the output. Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. TODO: currently if compression is set, the library only support writing to a local file. Consumes @encoder even in error case. @@ -11161,7 +11135,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_OUTPUT_ENABLED) - Create a buffered output for the progressive saving to an I/O handler + Create a buffered output for the progressive saving to an I/O handler Consumes @encoder even in error case. @@ -11192,7 +11166,7 @@ crash if you try to modify the tree)'/> - + defined(LIBXML_OUTPUT_ENABLED) @@ -11443,7 +11417,7 @@ crash if you try to modify the tree)'/> - parse a general parsed entity An external general parsed entity is well-formed if it matches the production labeled extParsedEnt. [78] extParsedEnt ::= TextDecl? content + DEPRECATED: Internal function, don't use. parse a general parsed entity An external general parsed entity is well-formed if it matches the production labeled extParsedEnt. [78] extParsedEnt ::= TextDecl? content @@ -11467,7 +11441,7 @@ crash if you try to modify the tree)'/> - parse Markup declarations from an external subset [30] extSubset ::= textDecl? extSubsetDecl [31] extSubsetDecl ::= (markupdecl | conditionalSect | PEReference | S) * + DEPRECATED: Internal function, don't use. parse Markup declarations from an external subset [30] extSubset ::= textDecl? extSubsetDecl [31] extSubsetDecl ::= (markupdecl | conditionalSect | PEReference | S) * @@ -11645,19 +11619,19 @@ crash if you try to modify the tree)'/> - Create a buffered parser input for the progressive parsing for the input from a file descriptor The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. + DEPRECATED: Use xmlNewInputFromFd. Create a buffered parser input for the progressive parsing for the input from a file descriptor The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. - Create a buffered parser input for the progressive parsing of a FILE * buffered C I/O The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. + DEPRECATED: Don't use. Create a buffered parser input for the progressive parsing of a FILE * buffered C I/O The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. - Create a buffered parser input for the progressive parsing of a file Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. Do an encoding check if enc == XML_CHAR_ENCODING_NONE + DEPRECATED: Use xmlNewInputFromUrl. Create a buffered parser input for the progressive parsing of a file Automatic support for ZLIB/Compress compressed document is provided by default if found at compile-time. Do an encoding check if enc == XML_CHAR_ENCODING_NONE @@ -11674,7 +11648,7 @@ crash if you try to modify the tree)'/> - Create a buffered parser input for the progressive parsing for the input from an I/O handler The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. + DEPRECATED: Use xmlNewInputFromIO. Create a buffered parser input for the progressive parsing for the input from an I/O handler The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. @@ -11682,34 +11656,34 @@ crash if you try to modify the tree)'/> - Create a parser input buffer for parsing from a memory area. This function makes a copy of the whole input buffer. If you are sure that the contents of the buffer will remain valid until the document was parsed, you can avoid the copy by using xmlParserInputBufferCreateStatic. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. + DEPRECATED: Use xmlNewInputFromMemory. Create a parser input buffer for parsing from a memory area. This function makes a copy of the whole input buffer. If you are sure that the contents of the buffer will remain valid until the document was parsed, you can avoid the copy by using xmlParserInputBufferCreateStatic. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. - Create a parser input buffer for parsing from a memory area. This functions assumes that the contents of the input buffer remain valid until the document was parsed. Use xmlParserInputBufferCreateMem otherwise. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. + DEPRECATED: Use xmlNewInputFromMemory. Create a parser input buffer for parsing from a memory area. This functions assumes that the contents of the input buffer remain valid until the document was parsed. Use xmlParserInputBufferCreateMem otherwise. The encoding argument is deprecated and should be set to XML_CHAR_ENCODING_NONE. The encoding can be changed with xmlSwitchEncoding or xmlSwitchEncodingName later on. - Grow up the content of the input buffer, the old data are preserved This routine handle the I18N transcoding to internal UTF-8 This routine is used when operating the parser in normal (pull) mode TODO: one should be able to remove one extra copy by copying directly onto in->buffer or in->raw + DEPRECATED: Internal function, don't use. Grow up the content of the input buffer, the old data are preserved This routine handle the I18N transcoding to internal UTF-8 This routine is used when operating the parser in normal (pull) mode - Push the content of the arry in the input buffer This routine handle the I18N transcoding to internal UTF-8 This is used when operating the parser in progressive (push) mode. + DEPRECATED: Internal function, don't use. Push the content of the arry in the input buffer This routine handle the I18N transcoding to internal UTF-8 This is used when operating the parser in progressive (push) mode. - Refresh the content of the input buffer, the old data are considered consumed This routine handle the I18N transcoding to internal UTF-8 + DEPRECATED: Internal function, don't use. Same as xmlParserInputBufferGrow. @@ -11834,7 +11808,7 @@ crash if you try to modify the tree)'/> - xmlPopInput: the current input pointed by ctxt->input came to an end pop it and return the next char. + DEPRECATED: Internal function, don't use. @@ -11859,7 +11833,7 @@ crash if you try to modify the tree)'/> - Push an input stream onto the stack. + DEPRECATED: Internal function, don't use. Push an input stream onto the stack. @@ -12669,7 +12643,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_VALID_ENABLED) - DEPRECATED: Don't use. Load and parse an external subset. + DEPRECATED: Use xmlCtxtParseDtd. Load and parse an external subset. @@ -12825,14 +12799,14 @@ crash if you try to modify the tree)'/> defined(LIBXML_OUTPUT_ENABLED) - Set a custom escaping function to be used for text in attribute content + DEPRECATED: Don't use. Has no effect. defined(LIBXML_OUTPUT_ENABLED) - Set a custom escaping function to be used for text in element content + DEPRECATED: Don't use. Set a custom escaping function to be used for text in element content @@ -13468,8 +13442,8 @@ crash if you try to modify the tree)'/> - - Set the buffer allocation method. Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance + + DEPRECATED: Use xmlBufferSetAllocationScheme. Set the buffer allocation method. Types are XML_BUFFER_ALLOC_EXACT - use exact sizes, keeps memory usage down XML_BUFFER_ALLOC_DOUBLEIT - double buffer when extra needed, improves performance @@ -13548,7 +13522,7 @@ crash if you try to modify the tree)'/> - This will dump the content of the element content definition Intended just for the debug routine + DEPRECATED: Internal function, don't use. This will dump the content of the element content definition Intended just for the debug routine @@ -13576,7 +13550,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_OUTPUT_ENABLED) - Deprecated, unsafe, use xmlSnprintfElementContent + DEPRECATED: Internal function, don't use. Deprecated, unsafe, use xmlSnprintfElementContent @@ -13849,7 +13823,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_READER_ENABLED) - This function provides the current index of the parser used by the reader, relative to the start of the current entity. This function actually just wraps a call to xmlBytesConsumed() for the parser context associated with the reader. See xmlBytesConsumed() for more information. + DEPRECATED: The returned value is mostly random and useless. It reflects the parser reading ahead and is in no way related to the current node. This function provides the current index of the parser used by the reader, relative to the start of the current entity. This function actually just wraps a call to xmlBytesConsumed() for the parser context associated with the reader. See xmlBytesConsumed() for more information. @@ -16174,9 +16148,9 @@ crash if you try to modify the tree)'/> defined(LIBXML_VALID_ENABLED) - Try to validate the document instance basically it does the all the checks described by the XML Rec i.e. validates the internal and external subset (if present) and validate the document tree. + DEPRECATED: This function can't report malloc or other failures. Use xmlCtxtValidateDocument. Try to validate the document instance basically it does the all the checks described by the XML Rec i.e. validates the internal and external subset (if present) and validate the document tree. - + @@ -16718,7 +16692,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_XPATH_ENABLED) - Parse and evaluate an XPath expression in the given context, then push the result on the context stack + DEPRECATED: Internal function, don't use. Parse and evaluate an XPath expression in the given context, then push the result on the context stack @@ -17275,7 +17249,7 @@ crash if you try to modify the tree)'/> defined(LIBXML_XPATH_ENABLED) - Registers all default XPath functions in this context + DEPRECATED: No-op since 2.14.0. Registers all default XPath functions in this context diff --git a/doc/xmllint.1 b/doc/xmllint.1 index 855fef3f..2e69cffb 100644 --- a/doc/xmllint.1 +++ b/doc/xmllint.1 @@ -2,12 +2,12 @@ .\" Title: xmllint .\" Author: John Fleck .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/12/2024 +.\" Date: 12/26/2024 .\" Manual: xmllint Manual .\" Source: libxml2 .\" Language: English .\" -.TH "XMLLINT" "1" "06/12/2024" "libxml2" "xmllint Manual" +.TH "XMLLINT" "1" "12/26/2024" "libxml2" "xmllint Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,9 +31,7 @@ xmllint \- command line XML tool .SH "SYNOPSIS" .HP \w'\fBxmllint\fR\ 'u -\fBxmllint\fR [\fB\-\-version\fR | \fB\-\-debug\fR | \fB\-\-quiet\fR | \fB\-\-shell\fR | \fB\-\-xpath\ "\fR\fB\fIXPath_expression\fR\fR\fB"\fR | \fB\-\-debugent\fR | \fB\-\-copy\fR | \fB\-\-recover\fR | \fB\-\-nodict\fR | \fB\-\-noent\fR | \fB\-\-noout\fR | \fB\-\-nonet\fR | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR | \fB\-\-load\-trace\fR | \fB\-\-htmlout\fR | \fB\-\-nowrap\fR | \fB\-\-valid\fR | \fB\-\-postvalid\fR | \fB\-\-dtdvalid\ \fR\fB\fIURL\fR\fR | \fB\-\-dtdvalidfpi\ \fR\fB\fIFPI\fR\fR | \fB\-\-timing\fR | \fB\-\-output\ \fR\fB\fIFILE\fR\fR | \fB\-\-repeat\fR | \fB\-\-insert\fR | \fB\-\-compress\fR | \fB\-\-html\fR | \fB\-\-xmlout\fR | \fB\-\-push\fR | \fB\-\-memory\fR | \fB\-\-max\-ampl\ \fR\fB\fIINTEGER\fR\fR | \fB\-\-maxmem\ \fR\fB\fINBBYTES\fR\fR | \fB\-\-nowarning\fR | \fB\-\-noblanks\fR | \fB\-\-nocdata\fR | \fB\-\-format\fR | \fB\-\-encode\ \fR\fB\fIENCODING\fR\fR | \fB\-\-dropdtd\fR | \fB\-\-nsclean\fR | \fB\-\-testIO\fR | \fB\-\-catalogs\fR | \fB\-\-nocatalogs\fR | \fB\-\-auto\fR | \fB\-\-xinclude\fR | \fB\-\-noxincludenode\fR | \fB\-\-loaddtd\fR | \fB\-\-dtdattr\fR | \fB\-\-stream\fR | \fB\-\-walker\fR | \fB\-\-pattern\ \fR\fB\fIPATTERNVALUE\fR\fR | \fB\-\-relaxng\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-schema\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-c14n\fR | \fB\-\-pedantic\fR] {\fIXML\-FILE(S)\fR... | \-} -.HP \w'\fBxmllint\fR\ 'u -\fBxmllint\fR \fB\-\-help\fR +\fBxmllint\fR [\fB\-\-version\fR | \fB\-\-debug\fR | \fB\-\-quiet\fR | \fB\-\-shell\fR | \fB\-\-xpath\ "\fR\fB\fIXPath_expression\fR\fR\fB"\fR | \fB\-\-debugent\fR | \fB\-\-copy\fR | \fB\-\-recover\fR | \fB\-\-huge\fR | \fB\-\-nocompact\fR | \fB\-\-nodefdtd\fR | \fB\-\-nodict\fR | \fB\-\-noenc\fR | \fB\-\-noent\fR | \fB\-\-nofixup\-base\-uris\fR | \fB\-\-noout\fR | \fB\-\-nonet\fR | \fB\-\-path\ "\fR\fB\fIPATH(S)\fR\fR\fB"\fR | \fB\-\-load\-trace\fR | \fB\-\-htmlout\fR | \fB\-\-nowrap\fR | \fB\-\-valid\fR | \fB\-\-postvalid\fR | \fB\-\-dtdvalid\ \fR\fB\fIURL\fR\fR | \fB\-\-dtdvalidfpi\ \fR\fB\fIFPI\fR\fR | \fB\-\-timing\fR | \fB\-\-output\ \fR\fB\fIFILE\fR\fR | \fB\-\-repeat\fR | \fB\-\-insert\fR | \fB\-\-compress\fR | \fB\-\-html\fR | \fB\-\-xmlout\fR | \fB\-\-push\fR | \fB\-\-memory\fR | \fB\-\-max\-ampl\ \fR\fB\fIINTEGER\fR\fR | \fB\-\-maxmem\ \fR\fB\fINBBYTES\fR\fR | \fB\-\-nowarning\fR | \fB\-\-noblanks\fR | \fB\-\-nocdata\fR | \fB\-\-format\fR | \fB\-\-pretty\ \fR\fB\fIINTEGER\fR\fR | \fB\-\-encode\ \fR\fB\fIENCODING\fR\fR | \fB\-\-dropdtd\fR | \fB\-\-nsclean\fR | \fB\-\-testIO\fR | \fB\-\-catalogs\fR | \fB\-\-nocatalogs\fR | \fB\-\-auto\fR | \fB\-\-xinclude\fR | \fB\-\-noxincludenode\fR | \fB\-\-loaddtd\fR | \fB\-\-dtdattr\fR | \fB\-\-stream\fR | \fB\-\-walker\fR | \fB\-\-pattern\ \fR\fB\fIPATTERNVALUE\fR\fR | \fB\-\-relaxng\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-schema\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-schematron\ \fR\fB\fISCHEMA\fR\fR | \fB\-\-c14n\fR | \fB\-\-c14n11\fR | \fB\-\-exc\-c14n\fR | \fB\-\-pedantic\fR | \fB\-\-sax\fR | \fB\-\-sax1\fR | \fB\-\-oldxml10\fR] {\fIXML\-FILE(S)\fR... | \-} .SH "DESCRIPTION" .PP The @@ -89,7 +87,7 @@ compression of output\&. Test the internal copy implementation\&. .RE .PP -\fB\-\-c14n\fR +\fB\-\-c14n\fR, \fB\-\-c14n11\fR, \fB\-\-exc\-c14n\fR .RS 4 Use the W3C XML @@ -151,12 +149,6 @@ Reformat and reindent the output\&. The environment variable controls the indentation\&. The default value is two spaces " ")\&. .RE .PP -\fB\-\-help\fR -.RS 4 -Print out a short usage summary for -\fBxmllint\fR\&. -.RE -.PP \fB\-\-html\fR .RS 4 Use the @@ -175,6 +167,11 @@ HTML tags surrounding the result tree output so the results can be displayed/viewed in a browser\&. .RE .PP +\fB\-\-huge\fR +.RS 4 +Ignore some hardcoded parser limits\&. +.RE +.PP \fB\-\-insert\fR .RS 4 Test for valid insertions\&. @@ -226,11 +223,26 @@ Do not use any catalogs\&. Substitute CDATA section by equivalent text nodes\&. .RE .PP +\fB\-\-nocompact\fR +.RS 4 +Do not generate compact text nodes (parser option XML_PARSE_COMPACT)\&. Only for debugging\&. +.RE +.PP +\fB\-\-nodefdtd\fR +.RS 4 +Do not set default HTML doctype (parser option HTML_PARSE_NODEFDTD)\&. +.RE +.PP \fB\-\-nodict\fR .RS 4 Don\*(Aqt use dictionaries (parser option XML_PARSE_NODICT)\&. Only for debugging\&. .RE .PP +\fB\-\-noenc\fR +.RS 4 +Ignore encoding declaration (parser option XML_PARSE_IGNORE_ENC)\&. +.RE +.PP \fB\-\-noent\fR .RS 4 Substitute entity values for entity references\&. By default, @@ -238,6 +250,11 @@ Substitute entity values for entity references\&. By default, leaves entity references in place\&. .RE .PP +\fB\-\-nofixup\-base\-uris\fR +.RS 4 +Don\*(Aqt fix xml:base URIs when processing XIncludes (parser option XML_PARSE_NOBASEFIX)\&. +.RE +.PP \fB\-\-nonet\fR .RS 4 Do not use the Internet to fetch @@ -273,6 +290,11 @@ Do XInclude processing but do not generate XInclude start and end nodes\&. Remove redundant namespace declarations\&. .RE .PP +\fB\-\-oldxml10\fR +.RS 4 +Use deprecated parsing rules before XML 1\&.0, 5th edition\&. +.RE +.PP \fB\-\-output \fR\fB\fIFILE\fR\fR .RS 4 Define a file path where @@ -306,6 +328,11 @@ Enable additional warnings\&. Validate after parsing has completed\&. .RE .PP +\fB\-\-pretty \fR\fB\fIINTEGER\fR\fR +.RS 4 +Value 0 means no formatting, 1 means XML_SAVE_FORMAT (same as \-\-format), 2 means XML_SAVE_WSNONSIG\&. +.RE +.PP \fB\-\-push\fR .RS 4 Use the push mode of the parser\&. @@ -333,6 +360,16 @@ for validation\&. Repeat 100 times, for timing or profiling\&. .RE .PP +\fB\-\-sax\fR +.RS 4 +Print SAX callbacks (only for debugging)\&. +.RE +.PP +\fB\-\-sax1\fR +.RS 4 +Use deprecated SAX1 interface (only for debugging)\&. +.RE +.PP \fB\-\-schema \fR\fB\fISCHEMA\fR\fR .RS 4 Use a W3C @@ -342,6 +379,13 @@ Schema file named for validation\&. .RE .PP +\fB\-\-schematron \fR\fB\fISCHEMA\fR\fR +.RS 4 +Use a Schematron file named +\fISCHEMA\fR +for validation\&. +.RE +.PP \fB\-\-shell\fR .RS 4 Run a navigating shell\&. Details on available commands in shell mode are below (see diff --git a/doc/xmllint.html b/doc/xmllint.html index dddbb828..f106ddf8 100644 --- a/doc/xmllint.html +++ b/doc/xmllint.html @@ -1,4 +1,4 @@ -xmllint

Name

xmllint — command line XML tool

Synopsis

xmllint [ --version | --debug | --quiet | --shell | --xpath "XPath_expression" | --debugent | --copy | --recover | --nodict | --noent | --noout | --nonet | --path "PATH(S)" | --load-trace | --htmlout | --nowrap | --valid | --postvalid | --dtdvalid URL | --dtdvalidfpi FPI | --timing | --output FILE | --repeat | --insert | --compress | --html | --xmlout | --push | --memory | --max-ampl INTEGER | --maxmem NBBYTES | --nowarning | --noblanks | --nocdata | --format | --encode ENCODING | --dropdtd | --nsclean | --testIO | --catalogs | --nocatalogs | --auto | --xinclude | --noxincludenode | --loaddtd | --dtdattr | --stream | --walker | --pattern PATTERNVALUE | --relaxng SCHEMA | --schema SCHEMA | --c14n | --pedantic ] { XML-FILE(S)... | - }

xmllint --help

DESCRIPTION

+xmllint

Name

xmllint — command line XML tool

Synopsis

xmllint [ --version | --debug | --quiet | --shell | --xpath "XPath_expression" | --debugent | --copy | --recover | --huge | --nocompact | --nodefdtd | --nodict | --noenc | --noent | --nofixup-base-uris | --noout | --nonet | --path "PATH(S)" | --load-trace | --htmlout | --nowrap | --valid | --postvalid | --dtdvalid URL | --dtdvalidfpi FPI | --timing | --output FILE | --repeat | --insert | --compress | --html | --xmlout | --push | --memory | --max-ampl INTEGER | --maxmem NBBYTES | --nowarning | --noblanks | --nocdata | --format | --pretty INTEGER | --encode ENCODING | --dropdtd | --nsclean | --testIO | --catalogs | --nocatalogs | --auto | --xinclude | --noxincludenode | --loaddtd | --dtdattr | --stream | --walker | --pattern PATTERNVALUE | --relaxng SCHEMA | --schema SCHEMA | --schematron SCHEMA | --c14n | --c14n11 | --exc-c14n | --pedantic | --sax | --sax1 | --oldxml10 ] { XML-FILE(S)... | - }

DESCRIPTION

The xmllint program parses one or more XML files, specified on the command line as XML-FILE (or the standard input if the filename provided @@ -15,7 +15,7 @@ ${sysconfdir}/xml/catalog are used by default.

--compress

Turn on gzip(1) compression of output. -

--copy

Test the internal copy implementation.

--c14n

+

--copy

Test the internal copy implementation.

--c14n, --c14n11, --exc-c14n

Use the W3C XML Canonicalisation (C14N) to serialize the result of parsing to stdout. It keeps comments in the result. @@ -36,12 +36,12 @@ Reformat and reindent the output. The XMLLINT_INDENT environment variable controls the indentation. The default value is two spaces " "). -

--help

Print out a short usage summary for xmllint.

--html

Use the HTML parser.

--htmlout

+

--html

Use the HTML parser.

--htmlout

Output results as an HTML file. This causes xmllint to output the necessary HTML tags surrounding the result tree output so the results can be displayed/viewed in a browser. -

--insert

Test for valid insertions.

--loaddtd

Fetch an external DTD.

--load-trace

+

--huge

Ignore some hardcoded parser limits.

--insert

Test for valid insertions.

--loaddtd

Fetch an external DTD.

--load-trace

Display all the documents loaded during the processing to stderr.

--max-ampl INTEGER

@@ -55,19 +55,34 @@ This can also be used to make sure batch processing of XML files will not exhaust the virtual memory of the server running them. -

--memory

Parse from memory.

--noblanks

Drop ignorable blank spaces.

--nocatalogs

Do not use any catalogs.

--nocdata

Substitute CDATA section by equivalent text nodes.

--nodict

+

--memory

Parse from memory.

--noblanks

Drop ignorable blank spaces.

--nocatalogs

Do not use any catalogs.

--nocdata

Substitute CDATA section by equivalent text nodes.

--nocompact

+ Do not generate compact text nodes (parser option + XML_PARSE_COMPACT). Only for debugging. +

--nodefdtd

+ Do not set default HTML doctype (parser option + HTML_PARSE_NODEFDTD). +

--nodict

Don't use dictionaries (parser option XML_PARSE_NODICT). Only for debugging. +

--noenc

+ Ignore encoding declaration (parser option + XML_PARSE_IGNORE_ENC).

--noent

Substitute entity values for entity references. By default, xmllint leaves entity references in place. +

--nofixup-base-uris

+ Don't fix xml:base URIs when processing XIncludes + (parser option XML_PARSE_NOBASEFIX).

--nonet

Do not use the Internet to fetch DTDs or entities.

--noout

Suppress output. By default, xmllint outputs the result tree.

--nowarning

Do not emit warnings from the parser and/or validator.

--nowrap

Do not output HTML doc wrapper.

--noxincludenode

Do XInclude processing but do not generate XInclude start and end nodes. -

--nsclean

Remove redundant namespace declarations.

--output FILE

+

--nsclean

Remove redundant namespace declarations.

--oldxml10

+ Use deprecated parsing rules before XML 1.0, + 5th edition. +

--output FILE

Define a file path where xmllint will save the result of parsing. Usually the programs build a tree and save it on stdout, with this option @@ -81,12 +96,18 @@ with the reader interface to the parser. It allows to select some nodes in the document based on an XPath (subset) expression. Used for debugging. -

--pedantic

Enable additional warnings.

--postvalid

Validate after parsing has completed.

--push

Use the push mode of the parser.

--quiet

Don't print informational messages to stderr.

--recover

Output any parsable portions of an invalid document.

--relaxng SCHEMA

+

--pedantic

Enable additional warnings.

--postvalid

Validate after parsing has completed.

--pretty INTEGER

+ Value 0 means no formatting, 1 means XML_SAVE_FORMAT + (same as --format), 2 means XML_SAVE_WSNONSIG. +

--push

Use the push mode of the parser.

--quiet

Don't print informational messages to stderr.

--recover

Output any parsable portions of an invalid document.

--relaxng SCHEMA

Use RelaxNG file named SCHEMA for validation. -

--repeat

Repeat 100 times, for timing or profiling.

--schema SCHEMA

+

--repeat

Repeat 100 times, for timing or profiling.

--sax

Print SAX callbacks (only for debugging).

--sax1

Use deprecated SAX1 interface (only for debugging).

--schema SCHEMA

Use a W3C XML Schema file named SCHEMA for validation. +

--schematron SCHEMA

+ Use a Schematron file + named SCHEMA for validation.

--shell

Run a navigating shell. Details on available commands in shell mode are below (see the section called “SHELL COMMANDS”). diff --git a/testapi.c b/testapi.c index 438acfbc..10427c4a 100644 --- a/testapi.c +++ b/testapi.c @@ -1849,6 +1849,47 @@ test_htmlCtxtReset(void) { } +static int +test_htmlCtxtSetOptions(void) { + int test_ret = 0; + +#if defined(LIBXML_HTML_ENABLED) + int mem_base; + int ret_val; + xmlParserCtxtPtr ctxt; /* an HTML parser context */ + int n_ctxt; + int options; /* a bitmask of xmlParserOption values */ + int n_options; + + for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { + for (n_options = 0;n_options < gen_nb_int;n_options++) { + mem_base = xmlMemBlocks(); + ctxt = gen_xmlParserCtxtPtr(n_ctxt, 0); + options = gen_int(n_options, 1); + + ret_val = htmlCtxtSetOptions(ctxt, options); + desret_int(ret_val); + call_tests++; + des_xmlParserCtxtPtr(n_ctxt, ctxt, 0); + des_int(n_options, options, 1); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in htmlCtxtSetOptions", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_ctxt); + printf(" %d", n_options); + printf("\n"); + } + } + } + function_tests++; +#endif + + return(test_ret); +} + + static int test_htmlCtxtUseOptions(void) { int test_ret = 0; @@ -2916,7 +2957,7 @@ static int test_HTMLparser(void) { int test_ret = 0; - if (quiet == 0) printf("Testing HTMLparser : 36 of 42 functions ...\n"); + if (quiet == 0) printf("Testing HTMLparser : 37 of 43 functions ...\n"); test_ret += test_UTF8ToHtml(); test_ret += test_htmlAttrAllowed(); test_ret += test_htmlAutoCloseTag(); @@ -2928,6 +2969,7 @@ test_HTMLparser(void) { test_ret += test_htmlCtxtReadFile(); test_ret += test_htmlCtxtReadMemory(); test_ret += test_htmlCtxtReset(); + test_ret += test_htmlCtxtSetOptions(); test_ret += test_htmlCtxtUseOptions(); test_ret += test_htmlElementAllowedHere(); test_ret += test_htmlElementStatusHere(); @@ -8905,7 +8947,7 @@ test_xmlEncodeSpecialChars(void) { int mem_base; xmlChar * ret_val; - const xmlDoc * doc; /* the document containing the string */ + const xmlDoc * doc; /* unused */ int n_doc; const xmlChar * input; /* A string to convert to XML. */ int n_input; @@ -11837,7 +11879,7 @@ test_xmlCtxtGetCatalogs(void) { int mem_base; void * ret_val; - xmlParserCtxtPtr ctxt; /* */ + xmlParserCtxtPtr ctxt; /* parser context */ int n_ctxt; for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { @@ -11869,7 +11911,7 @@ test_xmlCtxtGetDeclaredEncoding(void) { int mem_base; const xmlChar * ret_val; - xmlParserCtxtPtr ctxt; /* */ + xmlParserCtxtPtr ctxt; /* parser context */ int n_ctxt; for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { @@ -11933,7 +11975,7 @@ test_xmlCtxtGetPrivate(void) { int mem_base; void * ret_val; - xmlParserCtxtPtr ctxt; /* */ + xmlParserCtxtPtr ctxt; /* parser context */ int n_ctxt; for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { @@ -11965,7 +12007,7 @@ test_xmlCtxtGetStandalone(void) { int mem_base; int ret_val; - xmlParserCtxtPtr ctxt; /* */ + xmlParserCtxtPtr ctxt; /* parser context */ int n_ctxt; for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { @@ -12033,7 +12075,7 @@ test_xmlCtxtGetVersion(void) { int mem_base; const xmlChar * ret_val; - xmlParserCtxtPtr ctxt; /* */ + xmlParserCtxtPtr ctxt; /* parser context */ int n_ctxt; for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { @@ -12151,6 +12193,61 @@ test_xmlCtxtParseDocument(void) { } +static int +test_xmlCtxtParseDtd(void) { + int test_ret = 0; + +#if defined(LIBXML_VALID_ENABLED) + int mem_base; + xmlDtdPtr ret_val; + xmlParserCtxtPtr ctxt; /* a parser context */ + int n_ctxt; + xmlParserInputPtr input; /* a parser input */ + int n_input; + const xmlChar * publicId; /* public ID of the DTD (optional) */ + int n_publicId; + const xmlChar * systemId; /* system ID of the DTD (optional) */ + int n_systemId; + + for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { + for (n_input = 0;n_input < gen_nb_xmlParserInputPtr;n_input++) { + for (n_publicId = 0;n_publicId < gen_nb_const_xmlChar_ptr;n_publicId++) { + for (n_systemId = 0;n_systemId < gen_nb_const_xmlChar_ptr;n_systemId++) { + mem_base = xmlMemBlocks(); + ctxt = gen_xmlParserCtxtPtr(n_ctxt, 0); + input = gen_xmlParserInputPtr(n_input, 1); + publicId = gen_const_xmlChar_ptr(n_publicId, 2); + systemId = gen_const_xmlChar_ptr(n_systemId, 3); + + ret_val = xmlCtxtParseDtd(ctxt, input, publicId, systemId); + desret_xmlDtdPtr(ret_val); + call_tests++; + des_xmlParserCtxtPtr(n_ctxt, ctxt, 0); + des_xmlParserInputPtr(n_input, input, 1); + des_const_xmlChar_ptr(n_publicId, publicId, 2); + des_const_xmlChar_ptr(n_systemId, systemId, 3); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlCtxtParseDtd", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_ctxt); + printf(" %d", n_input); + printf(" %d", n_publicId); + printf(" %d", n_systemId); + printf("\n"); + } + } + } + } + } + function_tests++; +#endif + + return(test_ret); +} + + static int test_xmlCtxtReadDoc(void) { int test_ret = 0; @@ -12432,9 +12529,9 @@ test_xmlCtxtSetCatalogs(void) { int test_ret = 0; int mem_base; - xmlParserCtxtPtr ctxt; /* */ + xmlParserCtxtPtr ctxt; /* parser context */ int n_ctxt; - void * catalogs; /* */ + void * catalogs; /* catalogs pointer */ int n_catalogs; for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { @@ -12479,9 +12576,9 @@ test_xmlCtxtSetDict(void) { int test_ret = 0; int mem_base; - xmlParserCtxtPtr ctxt; /* */ + xmlParserCtxtPtr ctxt; /* parser context */ int n_ctxt; - xmlDictPtr dict; /* */ + xmlDictPtr dict; /* dictionary */ int n_dict; for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { @@ -12575,9 +12672,9 @@ test_xmlCtxtSetPrivate(void) { int test_ret = 0; int mem_base; - xmlParserCtxtPtr ctxt; /* */ + xmlParserCtxtPtr ctxt; /* parser context */ int n_ctxt; - void * priv; /* */ + void * priv; /* private application data */ int n_priv; for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { @@ -12656,6 +12753,95 @@ test_xmlCtxtUseOptions(void) { } +static int +test_xmlCtxtValidateDocument(void) { + int test_ret = 0; + +#if defined(LIBXML_VALID_ENABLED) + int mem_base; + int ret_val; + xmlParserCtxtPtr ctxt; /* a parser context */ + int n_ctxt; + xmlDocPtr doc; /* a document instance */ + int n_doc; + + for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { + for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) { + mem_base = xmlMemBlocks(); + ctxt = gen_xmlParserCtxtPtr(n_ctxt, 0); + doc = gen_xmlDocPtr(n_doc, 1); + + ret_val = xmlCtxtValidateDocument(ctxt, doc); + desret_int(ret_val); + call_tests++; + des_xmlParserCtxtPtr(n_ctxt, ctxt, 0); + des_xmlDocPtr(n_doc, doc, 1); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlCtxtValidateDocument", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_ctxt); + printf(" %d", n_doc); + printf("\n"); + } + } + } + function_tests++; +#endif + + return(test_ret); +} + + +static int +test_xmlCtxtValidateDtd(void) { + int test_ret = 0; + +#if defined(LIBXML_VALID_ENABLED) + int mem_base; + int ret_val; + xmlParserCtxtPtr ctxt; /* a parser context */ + int n_ctxt; + xmlDocPtr doc; /* a document instance */ + int n_doc; + xmlDtdPtr dtd; /* a dtd instance */ + int n_dtd; + + for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { + for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) { + for (n_dtd = 0;n_dtd < gen_nb_xmlDtdPtr;n_dtd++) { + mem_base = xmlMemBlocks(); + ctxt = gen_xmlParserCtxtPtr(n_ctxt, 0); + doc = gen_xmlDocPtr(n_doc, 1); + dtd = gen_xmlDtdPtr(n_dtd, 2); + + ret_val = xmlCtxtValidateDtd(ctxt, doc, dtd); + desret_int(ret_val); + call_tests++; + des_xmlParserCtxtPtr(n_ctxt, ctxt, 0); + des_xmlDocPtr(n_doc, doc, 1); + des_xmlDtdPtr(n_dtd, dtd, 2); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlCtxtValidateDtd", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_ctxt); + printf(" %d", n_doc); + printf(" %d", n_dtd); + printf("\n"); + } + } + } + } + function_tests++; +#endif + + return(test_ret); +} + + static int test_xmlGetExternalEntityLoader(void) { int test_ret = 0; @@ -15335,7 +15521,7 @@ static int test_parser(void) { int test_ret = 0; - if (quiet == 0) printf("Testing parser : 86 of 102 functions ...\n"); + if (quiet == 0) printf("Testing parser : 89 of 105 functions ...\n"); test_ret += test_xmlByteConsumed(); test_ret += test_xmlCleanupGlobals(); test_ret += test_xmlClearNodeInfoSeq(); @@ -15351,6 +15537,7 @@ test_parser(void) { test_ret += test_xmlCtxtGetVersion(); test_ret += test_xmlCtxtParseContent(); test_ret += test_xmlCtxtParseDocument(); + test_ret += test_xmlCtxtParseDtd(); test_ret += test_xmlCtxtReadDoc(); test_ret += test_xmlCtxtReadFile(); test_ret += test_xmlCtxtReadMemory(); @@ -15365,6 +15552,8 @@ test_parser(void) { test_ret += test_xmlCtxtSetPrivate(); test_ret += test_xmlCtxtSetResourceLoader(); test_ret += test_xmlCtxtUseOptions(); + test_ret += test_xmlCtxtValidateDocument(); + test_ret += test_xmlCtxtValidateDtd(); test_ret += test_xmlGetExternalEntityLoader(); test_ret += test_xmlHasFeature(); test_ret += test_xmlIOParseDTD(); @@ -15955,6 +16144,77 @@ test_xmlCtxtErrMemory(void) { } +static int +test_xmlCtxtPopInput(void) { + int test_ret = 0; + + int mem_base; + xmlParserInputPtr ret_val; + xmlParserCtxtPtr ctxt; /* an XML parser context */ + int n_ctxt; + + for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { + mem_base = xmlMemBlocks(); + ctxt = gen_xmlParserCtxtPtr(n_ctxt, 0); + + ret_val = xmlCtxtPopInput(ctxt); + desret_xmlParserInputPtr(ret_val); + call_tests++; + des_xmlParserCtxtPtr(n_ctxt, ctxt, 0); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlCtxtPopInput", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_ctxt); + printf("\n"); + } + } + function_tests++; + + return(test_ret); +} + + +static int +test_xmlCtxtPushInput(void) { + int test_ret = 0; + + int mem_base; + int ret_val; + xmlParserCtxtPtr ctxt; /* an XML parser context */ + int n_ctxt; + xmlParserInputPtr value; /* the parser input */ + int n_value; + + for (n_ctxt = 0;n_ctxt < gen_nb_xmlParserCtxtPtr;n_ctxt++) { + for (n_value = 0;n_value < gen_nb_xmlParserInputPtr;n_value++) { + mem_base = xmlMemBlocks(); + ctxt = gen_xmlParserCtxtPtr(n_ctxt, 0); + value = gen_xmlParserInputPtr(n_value, 1); + + ret_val = xmlCtxtPushInput(ctxt, value); + desret_int(ret_val); + call_tests++; + des_xmlParserCtxtPtr(n_ctxt, ctxt, 0); + des_xmlParserInputPtr(n_value, value, 1); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlCtxtPushInput", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_ctxt); + printf(" %d", n_value); + printf("\n"); + } + } + } + function_tests++; + + return(test_ret); +} + + static int test_xmlCurrentChar(void) { int test_ret = 0; @@ -16708,7 +16968,7 @@ static int test_parserInternals(void) { int test_ret = 0; - if (quiet == 0) printf("Testing parserInternals : 32 of 79 functions ...\n"); + if (quiet == 0) printf("Testing parserInternals : 34 of 81 functions ...\n"); test_ret += test_inputPop(); test_ret += test_inputPush(); test_ret += test_namePop(); @@ -16723,6 +16983,8 @@ test_parserInternals(void) { test_ret += test_xmlCreateMemoryParserCtxt(); test_ret += test_xmlCreateURLParserCtxt(); test_ret += test_xmlCtxtErrMemory(); + test_ret += test_xmlCtxtPopInput(); + test_ret += test_xmlCtxtPushInput(); test_ret += test_xmlCurrentChar(); test_ret += test_xmlIsLetter(); test_ret += test_xmlNewEntityInputStream(); @@ -22646,7 +22908,7 @@ test_xmlNodeListGetRawString(void) { xmlChar * ret_val; const xmlDoc * doc; /* a document (optional) */ int n_doc; - const xmlNode * list; /* a node list of attribute children (optional) */ + const xmlNode * list; /* a node list of attribute children */ int n_list; int inLine; /* whether entity references are substituted */ int n_inLine; @@ -22692,7 +22954,7 @@ test_xmlNodeListGetString(void) { xmlChar * ret_val; xmlDocPtr doc; /* a document (optional) */ int n_doc; - const xmlNode * list; /* a node list of attribute children (optional) */ + const xmlNode * list; /* a node list of attribute children */ int n_list; int inLine; /* whether entity references are substituted */ int n_inLine; @@ -26683,28 +26945,28 @@ test_xmlValidateDocument(void) { #if defined(LIBXML_VALID_ENABLED) int mem_base; int ret_val; - xmlValidCtxtPtr ctxt; /* the validation context */ - int n_ctxt; + xmlValidCtxtPtr vctxt; /* the validation context */ + int n_vctxt; xmlDocPtr doc; /* a document instance */ int n_doc; - for (n_ctxt = 0;n_ctxt < gen_nb_xmlValidCtxtPtr;n_ctxt++) { + for (n_vctxt = 0;n_vctxt < gen_nb_xmlValidCtxtPtr;n_vctxt++) { for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) { mem_base = xmlMemBlocks(); - ctxt = gen_xmlValidCtxtPtr(n_ctxt, 0); + vctxt = gen_xmlValidCtxtPtr(n_vctxt, 0); doc = gen_xmlDocPtr(n_doc, 1); - ret_val = xmlValidateDocument(ctxt, doc); + ret_val = xmlValidateDocument(vctxt, doc); desret_int(ret_val); call_tests++; - des_xmlValidCtxtPtr(n_ctxt, ctxt, 0); + des_xmlValidCtxtPtr(n_vctxt, vctxt, 0); des_xmlDocPtr(n_doc, doc, 1); xmlResetLastError(); if (mem_base != xmlMemBlocks()) { printf("Leak of %d blocks found in xmlValidateDocument", xmlMemBlocks() - mem_base); test_ret++; - printf(" %d", n_ctxt); + printf(" %d", n_vctxt); printf(" %d", n_doc); printf("\n"); } @@ -28874,26 +29136,26 @@ test_xmlOutputBufferWrite(void) { int n_out; int len; /* the size in bytes of the array. */ int n_len; - const char * buf; /* an char array */ - int n_buf; + const char * data; /* an char array */ + int n_data; for (n_out = 0;n_out < gen_nb_xmlOutputBufferPtr;n_out++) { for (n_len = 0;n_len < gen_nb_int;n_len++) { - for (n_buf = 0;n_buf < gen_nb_const_char_ptr;n_buf++) { + for (n_data = 0;n_data < gen_nb_const_char_ptr;n_data++) { mem_base = xmlMemBlocks(); out = gen_xmlOutputBufferPtr(n_out, 0); len = gen_int(n_len, 1); - buf = gen_const_char_ptr(n_buf, 2); - if ((buf != NULL) && - (len > xmlStrlen(BAD_CAST buf))) + data = gen_const_char_ptr(n_data, 2); + if ((data != NULL) && + (len > xmlStrlen(BAD_CAST data))) len = 0; - ret_val = xmlOutputBufferWrite(out, len, buf); + ret_val = xmlOutputBufferWrite(out, len, data); desret_int(ret_val); call_tests++; des_xmlOutputBufferPtr(n_out, out, 0); des_int(n_len, len, 1); - des_const_char_ptr(n_buf, buf, 2); + des_const_char_ptr(n_data, data, 2); xmlResetLastError(); if (mem_base != xmlMemBlocks()) { printf("Leak of %d blocks found in xmlOutputBufferWrite", @@ -28901,7 +29163,7 @@ test_xmlOutputBufferWrite(void) { test_ret++; printf(" %d", n_out); printf(" %d", n_len); - printf(" %d", n_buf); + printf(" %d", n_data); printf("\n"); } }