diff --git a/configure.ac b/configure.ac index 267f8afd..6f012c92 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=9 -LIBXML_MICRO_VERSION=3 +LIBXML_MICRO_VERSION=4 LIBXML_MICRO_VERSION_SUFFIX= LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index b1f069d8..dba59525 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -383,34 +383,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRegexpIsDeterminist
dict
_xmlDoc
dictionaries
XML_MAX_NAME_LENGTH
-
dictionary
XML_MAX_DICTIONARY_LIMIT
-_xmlParserCtxt
-_xmlXPathContext
-xmlDictCleanup
-xmlDictCreate
-xmlDictCreateSub
-xmlDictGetUsage
-xmlDictReference
-xmlDictSetLimit
-xmlHashCreateDict
-xmlInitializeDict
-xmlPatterncompile
-xmlStreamPush
-xmlStreamPushAttr
-xmlStreamPushNode
-
dictionnary
_xmlParserCtxt
-xmlDictCreate
-xmlDictCreateSub
-xmlDictExists
-xmlDictFree
-xmlDictGetUsage
-xmlDictLookup
-xmlDictOwns
-xmlDictQLookup
-xmlDictReference
-xmlDictSetLimit
-xmlDictSize
-xmlExpNewCtxt
did
XML_SCHEMAS_TYPE_BLOCK_DEFAULT
xmlTextReaderGetRemainder
xmlTextReaderStandalone
diff --git a/doc/apibuild.py b/doc/apibuild.py index b5b669af..7a364663 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -81,6 +81,7 @@ ignored_words = { "ATTRIBUTE_PRINTF": (5, "macro for gcc printf args checking extension"), "LIBXML_ATTR_FORMAT": (5, "macro for gcc printf args checking extension"), "LIBXML_ATTR_ALLOC_SIZE": (3, "macro for gcc checking extension"), + "__XML_EXTERNC": (0, "Special macro added for os400"), } def escape(raw): diff --git a/doc/devhelp/general.html b/doc/devhelp/general.html index 68f93805..90f0d394 100644 --- a/doc/devhelp/general.html +++ b/doc/devhelp/general.html @@ -33,6 +33,6 @@

libxml2 API Modules

-

DOCBparser - old DocBook SGML parser
HTMLparser - interface for an HTML 4.0 non-verifying parser
HTMLtree - specific APIs to process HTML tree, especially serialization
SAX - Old SAX version 1 handler, deprecated
SAX2 - SAX2 parser interface used to build the DOM tree
c14n - Provide Canonical XML and Exclusive XML Canonicalization
catalog - interfaces to the Catalog handling system
chvalid - Unicode character range checking
debugXML - Tree debugging APIs
dict - string dictionnary
encoding - interface for the encoding conversion functions
entities - interface for the XML entities handling
globals - interface for all global variables of the library
hash - Chained hash tables
list - lists interfaces
nanoftp - minimal FTP implementation
nanohttp - minimal HTTP implementation
parser - the core parser module
parserInternals - internals routines and limits exported by the parser.
pattern - pattern expression handling
relaxng - implementation of the Relax-NG validation
schemasInternals - internal interfaces for XML Schemas
schematron - XML Schemastron implementation
threads - interfaces for thread handling
tree - interfaces for tree manipulation
uri - library of generic URI related routines
valid - The DTD validation
xinclude - implementation of XInclude
xlink - unfinished XLink detection module
xmlIO - interface for the I/O interfaces used by the parser
xmlautomata - API to build regexp automata
xmlerror - error handling
xmlexports - macros for marking symbols as exportable/importable.
xmlmemory - interface for the memory allocator
xmlmodule - dynamic module loading
xmlreader - the XMLReader implementation
xmlregexp - regular expressions handling
xmlsave - the XML document serializer
xmlschemas - incomplete XML Schemas structure implementation
xmlschemastypes - implementation of XML Schema Datatypes
xmlstring - set of routines to process strings
xmlunicode - Unicode character APIs
xmlversion - compile-time version informations
xmlwriter - text writing API for XML
xpath - XML Path Language implementation
xpathInternals - internal interfaces for XML Path Language implementation
xpointer - API to handle XML Pointers

+

DOCBparser - old DocBook SGML parser
HTMLparser - interface for an HTML 4.0 non-verifying parser
HTMLtree - specific APIs to process HTML tree, especially serialization
SAX - Old SAX version 1 handler, deprecated
SAX2 - SAX2 parser interface used to build the DOM tree
c14n - Provide Canonical XML and Exclusive XML Canonicalization
catalog - interfaces to the Catalog handling system
chvalid - Unicode character range checking
debugXML - Tree debugging APIs
dict - string dictionary
encoding - interface for the encoding conversion functions
entities - interface for the XML entities handling
globals - interface for all global variables of the library
hash - Chained hash tables
list - lists interfaces
nanoftp - minimal FTP implementation
nanohttp - minimal HTTP implementation
parser - the core parser module
parserInternals - internals routines and limits exported by the parser.
pattern - pattern expression handling
relaxng - implementation of the Relax-NG validation
schemasInternals - internal interfaces for XML Schemas
schematron - XML Schemastron implementation
threads - interfaces for thread handling
tree - interfaces for tree manipulation
uri - library of generic URI related routines
valid - The DTD validation
xinclude - implementation of XInclude
xlink - unfinished XLink detection module
xmlIO - interface for the I/O interfaces used by the parser
xmlautomata - API to build regexp automata
xmlerror - error handling
xmlexports - macros for marking symbols as exportable/importable.
xmlmemory - interface for the memory allocator
xmlmodule - dynamic module loading
xmlreader - the XMLReader implementation
xmlregexp - regular expressions handling
xmlsave - the XML document serializer
xmlschemas - incomplete XML Schemas structure implementation
xmlschemastypes - implementation of XML Schema Datatypes
xmlstring - set of routines to process strings
xmlunicode - Unicode character APIs
xmlversion - compile-time version informations
xmlwriter - text writing API for XML
xpath - XML Path Language implementation
xpathInternals - internal interfaces for XML Path Language implementation
xpointer - API to handle XML Pointers

diff --git a/doc/devhelp/libxml2-dict.html b/doc/devhelp/libxml2-dict.html index fd5f6b9a..3776c5bd 100644 --- a/doc/devhelp/libxml2-dict.html +++ b/doc/devhelp/libxml2-dict.html @@ -2,7 +2,7 @@ - dict: string dictionnary + dict: string dictionary @@ -38,7 +38,7 @@

dict

-

dict - string dictionnary

+

dict - string dictionary

dictionary of reusable strings, just used to avoid allocation and freeing operations.

Author(s): Daniel Veillard

@@ -82,47 +82,47 @@ The content of this structure is not made public by the API.

xmlDictCreate ()

xmlDictPtr	xmlDictCreate		(void)

Create a new dictionary

-
Returns:the newly created dictionnary, or NULL if an error occured.
+
Returns:the newly created dictionary, or NULL if an error occured.

xmlDictCreateSub ()

xmlDictPtr	xmlDictCreateSub	(xmlDictPtr sub)
-

Create a new dictionary, inheriting strings from the read-only dictionnary @sub. On lookup, strings are first searched in the new dictionnary, then in @sub, and if not found are created in the new dictionnary.

-
sub:an existing dictionnary
Returns:the newly created dictionnary, or NULL if an error occured.
+

Create a new dictionary, inheriting strings from the read-only dictionary @sub. On lookup, strings are first searched in the new dictionary, then in @sub, and if not found are created in the new dictionary.

+
sub:an existing dictionary
Returns:the newly created dictionary, or NULL if an error occured.

xmlDictExists ()

const xmlChar *	xmlDictExists		(xmlDictPtr dict, 
const xmlChar * name,
int len)
-

Check if the @name exists in the dictionnary @dict.

-
dict:the dictionnary
name:the name of the userdata
len:the length of the name, if -1 it is recomputed
Returns:the internal copy of the name or NULL if not found.
+

Check if the @name exists in the dictionary @dict.

+
dict:the dictionary
name:the name of the userdata
len:the length of the name, if -1 it is recomputed
Returns:the internal copy of the name or NULL if not found.

xmlDictFree ()

void	xmlDictFree			(xmlDictPtr dict)

Free the hash @dict and its contents. The userdata is deallocated with @f if provided.

-
dict:the dictionnary
+
dict:the dictionary

xmlDictGetUsage ()

size_t	xmlDictGetUsage			(xmlDictPtr dict)

Get how much memory is used by a dictionary for strings Added in 2.9.0

-
dict:the dictionnary
Returns:the amount of strings allocated
+
dict:the dictionary
Returns:the amount of strings allocated

xmlDictLookup ()

const xmlChar *	xmlDictLookup		(xmlDictPtr dict, 
const xmlChar * name,
int len)
-

Add the @name to the dictionnary @dict if not present.

-
dict:the dictionnary
name:the name of the userdata
len:the length of the name, if -1 it is recomputed
Returns:the internal copy of the name or NULL in case of internal error
+

Add the @name to the dictionary @dict if not present.

+
dict:the dictionary
name:the name of the userdata
len:the length of the name, if -1 it is recomputed
Returns:the internal copy of the name or NULL in case of internal error

xmlDictOwns ()

int	xmlDictOwns			(xmlDictPtr dict, 
const xmlChar * str)

check if a string is owned by the disctionary

-
dict:the dictionnary
str:the string
Returns:1 if true, 0 if false and -1 in case of error -1 in case of error
+
dict:the dictionary
str:the string
Returns:1 if true, 0 if false and -1 in case of error -1 in case of error

xmlDictQLookup ()

const xmlChar *	xmlDictQLookup		(xmlDictPtr dict, 
const xmlChar * prefix,
const xmlChar * name)

Add the QName @prefix:@name to the hash @dict if not present.

-
dict:the dictionnary
prefix:the prefix
name:the name
Returns:the internal copy of the QName or NULL in case of internal error
+
dict:the dictionary
prefix:the prefix
name:the name
Returns:the internal copy of the QName or NULL in case of internal error

xmlDictReference ()

int	xmlDictReference		(xmlDictPtr dict)

Increment the reference counter of a dictionary

-
dict:the dictionnary
Returns:0 in case of success and -1 in case of error
+
dict:the dictionary
Returns:0 in case of success and -1 in case of error

xmlDictSetLimit ()

size_t	xmlDictSetLimit			(xmlDictPtr dict, 
size_t limit)

Set a size limit for the dictionary Added in 2.9.0

-
dict:the dictionnary
limit:the limit in bytes
Returns:the previous limit of the dictionary or 0
+
dict:the dictionary
limit:the limit in bytes
Returns:the previous limit of the dictionary or 0

xmlDictSize ()

int	xmlDictSize			(xmlDictPtr dict)

Query the number of elements installed in the hash @dict.

-
dict:the dictionnary
Returns:the number of elements in the dictionnary or -1 in case of error
+
dict:the dictionary
Returns:the number of elements in the dictionary or -1 in case of error

xmlInitializeDict ()

int	xmlInitializeDict		(void)

Do the dictionary mutex initialization. this function is deprecated

diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html index 357c14a2..c7405544 100644 --- a/doc/devhelp/libxml2-parser.html +++ b/doc/devhelp/libxml2-parser.html @@ -300,7 +300,7 @@ void xmlSetExternalEntityLoader (XML_PARSE_SAX1 = 512 /* use the SAX1 interface internally */ XML_PARSE_XINCLUDE = 1024 /* Implement XInclude substitition */ XML_PARSE_NONET = 2048 /* Forbid network access */ - XML_PARSE_NODICT = 4096 /* Do not reuse the context dictionnary */ + XML_PARSE_NODICT = 4096 /* Do not reuse the context dictionary */ XML_PARSE_NSCLEAN = 8192 /* remove redundant namespaces declarations */ XML_PARSE_NOCDATA = 16384 /* merge CDATA as text nodes */ XML_PARSE_NOXINCNODE = 32768 /* do not generate XINCLUDE START/END nodes */ diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html index 5f8d1f28..ac85d60e 100644 --- a/doc/devhelp/libxml2-tree.html +++ b/doc/devhelp/libxml2-tree.html @@ -782,7 +782,7 @@ The content of this structure is not made public by the API. void * catalogs : document's own catalog int recovery : run in recovery mode int progressive : is this a progressive parsing - xmlDictPtr dict : dictionnary for the parser + xmlDictPtr dict : dictionary for the parser const xmlChar * * atts : array for the attributes callbacks int maxatts : the size of the array int docdict : * pre-interned strings * diff --git a/doc/devhelp/libxml2-xmlregexp.html b/doc/devhelp/libxml2-xmlregexp.html index 9427a345..8d5c80ec 100644 --- a/doc/devhelp/libxml2-xmlregexp.html +++ b/doc/devhelp/libxml2-xmlregexp.html @@ -200,7 +200,7 @@ The content of this structure is not made public by the API.

xmlExpNewCtxt ()

xmlExpCtxtPtr	xmlExpNewCtxt		(int maxNodes, 
xmlDictPtr dict)

Creates a new context for manipulating expressions

-
maxNodes:the maximum number of nodes
dict:optional dictionnary to use internally
Returns:the context or NULL in case of error
+
maxNodes:the maximum number of nodes
dict:optional dictionary to use internally
Returns:the context or NULL in case of error

xmlExpNewOr ()

xmlExpNodePtr	xmlExpNewOr		(xmlExpCtxtPtr ctxt, 
xmlExpNodePtr left,
xmlExpNodePtr right)

Get the atom associated to the choice @left | @right Note that @left and @right are consumed in the operation, to keep an handle on them use xmlExpRef() and use xmlExpFree() to release them, this is true even in case of failure (unless ctxt == NULL).

diff --git a/doc/html/book1.html b/doc/html/book1.html index 1a58210b..42d71a66 100644 --- a/doc/html/book1.html +++ b/doc/html/book1.html @@ -10,4 +10,4 @@ A:link, A:visited, A:active { text-decoration: underline } Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionnary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: Chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines and limits exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • schematron: XML Schemastron implementation
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlmodule: dynamic module loading
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

+ Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: Chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines and limits exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • schematron: XML Schemastron implementation
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlmodule: dynamic module loading
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

diff --git a/doc/html/index.html b/doc/html/index.html index 1a58210b..42d71a66 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -10,4 +10,4 @@ A:link, A:visited, A:active { text-decoration: underline } Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionnary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: Chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines and limits exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • schematron: XML Schemastron implementation
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlmodule: dynamic module loading
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

+ Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: Chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines and limits exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • schematron: XML Schemastron implementation
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlmodule: dynamic module loading
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

diff --git a/doc/html/libxml-dict.html b/doc/html/libxml-dict.html index bdd21f4f..74e243b9 100644 --- a/doc/html/libxml-dict.html +++ b/doc/html/libxml-dict.html @@ -33,26 +33,26 @@ The content of this structure is not made public by the API.

Free the dictionary mutex. Do not call unless sure the library is not in use anymore !

Function: xmlDictCreate

xmlDictPtr	xmlDictCreate		(void)

Create a new dictionary

-
Returns:the newly created dictionnary, or NULL if an error occured.

Function: xmlDictCreateSub

xmlDictPtr	xmlDictCreateSub	(xmlDictPtr sub)
-

Create a new dictionary, inheriting strings from the read-only dictionnary @sub. On lookup, strings are first searched in the new dictionnary, then in @sub, and if not found are created in the new dictionnary.

-
sub:an existing dictionnary
Returns:the newly created dictionnary, or NULL if an error occured.

Function: xmlDictExists

const xmlChar *	xmlDictExists		(xmlDictPtr dict, 
const xmlChar * name,
int len)
-

Check if the @name exists in the dictionnary @dict.

-
dict:the dictionnary
name:the name of the userdata
len:the length of the name, if -1 it is recomputed
Returns:the internal copy of the name or NULL if not found.

Function: xmlDictFree

void	xmlDictFree			(xmlDictPtr dict)
+
Returns:the newly created dictionary, or NULL if an error occured.

Function: xmlDictCreateSub

xmlDictPtr	xmlDictCreateSub	(xmlDictPtr sub)
+

Create a new dictionary, inheriting strings from the read-only dictionary @sub. On lookup, strings are first searched in the new dictionary, then in @sub, and if not found are created in the new dictionary.

+
sub:an existing dictionary
Returns:the newly created dictionary, or NULL if an error occured.

Function: xmlDictExists

const xmlChar *	xmlDictExists		(xmlDictPtr dict, 
const xmlChar * name,
int len)
+

Check if the @name exists in the dictionary @dict.

+
dict:the dictionary
name:the name of the userdata
len:the length of the name, if -1 it is recomputed
Returns:the internal copy of the name or NULL if not found.

Function: xmlDictFree

void	xmlDictFree			(xmlDictPtr dict)

Free the hash @dict and its contents. The userdata is deallocated with @f if provided.

-
dict:the dictionnary

Function: xmlDictGetUsage

size_t	xmlDictGetUsage			(xmlDictPtr dict)
+
dict:the dictionary

Function: xmlDictGetUsage

size_t	xmlDictGetUsage			(xmlDictPtr dict)

Get how much memory is used by a dictionary for strings Added in 2.9.0

-
dict:the dictionnary
Returns:the amount of strings allocated

Function: xmlDictLookup

const xmlChar *	xmlDictLookup		(xmlDictPtr dict, 
const xmlChar * name,
int len)
-

Add the @name to the dictionnary @dict if not present.

-
dict:the dictionnary
name:the name of the userdata
len:the length of the name, if -1 it is recomputed
Returns:the internal copy of the name or NULL in case of internal error

Function: xmlDictOwns

int	xmlDictOwns			(xmlDictPtr dict, 
const xmlChar * str)
+
dict:the dictionary
Returns:the amount of strings allocated

Function: xmlDictLookup

const xmlChar *	xmlDictLookup		(xmlDictPtr dict, 
const xmlChar * name,
int len)
+

Add the @name to the dictionary @dict if not present.

+
dict:the dictionary
name:the name of the userdata
len:the length of the name, if -1 it is recomputed
Returns:the internal copy of the name or NULL in case of internal error

Function: xmlDictOwns

int	xmlDictOwns			(xmlDictPtr dict, 
const xmlChar * str)

check if a string is owned by the disctionary

-
dict:the dictionnary
str:the string
Returns:1 if true, 0 if false and -1 in case of error -1 in case of error

Function: xmlDictQLookup

const xmlChar *	xmlDictQLookup		(xmlDictPtr dict, 
const xmlChar * prefix,
const xmlChar * name)
+
dict:the dictionary
str:the string
Returns:1 if true, 0 if false and -1 in case of error -1 in case of error

Function: xmlDictQLookup

const xmlChar *	xmlDictQLookup		(xmlDictPtr dict, 
const xmlChar * prefix,
const xmlChar * name)

Add the QName @prefix:@name to the hash @dict if not present.

-
dict:the dictionnary
prefix:the prefix
name:the name
Returns:the internal copy of the QName or NULL in case of internal error

Function: xmlDictReference

int	xmlDictReference		(xmlDictPtr dict)
+
dict:the dictionary
prefix:the prefix
name:the name
Returns:the internal copy of the QName or NULL in case of internal error

Function: xmlDictReference

int	xmlDictReference		(xmlDictPtr dict)

Increment the reference counter of a dictionary

-
dict:the dictionnary
Returns:0 in case of success and -1 in case of error

Function: xmlDictSetLimit

size_t	xmlDictSetLimit			(xmlDictPtr dict, 
size_t limit)
+
dict:the dictionary
Returns:0 in case of success and -1 in case of error

Function: xmlDictSetLimit

size_t	xmlDictSetLimit			(xmlDictPtr dict, 
size_t limit)

Set a size limit for the dictionary Added in 2.9.0

-
dict:the dictionnary
limit:the limit in bytes
Returns:the previous limit of the dictionary or 0

Function: xmlDictSize

int	xmlDictSize			(xmlDictPtr dict)
+
dict:the dictionary
limit:the limit in bytes
Returns:the previous limit of the dictionary or 0

Function: xmlDictSize

int	xmlDictSize			(xmlDictPtr dict)

Query the number of elements installed in the hash @dict.

-
dict:the dictionnary
Returns:the number of elements in the dictionnary or -1 in case of error

Function: xmlInitializeDict

int	xmlInitializeDict		(void)
+
dict:the dictionary
Returns:the number of elements in the dictionary or -1 in case of error

Function: xmlInitializeDict

int	xmlInitializeDict		(void)

Do the dictionary mutex initialization. this function is deprecated

Returns:0 if initialization was already done, and 1 if that call led to the initialization

Daniel Veillard

diff --git a/doc/html/libxml-lib.html b/doc/html/libxml-lib.html index 1a58210b..42d71a66 100644 --- a/doc/html/libxml-lib.html +++ b/doc/html/libxml-lib.html @@ -10,4 +10,4 @@ A:link, A:visited, A:active { text-decoration: underline } Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionnary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: Chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines and limits exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • schematron: XML Schemastron implementation
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlmodule: dynamic module loading
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

+ Reference Manual for libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Reference Manual for libxml2

API Menu
API Indexes
Related links

Table of Contents

  • DOCBparser: old DocBook SGML parser
  • HTMLparser: interface for an HTML 4.0 non-verifying parser
  • HTMLtree: specific APIs to process HTML tree, especially serialization
  • SAX: Old SAX version 1 handler, deprecated
  • SAX2: SAX2 parser interface used to build the DOM tree
  • c14n: Provide Canonical XML and Exclusive XML Canonicalization
  • catalog: interfaces to the Catalog handling system
  • chvalid: Unicode character range checking
  • debugXML: Tree debugging APIs
  • dict: string dictionary
  • encoding: interface for the encoding conversion functions
  • entities: interface for the XML entities handling
  • globals: interface for all global variables of the library
  • hash: Chained hash tables
  • list: lists interfaces
  • nanoftp: minimal FTP implementation
  • nanohttp: minimal HTTP implementation
  • parser: the core parser module
  • parserInternals: internals routines and limits exported by the parser.
  • pattern: pattern expression handling
  • relaxng: implementation of the Relax-NG validation
  • schemasInternals: internal interfaces for XML Schemas
  • schematron: XML Schemastron implementation
  • threads: interfaces for thread handling
  • tree: interfaces for tree manipulation
  • uri: library of generic URI related routines
  • valid: The DTD validation
  • xinclude: implementation of XInclude
  • xlink: unfinished XLink detection module
  • xmlIO: interface for the I/O interfaces used by the parser
  • xmlautomata: API to build regexp automata
  • xmlerror: error handling
  • xmlexports: macros for marking symbols as exportable/importable.
  • xmlmemory: interface for the memory allocator
  • xmlmodule: dynamic module loading
  • xmlreader: the XMLReader implementation
  • xmlregexp: regular expressions handling
  • xmlsave: the XML document serializer
  • xmlschemas: incomplete XML Schemas structure implementation
  • xmlschemastypes: implementation of XML Schema Datatypes
  • xmlstring: set of routines to process strings
  • xmlunicode: Unicode character APIs
  • xmlversion: compile-time version informations
  • xmlwriter: text writing API for XML
  • xpath: XML Path Language implementation
  • xpathInternals: internal interfaces for XML Path Language implementation
  • xpointer: API to handle XML Pointers

Daniel Veillard

diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html index 98123f75..4d890c62 100644 --- a/doc/html/libxml-parser.html +++ b/doc/html/libxml-parser.html @@ -279,7 +279,7 @@ void xmlParserInputDeallocate (XML_PARSE_SAX1 = 512 : use the SAX1 interface internally XML_PARSE_XINCLUDE = 1024 : Implement XInclude substitition XML_PARSE_NONET = 2048 : Forbid network access - XML_PARSE_NODICT = 4096 : Do not reuse the context dictionnary + XML_PARSE_NODICT = 4096 : Do not reuse the context dictionary XML_PARSE_NSCLEAN = 8192 : remove redundant namespaces declarations XML_PARSE_NOCDATA = 16384 : merge CDATA as text nodes XML_PARSE_NOXINCNODE = 32768 : do not generate XINCLUDE START/END nodes diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html index d1d005f6..d95872dc 100644 --- a/doc/html/libxml-tree.html +++ b/doc/html/libxml-tree.html @@ -555,7 +555,7 @@ The content of this structure is not made public by the API. void * catalogs : document's own catalog int recovery : run in recovery mode int progressive : is this a progressive parsing - xmlDictPtr dict : dictionnary for the parser + xmlDictPtr dict : dictionary for the parser const xmlChar * * atts : array for the attributes callbacks int maxatts : the size of the array int docdict : * pre-interned strings * diff --git a/doc/html/libxml-xmlregexp.html b/doc/html/libxml-xmlregexp.html index 8dda699d..564f65e0 100644 --- a/doc/html/libxml-xmlregexp.html +++ b/doc/html/libxml-xmlregexp.html @@ -101,7 +101,7 @@ The content of this structure is not made public by the API.

Get the atom associated to this name from that context

ctxt:the expression context
name:the atom name
len:the atom name length in byte (or -1);
Returns:the node or NULL in case of error

Function: xmlExpNewCtxt

xmlExpCtxtPtr	xmlExpNewCtxt		(int maxNodes, 
xmlDictPtr dict)

Creates a new context for manipulating expressions

-
maxNodes:the maximum number of nodes
dict:optional dictionnary to use internally
Returns:the context or NULL in case of error

Function: xmlExpNewOr

xmlExpNodePtr	xmlExpNewOr		(xmlExpCtxtPtr ctxt, 
xmlExpNodePtr left,
xmlExpNodePtr right)
+
maxNodes:the maximum number of nodes
dict:optional dictionary to use internally
Returns:the context or NULL in case of error

Function: xmlExpNewOr

xmlExpNodePtr	xmlExpNewOr		(xmlExpCtxtPtr ctxt, 
xmlExpNodePtr left,
xmlExpNodePtr right)

Get the atom associated to the choice @left | @right Note that @left and @right are consumed in the operation, to keep an handle on them use xmlExpRef() and use xmlExpFree() to release them, this is true even in case of failure (unless ctxt == NULL).

ctxt:the expression context
left:left expression
right:right expression
Returns:the node or NULL in case of error

Function: xmlExpNewRange

xmlExpNodePtr	xmlExpNewRange		(xmlExpCtxtPtr ctxt, 
xmlExpNodePtr subset,
int min,
int max)

Get the atom associated to the range (@subset){@min, @max} Note that @subset is consumed in the operation, to keep an handle on it use xmlExpRef() and use xmlExpFree() to release it, this is true even in case of failure (unless ctxt == NULL).

diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 5573f0c5..7680a1bb 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -367,7 +367,7 @@ - string dictionnary + string dictionary dictionary of reusable strings, just used to avoid allocation and freeing operations. Daniel Veillard @@ -5142,7 +5142,7 @@ crash if you try to modify the tree)'/> - + @@ -6410,7 +6410,7 @@ actually an xmlCharEncoding'/> - + Create a new dictionary - + - Create a new dictionary, inheriting strings from the read-only dictionnary @sub. On lookup, strings are first searched in the new dictionnary, then in @sub, and if not found are created in the new dictionnary. - - + Create a new dictionary, inheriting strings from the read-only dictionary @sub. On lookup, strings are first searched in the new dictionary, then in @sub, and if not found are created in the new dictionary. + + - Check if the @name exists in the dictionnary @dict. + Check if the @name exists in the dictionary @dict. - + Free the hash @dict and its contents. The userdata is deallocated with @f if provided. - + Get how much memory is used by a dictionary for strings Added in 2.9.0 - + - Add the @name to the dictionnary @dict if not present. + Add the @name to the dictionary @dict if not present. - + check if a string is owned by the disctionary - + Add the QName @prefix:@name to the hash @dict if not present. - + Increment the reference counter of a dictionary - + Set a size limit for the dictionary Added in 2.9.0 - + Query the number of elements installed in the hash @dict. - - + + @@ -9827,7 +9827,7 @@ Could we use @subtypes for this?'/> Creates a new context for manipulating expressions - + defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED) diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index 71586099..07a608f2 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -21822,38 +21822,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libxml.spec.in b/libxml.spec.in index 9029a180..6fe3c69a 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -3,10 +3,10 @@ Summary: Library providing XML and HTML support Name: libxml2 Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 0rc2%{?dist}%{?extra_release} License: MIT Group: Development/Libraries -Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz +Source: ftp://xmlsoft.org/libxml2/libxml2-%{version}-rc2.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: python-devel %if 0%{?with_python3} diff --git a/python/setup.py b/python/setup.py index 6f7c06c7..c44269a6 100755 --- a/python/setup.py +++ b/python/setup.py @@ -226,7 +226,7 @@ else: setup (name = "libxml2-python", # On *nix, the version number is created from setup.py.in # On windows, it is set by configure.js - version = "2.9.3", + version = "2.9.4", description = descr, author = "Daniel Veillard", author_email = "veillard@redhat.com", diff --git a/testapi.c b/testapi.c index 2d6eccc2..60f4bddb 100644 --- a/testapi.c +++ b/testapi.c @@ -1479,7 +1479,7 @@ test_htmlCreateMemoryParserCtxt(void) { for (n_size = 0;n_size < gen_nb_int;n_size++) { mem_base = xmlMemBlocks(); buffer = gen_const_char_ptr(n_buffer, 0); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 1); ret_val = htmlCreateMemoryParserCtxt((const char *)buffer, size); desret_htmlParserCtxtPtr(ret_val); @@ -1544,7 +1544,7 @@ test_htmlCreatePushParserCtxt(void) { sax = gen_htmlSAXHandlerPtr(n_sax, 0); user_data = gen_userdata(n_user_data, 1); chunk = gen_const_char_ptr(n_chunk, 2); - size = chunk ? strlen(chunk) : 0; + size = gen_int(n_size, 3); filename = gen_fileoutput(n_filename, 4); enc = gen_xmlCharEncoding(n_enc, 5); @@ -1717,7 +1717,7 @@ test_htmlCtxtReadMemory(void) { mem_base = xmlMemBlocks(); ctxt = gen_htmlParserCtxtPtr(n_ctxt, 0); buffer = gen_const_char_ptr(n_buffer, 1); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 2); URL = gen_filepath(n_URL, 3); encoding = gen_const_char_ptr(n_encoding, 4); options = gen_int(n_options, 5); @@ -2276,7 +2276,7 @@ test_htmlParseChunk(void) { mem_base = xmlMemBlocks(); ctxt = gen_htmlParserCtxtPtr(n_ctxt, 0); chunk = gen_const_char_ptr(n_chunk, 1); - size = chunk ? strlen(chunk) : 0; + size = gen_int(n_size, 2); terminate = gen_int(n_terminate, 3); ret_val = htmlParseChunk(ctxt, (const char *)chunk, size, terminate); @@ -2617,7 +2617,7 @@ test_htmlReadMemory(void) { for (n_options = 0;n_options < gen_nb_int;n_options++) { mem_base = xmlMemBlocks(); buffer = gen_const_char_ptr(n_buffer, 0); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 1); URL = gen_filepath(n_URL, 2); encoding = gen_const_char_ptr(n_encoding, 3); options = gen_int(n_options, 4); @@ -8220,7 +8220,7 @@ test_xmlDictExists(void) { mem_base = xmlMemBlocks(); dict = gen_xmlDictPtr(n_dict, 0); name = gen_const_xmlChar_ptr(n_name, 1); - len = name ? strlen((const char *)name) : 0; + len = gen_int(n_len, 2); ret_val = xmlDictExists(dict, (const xmlChar *)name, len); desret_const_xmlChar_ptr(ret_val); @@ -8276,7 +8276,7 @@ test_xmlDictLookup(void) { mem_base = xmlMemBlocks(); dict = gen_xmlDictPtr(n_dict, 0); name = gen_const_xmlChar_ptr(n_name, 1); - len = name ? strlen((const char *)name) : 0; + len = gen_int(n_len, 2); ret_val = xmlDictLookup(dict, (const xmlChar *)name, len); desret_const_xmlChar_ptr(ret_val); @@ -12725,7 +12725,7 @@ test_xmlCreatePushParserCtxt(void) { sax = gen_xmlSAXHandlerPtr(n_sax, 0); user_data = gen_userdata(n_user_data, 1); chunk = gen_const_char_ptr(n_chunk, 2); - size = chunk ? strlen(chunk) : 0; + size = gen_int(n_size, 3); filename = gen_fileoutput(n_filename, 4); ret_val = xmlCreatePushParserCtxt(sax, user_data, (const char *)chunk, size, filename); @@ -12901,7 +12901,7 @@ test_xmlCtxtReadMemory(void) { mem_base = xmlMemBlocks(); ctxt = gen_xmlParserCtxtPtr(n_ctxt, 0); buffer = gen_const_char_ptr(n_buffer, 1); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 2); URL = gen_filepath(n_URL, 3); encoding = gen_const_char_ptr(n_encoding, 4); options = gen_parseroptions(n_options, 5); @@ -12995,7 +12995,7 @@ test_xmlCtxtResetPush(void) { mem_base = xmlMemBlocks(); ctxt = gen_xmlParserCtxtPtr(n_ctxt, 0); chunk = gen_const_char_ptr(n_chunk, 1); - size = chunk ? strlen(chunk) : 0; + size = gen_int(n_size, 2); filename = gen_filepath(n_filename, 3); encoding = gen_const_char_ptr(n_encoding, 4); @@ -13707,7 +13707,7 @@ test_xmlParseChunk(void) { mem_base = xmlMemBlocks(); ctxt = gen_xmlParserCtxtPtr(n_ctxt, 0); chunk = gen_const_char_ptr(n_chunk, 1); - size = chunk ? strlen(chunk) : 0; + size = gen_int(n_size, 2); terminate = gen_int(n_terminate, 3); ret_val = xmlParseChunk(ctxt, (const char *)chunk, size, terminate); @@ -14113,7 +14113,7 @@ test_xmlParseInNodeContext(void) { mem_base = xmlMemBlocks(); node = gen_xmlNodePtr(n_node, 0); data = gen_const_char_ptr(n_data, 1); - datalen = data ? strlen(data) : 0; + datalen = gen_int(n_datalen, 2); options = gen_parseroptions(n_options, 3); lst = gen_xmlNodePtr_ptr(n_lst, 4); @@ -14165,7 +14165,7 @@ test_xmlParseMemory(void) { for (n_size = 0;n_size < gen_nb_int;n_size++) { mem_base = xmlMemBlocks(); buffer = gen_const_char_ptr(n_buffer, 0); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 1); ret_val = xmlParseMemory((const char *)buffer, size); desret_xmlDocPtr(ret_val); @@ -14574,7 +14574,7 @@ test_xmlReadMemory(void) { for (n_options = 0;n_options < gen_nb_parseroptions;n_options++) { mem_base = xmlMemBlocks(); buffer = gen_const_char_ptr(n_buffer, 0); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 1); URL = gen_filepath(n_URL, 2); encoding = gen_const_char_ptr(n_encoding, 3); options = gen_parseroptions(n_options, 4); @@ -14699,7 +14699,7 @@ test_xmlRecoverMemory(void) { for (n_size = 0;n_size < gen_nb_int;n_size++) { mem_base = xmlMemBlocks(); buffer = gen_const_char_ptr(n_buffer, 0); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 1); ret_val = xmlRecoverMemory((const char *)buffer, size); desret_xmlDocPtr(ret_val); @@ -14999,7 +14999,7 @@ test_xmlSAXParseMemory(void) { mem_base = xmlMemBlocks(); sax = gen_xmlSAXHandlerPtr(n_sax, 0); buffer = gen_const_char_ptr(n_buffer, 1); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 2); recovery = gen_int(n_recovery, 3); ret_val = xmlSAXParseMemory(sax, (const char *)buffer, size, recovery); @@ -15059,7 +15059,7 @@ test_xmlSAXParseMemoryWithData(void) { mem_base = xmlMemBlocks(); sax = gen_xmlSAXHandlerPtr(n_sax, 0); buffer = gen_const_char_ptr(n_buffer, 1); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 2); recovery = gen_int(n_recovery, 3); data = gen_userdata(n_data, 4); @@ -15176,7 +15176,7 @@ test_xmlSAXUserParseMemory(void) { sax = gen_xmlSAXHandlerPtr(n_sax, 0); user_data = gen_userdata(n_user_data, 1); buffer = gen_const_char_ptr(n_buffer, 2); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 3); #ifdef LIBXML_SAX1_ENABLED if (sax == (xmlSAXHandlerPtr)&xmlDefaultSAXHandler) user_data = NULL; @@ -15947,7 +15947,7 @@ test_xmlCreateMemoryParserCtxt(void) { for (n_size = 0;n_size < gen_nb_int;n_size++) { mem_base = xmlMemBlocks(); buffer = gen_const_char_ptr(n_buffer, 0); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 1); ret_val = xmlCreateMemoryParserCtxt((const char *)buffer, size); desret_xmlParserCtxtPtr(ret_val); @@ -17572,7 +17572,7 @@ test_xmlRelaxNGNewMemParserCtxt(void) { for (n_size = 0;n_size < gen_nb_int;n_size++) { mem_base = xmlMemBlocks(); buffer = gen_const_char_ptr(n_buffer, 0); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 1); ret_val = xmlRelaxNGNewMemParserCtxt((const char *)buffer, size); desret_xmlRelaxNGParserCtxtPtr(ret_val); @@ -18590,7 +18590,7 @@ test_xmlBufferAdd(void) { mem_base = xmlMemBlocks(); buf = gen_xmlBufferPtr(n_buf, 0); str = gen_const_xmlChar_ptr(n_str, 1); - len = str ? strlen((const char *)str) : 0; + len = gen_int(n_len, 2); ret_val = xmlBufferAdd(buf, (const xmlChar *)str, len); desret_int(ret_val); @@ -18636,7 +18636,7 @@ test_xmlBufferAddHead(void) { mem_base = xmlMemBlocks(); buf = gen_xmlBufferPtr(n_buf, 0); str = gen_const_xmlChar_ptr(n_str, 1); - len = str ? strlen((const char *)str) : 0; + len = gen_int(n_len, 2); ret_val = xmlBufferAddHead(buf, (const xmlChar *)str, len); desret_int(ret_val); @@ -19208,7 +19208,7 @@ test_xmlBuildQName(void) { ncname = gen_const_xmlChar_ptr(n_ncname, 0); prefix = gen_const_xmlChar_ptr(n_prefix, 1); memory = gen_xmlChar_ptr(n_memory, 2); - len = memory ? strlen((const char *)memory) : 0; + len = gen_int(n_len, 3); ret_val = xmlBuildQName((const xmlChar *)ncname, (const xmlChar *)prefix, memory, len); if ((ret_val != NULL) && (ret_val != ncname) && @@ -20032,7 +20032,7 @@ test_xmlDocDumpFormatMemory(void) { mem_base = xmlMemBlocks(); cur = gen_xmlDocPtr(n_cur, 0); mem = gen_xmlChar_ptr_ptr(n_mem, 1); - size = NULL; + size = gen_int_ptr(n_size, 2); format = gen_int(n_format, 3); xmlDocDumpFormatMemory(cur, mem, size, format); @@ -20088,7 +20088,7 @@ test_xmlDocDumpFormatMemoryEnc(void) { mem_base = xmlMemBlocks(); out_doc = gen_xmlDocPtr(n_out_doc, 0); doc_txt_ptr = gen_xmlChar_ptr_ptr(n_doc_txt_ptr, 1); - doc_txt_len = NULL; + doc_txt_len = gen_int_ptr(n_doc_txt_len, 2); txt_encoding = gen_const_char_ptr(n_txt_encoding, 3); format = gen_int(n_format, 4); @@ -20142,7 +20142,7 @@ test_xmlDocDumpMemory(void) { mem_base = xmlMemBlocks(); cur = gen_xmlDocPtr(n_cur, 0); mem = gen_xmlChar_ptr_ptr(n_mem, 1); - size = NULL; + size = gen_int_ptr(n_size, 2); xmlDocDumpMemory(cur, mem, size); call_tests++; @@ -20979,7 +20979,7 @@ test_xmlNewCDataBlock(void) { mem_base = xmlMemBlocks(); doc = gen_xmlDocPtr(n_doc, 0); content = gen_const_xmlChar_ptr(n_content, 1); - len = content ? strlen((const char *)content) : 0; + len = gen_int(n_len, 2); ret_val = xmlNewCDataBlock(doc, (const xmlChar *)content, len); desret_xmlNodePtr(ret_val); @@ -21552,7 +21552,7 @@ test_xmlNewDocTextLen(void) { mem_base = xmlMemBlocks(); doc = gen_xmlDocPtr(n_doc, 0); content = gen_const_xmlChar_ptr(n_content, 1); - len = content ? strlen((const char *)content) : 0; + len = gen_int(n_len, 2); ret_val = xmlNewDocTextLen(doc, (const xmlChar *)content, len); desret_xmlNodePtr(ret_val); @@ -22095,7 +22095,7 @@ test_xmlNewTextLen(void) { for (n_len = 0;n_len < gen_nb_int;n_len++) { mem_base = xmlMemBlocks(); content = gen_const_xmlChar_ptr(n_content, 0); - len = content ? strlen((const char *)content) : 0; + len = gen_int(n_len, 1); ret_val = xmlNewTextLen((const xmlChar *)content, len); desret_xmlNodePtr(ret_val); @@ -22208,7 +22208,7 @@ test_xmlNodeAddContentLen(void) { mem_base = xmlMemBlocks(); cur = gen_xmlNodePtr(n_cur, 0); content = gen_const_xmlChar_ptr(n_content, 1); - len = content ? strlen((const char *)content) : 0; + len = gen_int(n_len, 2); xmlNodeAddContentLen(cur, (const xmlChar *)content, len); call_tests++; @@ -22758,7 +22758,7 @@ test_xmlNodeSetContentLen(void) { mem_base = xmlMemBlocks(); cur = gen_xmlNodePtr(n_cur, 0); content = gen_const_xmlChar_ptr(n_content, 1); - len = content ? strlen((const char *)content) : 0; + len = gen_int(n_len, 2); xmlNodeSetContentLen(cur, (const xmlChar *)content, len); call_tests++; @@ -23740,7 +23740,7 @@ test_xmlSplitQName3(void) { for (n_len = 0;n_len < gen_nb_int_ptr;n_len++) { mem_base = xmlMemBlocks(); name = gen_const_xmlChar_ptr(n_name, 0); - len = NULL; + len = gen_int_ptr(n_len, 1); ret_val = xmlSplitQName3((const xmlChar *)name, len); desret_const_xmlChar_ptr(ret_val); @@ -23822,7 +23822,7 @@ test_xmlStringLenGetNodeList(void) { mem_base = xmlMemBlocks(); doc = gen_const_xmlDoc_ptr(n_doc, 0); value = gen_const_xmlChar_ptr(n_value, 1); - len = value ? strlen((const char *)value) : 0; + len = gen_int(n_len, 2); ret_val = xmlStringLenGetNodeList((const xmlDoc *)doc, (const xmlChar *)value, len); desret_xmlNodePtr(ret_val); @@ -23868,7 +23868,7 @@ test_xmlTextConcat(void) { mem_base = xmlMemBlocks(); node = gen_xmlNodePtr(n_node, 0); content = gen_const_xmlChar_ptr(n_content, 1); - len = content ? strlen((const char *)content) : 0; + len = gen_int(n_len, 2); ret_val = xmlTextConcat(node, (const xmlChar *)content, len); desret_int(ret_val); @@ -28659,8 +28659,8 @@ test_xmlOutputBufferWrite(void) { for (n_buf = 0;n_buf < gen_nb_const_char_ptr;n_buf++) { mem_base = xmlMemBlocks(); out = gen_xmlOutputBufferPtr(n_out, 0); + len = gen_int(n_len, 1); buf = gen_const_char_ptr(n_buf, 2); - len = buf ? strlen(buf) : 0; ret_val = xmlOutputBufferWrite(out, len, (const char *)buf); desret_int(ret_val); @@ -28885,7 +28885,7 @@ test_xmlParserInputBufferCreateMem(void) { for (n_enc = 0;n_enc < gen_nb_xmlCharEncoding;n_enc++) { mem_base = xmlMemBlocks(); mem = gen_const_char_ptr(n_mem, 0); - size = mem ? strlen(mem) : 0; + size = gen_int(n_size, 1); enc = gen_xmlCharEncoding(n_enc, 2); ret_val = xmlParserInputBufferCreateMem((const char *)mem, size, enc); @@ -28931,7 +28931,7 @@ test_xmlParserInputBufferCreateStatic(void) { for (n_enc = 0;n_enc < gen_nb_xmlCharEncoding;n_enc++) { mem_base = xmlMemBlocks(); mem = gen_const_char_ptr(n_mem, 0); - size = mem ? strlen(mem) : 0; + size = gen_int(n_size, 1); enc = gen_xmlCharEncoding(n_enc, 2); ret_val = xmlParserInputBufferCreateStatic((const char *)mem, size, enc); @@ -29016,8 +29016,8 @@ test_xmlParserInputBufferPush(void) { for (n_buf = 0;n_buf < gen_nb_const_char_ptr;n_buf++) { mem_base = xmlMemBlocks(); in = gen_xmlParserInputBufferPtr(n_in, 0); + len = gen_int(n_len, 1); buf = gen_const_char_ptr(n_buf, 2); - len = buf ? strlen(buf) : 0; ret_val = xmlParserInputBufferPush(in, len, (const char *)buf); desret_int(ret_val); @@ -30196,7 +30196,7 @@ test_xmlReaderForMemory(void) { for (n_options = 0;n_options < gen_nb_parseroptions;n_options++) { mem_base = xmlMemBlocks(); buffer = gen_const_char_ptr(n_buffer, 0); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 1); URL = gen_filepath(n_URL, 2); encoding = gen_const_char_ptr(n_encoding, 3); options = gen_parseroptions(n_options, 4); @@ -30379,7 +30379,7 @@ test_xmlReaderNewMemory(void) { mem_base = xmlMemBlocks(); reader = gen_xmlTextReaderPtr(n_reader, 0); buffer = gen_const_char_ptr(n_buffer, 1); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 2); URL = gen_filepath(n_URL, 3); encoding = gen_const_char_ptr(n_encoding, 4); options = gen_parseroptions(n_options, 5); @@ -34419,7 +34419,7 @@ test_xmlSchemaNewMemParserCtxt(void) { for (n_size = 0;n_size < gen_nb_int;n_size++) { mem_base = xmlMemBlocks(); buffer = gen_const_char_ptr(n_buffer, 0); - size = buffer ? strlen(buffer) : 0; + size = gen_int(n_size, 1); ret_val = xmlSchemaNewMemParserCtxt((const char *)buffer, size); desret_xmlSchemaParserCtxtPtr(ret_val); @@ -36303,7 +36303,7 @@ test_xmlCharStrndup(void) { for (n_len = 0;n_len < gen_nb_int;n_len++) { mem_base = xmlMemBlocks(); cur = gen_const_char_ptr(n_cur, 0); - len = cur ? strlen(cur) : 0; + len = gen_int(n_len, 1); ret_val = xmlCharStrndup((const char *)cur, len); desret_xmlChar_ptr(ret_val); @@ -36788,7 +36788,7 @@ test_xmlStrncatNew(void) { mem_base = xmlMemBlocks(); str1 = gen_const_xmlChar_ptr(n_str1, 0); str2 = gen_const_xmlChar_ptr(n_str2, 1); - len = str2 ? strlen((const char *)str2) : 0; + len = gen_int(n_len, 2); ret_val = xmlStrncatNew((const xmlChar *)str1, (const xmlChar *)str2, len); desret_xmlChar_ptr(ret_val); @@ -36834,7 +36834,7 @@ test_xmlStrncmp(void) { mem_base = xmlMemBlocks(); str1 = gen_const_xmlChar_ptr(n_str1, 0); str2 = gen_const_xmlChar_ptr(n_str2, 1); - len = str2 ? strlen((const char *)str2) : 0; + len = gen_int(n_len, 2); ret_val = xmlStrncmp((const xmlChar *)str1, (const xmlChar *)str2, len); desret_int(ret_val); @@ -36876,7 +36876,7 @@ test_xmlStrndup(void) { for (n_len = 0;n_len < gen_nb_int;n_len++) { mem_base = xmlMemBlocks(); cur = gen_const_xmlChar_ptr(n_cur, 0); - len = cur ? strlen((const char *)cur) : 0; + len = gen_int(n_len, 1); ret_val = xmlStrndup((const xmlChar *)cur, len); desret_xmlChar_ptr(ret_val); @@ -36958,8 +36958,7 @@ test_xmlStrsub(void) { mem_base = xmlMemBlocks(); str = gen_const_xmlChar_ptr(n_str, 0); start = gen_int(n_start, 1); - len = str ? strlen((const char *)str) : 0; - len = ((len > 0) && (len > start)) ? (len - start) : 0; + len = gen_int(n_len, 2); ret_val = xmlStrsub((const xmlChar *)str, start, len); desret_xmlChar_ptr(ret_val); @@ -44576,8 +44575,7 @@ test_xmlTextWriterWriteBase64(void) { writer = gen_xmlTextWriterPtr(n_writer, 0); data = gen_const_char_ptr(n_data, 1); start = gen_int(n_start, 2); - len = data ? strlen(data) : 0; - len = ((len > 0) && (len > start)) ? (len - start) : 0; + len = gen_int(n_len, 3); ret_val = xmlTextWriterWriteBase64(writer, (const char *)data, start, len); desret_int(ret_val); @@ -44632,8 +44630,7 @@ test_xmlTextWriterWriteBinHex(void) { writer = gen_xmlTextWriterPtr(n_writer, 0); data = gen_const_char_ptr(n_data, 1); start = gen_int(n_start, 2); - len = data ? strlen(data) : 0; - len = ((len > 0) && (len > start)) ? (len - start) : 0; + len = gen_int(n_len, 3); ret_val = xmlTextWriterWriteBinHex(writer, (const char *)data, start, len); desret_int(ret_val); @@ -45563,7 +45560,7 @@ test_xmlTextWriterWriteRawLen(void) { mem_base = xmlMemBlocks(); writer = gen_xmlTextWriterPtr(n_writer, 0); content = gen_const_xmlChar_ptr(n_content, 1); - len = content ? strlen((const char *)content) : 0; + len = gen_int(n_len, 2); ret_val = xmlTextWriterWriteRawLen(writer, (const xmlChar *)content, len); desret_int(ret_val);