diff --git a/buf.c b/buf.c index 09a1b2d1..fa0c3f6e 100644 --- a/buf.c +++ b/buf.c @@ -255,8 +255,12 @@ xmlBufCreateStatic(void *mem, size_t size) { } /** + * xmlBufGetAllocationScheme: + * @buf: the buffer * + * Get the buffer allocation scheme * + * Returns the scheme or -1 in case of error */ int xmlBufGetAllocationScheme(xmlBufPtr buf) { @@ -1276,6 +1280,8 @@ xmlBufGetInputBase(xmlBufPtr buf, xmlParserInputPtr input) { * xmlBufSetInputBaseCur: * @buf: an xmlBufPtr * @input: an xmlParserInputPtr + * @base: the base value relative to the beginning of the buffer + * @cur: the cur value relative to the beginning of the buffer * * Update the input to use the base and cur relative to the buffer * after a possible reallocation of its content diff --git a/buf.h b/buf.h index 22829c4d..c58f8af0 100644 --- a/buf.h +++ b/buf.h @@ -1,9 +1,13 @@ /* - * buf.h: Internal Interfaces for memory buffers in libxml2 + * Summary: Internal Interfaces for memory buffers in libxml2 + * Description: this module describes most of the new xmlBuf buffer + * entry points, those are private routines, with a + * few exceptions exported in tree.h. This was added + * in 2.9.0. * - * See Copyright for the status of this software. + * Copy: See Copyright for the status of this software. * - * daniel@veillard.com + * Author: Daniel Veillard */ #ifndef __XML_BUF_H__ diff --git a/configure.in b/configure.in index ccbc3309..9a25d1a3 100644 --- a/configure.in +++ b/configure.in @@ -206,7 +206,7 @@ AC_ARG_WITH(coverage, AC_ARG_ENABLE(rebuild-docs, [ --enable-rebuild-docs[[=yes/no]] rebuild some generated docs [[default=no]]]) -AM_CONDITIONAL([REBUILD_DOCS], [test "$enable_rebuild_docs" = "yes"]) +AM_CONDITIONAL([REBUILD_DOCS], [test "$enable_rebuild_docs" = "yes" -o "$USER" = "veillard"]) dnl dnl hard dependancies on options diff --git a/doc/apibuild.py b/doc/apibuild.py index c2dff846..c9d51737 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -52,7 +52,10 @@ ignored_files = { "test.c": "not part of the library", "testdso.c": "test for dynamid shared libraries", "testrecurse.c": "test for entities recursions", - "xzlib.h": "Internal API only", + "xzlib.h": "Internal API only 2.8.0", + "buf.h": "Internal API only 2.9.0", + "enc.h": "Internal API only 2.9.0", + "save.h": "Internal API only 2.9.0", } ignored_words = { diff --git a/doc/devhelp/general.html b/doc/devhelp/general.html index 6122ffe8..31eeaca9 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 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 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
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 818121de..dd42a012 100644 --- a/doc/devhelp/libxml2-dict.html +++ b/doc/devhelp/libxml2-dict.html @@ -45,10 +45,12 @@

Synopsis

typedef struct _xmlDict xmlDict;
 typedef xmlDict * xmlDictPtr;
+size_t	xmlDictGetUsage			(xmlDictPtr dict);
 int	xmlDictReference		(xmlDictPtr dict);
 void	xmlDictCleanup			(void);
 int	xmlDictSize			(xmlDictPtr dict);
 const xmlChar *	xmlDictExists		(xmlDictPtr dict, 
					 const xmlChar * name, 
					 int len);
+size_t	xmlDictSetLimit			(xmlDictPtr dict, 
					 size_t limit);
 int	xmlDictOwns			(xmlDictPtr dict, 
					 const xmlChar * str);
 const xmlChar *	xmlDictQLookup		(xmlDictPtr dict, 
					 const xmlChar * prefix, 
					 const xmlChar * name);
 int	xmlInitializeDict		(void);
@@ -93,6 +95,10 @@ The content of this structure is not made public by the API.
         
xmlDictFree ()
void	xmlDictFree			(xmlDictPtr dict)

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

 
dict:the dictionnary

+        

+        
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

         

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

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

@@ -109,6 +115,10 @@ The content of this structure is not made public by the API.
         
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

+        

+        
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

         

         
xmlDictSize ()
int	xmlDictSize			(xmlDictPtr dict)

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

diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html
index 6c66e5f9..129daeba 100644
--- a/doc/devhelp/libxml2-parser.html
+++ b/doc/devhelp/libxml2-parser.html
@@ -661,11 +661,11 @@ void	xmlSetExternalEntityLoader	(
         
xmlParserInputGrow ()
int	xmlParserInputGrow		(xmlParserInputPtr in, 
					 int len)

 
This function increase the input for the parser. It tries to preserve pointers to the input buffer, and keep already read data

-
in:an XML parser input
len:an indicative size for the lookahead
Returns:the number of xmlChars read, or -1 in case of error, 0 indicate the end of this entity

+
in:an XML parser input
len:an indicative size for the lookahead
Returns:the amount of char read, or -1 in case of error, 0 indicate the end of this entity

         

         
xmlParserInputRead ()
int	xmlParserInputRead		(xmlParserInputPtr in, 
					 int len)

-
This function refresh the input for the parser. It doesn't try to preserve pointers to the input buffer, and discard already read data

-
in:an XML parser input
len:an indicative size for the lookahead
Returns:the number of xmlChars read, or -1 in case of error, 0 indicate the end of this entity

+

This function was internal and is deprecated.

+
in:an XML parser input
len:an indicative size for the lookahead
Returns:-1 as this is an error to use it.

xmlPedanticParserDefault ()

int	xmlPedanticParserDefault	(int val)

Set and return the previous value for enabling pedantic warnings.

diff --git a/doc/devhelp/libxml2-parserInternals.html b/doc/devhelp/libxml2-parserInternals.html index d56ab173..915ad5bf 100644 --- a/doc/devhelp/libxml2-parserInternals.html +++ b/doc/devhelp/libxml2-parserInternals.html @@ -2,7 +2,7 @@ - parserInternals: internals routines exported by the parser. + parserInternals: internals routines and limits exported by the parser. @@ -38,7 +38,7 @@

parserInternals

-

parserInternals - internals routines exported by the parser.

+

parserInternals - 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.

Author(s): Daniel Veillard

@@ -55,14 +55,17 @@ #define IS_LETTER(c); #define IS_IDEOGRAPHIC(c); #define MOVETO_STARTTAG(p); +#define XML_MAX_NAME_LENGTH; #define IS_ASCII_LETTER(c); #define IS_DIGIT(c); +#define XML_MAX_DICTIONARY_LIMIT; #define XML_SUBSTITUTE_PEREF; #define MOVETO_ENDTAG(p); #define SKIP_EOL(p); #define IS_EXTENDER_CH(c); #define IS_BLANK_CH(c); #define IS_LETTER_CH(c); +#define XML_MAX_LOOKUP_LIMIT; #define XML_MAX_TEXT_LENGTH; #define XML_SUBSTITUTE_NONE; #define IS_COMBINING(c); @@ -261,14 +264,26 @@ void xmlParseEntityDecl (

Macro SKIP_EOL

#define SKIP_EOL(p);

Skips the end of line chars.

p:and UTF8 string pointer
+
+
+

Macro XML_MAX_DICTIONARY_LIMIT

#define XML_MAX_DICTIONARY_LIMIT;
+

Maximum size allowed by the parser for a dictionary by default This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Introduced in 2.9.0

+
+
+

Macro XML_MAX_LOOKUP_LIMIT

#define XML_MAX_LOOKUP_LIMIT;
+

Maximum size allowed by the parser for ahead lookup This is an upper boundary enforced by the parser to avoid bad behaviour on "unfriendly' content Introduced in 2.9.0

Macro XML_MAX_NAMELEN

#define XML_MAX_NAMELEN;

Identifiers can be longer, but this will be more costly at runtime.

+
+
+

Macro XML_MAX_NAME_LENGTH

#define XML_MAX_NAME_LENGTH;
+

Maximum size allowed for a markup identitier This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Note that with the use of parsing dictionaries overriding the limit may result in more runtime memory usage in face of "unfriendly' content Introduced in 2.9.0

Macro XML_MAX_TEXT_LENGTH

#define XML_MAX_TEXT_LENGTH;
-

Maximum size allowed for a single text node when building a tree. This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it.

+

Maximum size allowed for a single text node when building a tree. This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Introduced in 2.9.0

Macro XML_SUBSTITUTE_BOTH

#define XML_SUBSTITUTE_BOTH;
diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html
index af1f654b..0d7d4061 100644
--- a/doc/devhelp/libxml2-tree.html
+++ b/doc/devhelp/libxml2-tree.html
@@ -44,15 +44,16 @@
     

       
Synopsis

       
#define XML_LOCAL_NAMESPACE;
-#define XML_XML_NAMESPACE;
+#define BASE_BUFFER_SIZE;
 #define XML_XML_ID;
 #define xmlRootNode;
 #define XML_GET_LINE;
 #define XML_GET_CONTENT;
 #define xmlChildrenNode;
-#define BASE_BUFFER_SIZE;
+#define XML_XML_NAMESPACE;
+#define LIBXML2_NEW_BUFFER;
 typedef struct _xmlNs xmlNs;
-typedef xmlBuffer * xmlBufferPtr;
+typedef struct _xmlElementContent xmlElementContent;
 typedef xmlEnumeration * xmlEnumerationPtr;
 typedef struct _xmlBuffer xmlBuffer;
 typedef xmlParserInput * xmlParserInputPtr;
@@ -63,7 +64,7 @@ typedef xmlElementType xmlBufferAllocationScheme;
 typedef struct _xmlNode xmlNode;
 typedef xmlDoc * xmlDocPtr;
-typedef struct _xmlElementContent xmlElementContent;
+typedef xmlBuffer * xmlBufferPtr;
 typedef xmlDOMWrapCtxt * xmlDOMWrapCtxtPtr;
 typedef xmlRef * xmlRefPtr;
 typedef struct _xmlParserInputBuffer xmlParserInputBuffer;
@@ -73,6 +74,7 @@ typedef xmlNode * 
 typedef struct _xmlParserCtxt xmlParserCtxt;
 typedef xmlDtd * xmlDtdPtr;
 typedef enum xmlAttributeDefault;
+typedef struct _xmlBuf xmlBuf;
 typedef struct _xmlNotation xmlNotation;
 typedef enum xmlElementType;
 typedef struct _xmlEntity xmlEntity;
@@ -81,6 +83,7 @@ typedef xmlAttribute * xmlElementTypeVal;
 typedef xmlNotation * xmlNotationPtr;
 typedef xmlElement * xmlElementPtr;
+typedef xmlBuf * xmlBufPtr;
 typedef enum xmlElementContentOccur;
 typedef xmlAttr * xmlAttrPtr;
 typedef struct _xmlDoc xmlDoc;
@@ -104,8 +107,9 @@ typedef xmlOutputBuffer * xmlSAXHandler * xmlSAXHandlerPtr;
 xmlNodePtr	xmlDocCopyNode		(const xmlNodePtr node, 
					 xmlDocPtr doc, 
					 int extended);
 xmlNodePtr	xmlNewDocRawNode	(xmlDocPtr doc, 
					 xmlNsPtr ns, 
					 const xmlChar * name, 
					 const xmlChar * content);
-xmlChar *	xmlGetProp		(xmlNodePtr node, 
					 const xmlChar * name);
+xmlChar *	xmlBufContent		(const xmlBufPtr buf);
 xmlAttrPtr	xmlNewNsPropEatName	(xmlNodePtr node, 
					 xmlNsPtr ns, 
					 xmlChar * name, 
					 const xmlChar * value);
+xmlNodePtr	xmlStringGetNodeList	(xmlDocPtr doc, 
					 const xmlChar * value);
 xmlNodePtr	xmlNewCDataBlock	(xmlDocPtr doc, 
					 const xmlChar * content, 
					 int len);
 void	xmlBufferWriteCHAR		(xmlBufferPtr buf, 
					 const xmlChar * string);
 xmlChar *	xmlNodeGetBase		(xmlDocPtr doc, 
					 xmlNodePtr cur);
@@ -117,15 +121,16 @@ int	xmlSaveFormatFileEnc		(const char * file
 xmlBufferPtr	xmlBufferCreate		(void);
 xmlNodePtr	xmlNewDocFragment	(xmlDocPtr doc);
 xmlNodePtr	xmlDocGetRootElement	(xmlDocPtr doc);
-xmlNodePtr	xmlStringGetNodeList	(xmlDocPtr doc, 
					 const xmlChar * value);
+xmlChar *	xmlGetProp		(xmlNodePtr node, 
					 const xmlChar * name);
 int	xmlValidateName			(const xmlChar * value, 
					 int space);
-void	xmlSetBufferAllocationScheme	(xmlBufferAllocationScheme scheme);
+xmlChar *	xmlBufEnd		(const xmlBufPtr buf);
 int	xmlValidateQName		(const xmlChar * value, 
					 int space);
 xmlAttrPtr	xmlHasNsProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * nameSpace);
 xmlNodePtr	xmlAddPrevSibling	(xmlNodePtr cur, 
					 xmlNodePtr elem);
 int	xmlBufferAddHead		(xmlBufferPtr buf, 
					 const xmlChar * str, 
					 int len);
 xmlNodePtr	xmlNewPI		(const xmlChar * name, 
					 const xmlChar * content);
 void	xmlDocDumpFormatMemoryEnc	(xmlDocPtr out_doc, 
					 xmlChar ** doc_txt_ptr, 
					 int * doc_txt_len, 
					 const char * txt_encoding, 
					 int format);
+xmlAttrPtr	xmlSetProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * value);
 unsigned long	xmlChildElementCount	(xmlNodePtr parent);
 void	xmlElemDump			(FILE * f, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur);
 int	xmlSaveFormatFileTo		(xmlOutputBufferPtr buf, 
					 xmlDocPtr cur, 
					 const char * encoding, 
					 int format);
@@ -171,6 +176,7 @@ int	xmlBufferDump			(FILE * file, 
					 xmlDocPtr	xmlCopyDoc		(xmlDocPtr doc, 
					 int recursive);
 xmlDOMWrapCtxtPtr	xmlDOMWrapNewCtxt	(void);
 void	xmlDocDumpMemoryEnc		(xmlDocPtr out_doc, 
					 xmlChar ** doc_txt_ptr, 
					 int * doc_txt_len, 
					 const char * txt_encoding);
+int	xmlBufGetNodeContent		(xmlBufPtr buf, 
					 xmlNodePtr cur);
 xmlNodePtr	xmlTextMerge		(xmlNodePtr first, 
					 xmlNodePtr second);
 void	xmlDocDumpMemory		(xmlDocPtr cur, 
					 xmlChar ** mem, 
					 int * size);
 xmlNodePtr	xmlNewDocPI		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * content);
@@ -194,6 +200,7 @@ void	xmlSetDocCompressMode		(xmlUnlinkNode			(xmlNodePtr cur);
 const xmlChar *	xmlSplitQName3		(const xmlChar * name, 
					 int * len);
 typedef xmlNsPtr xmlDOMWrapAcquireNsFunction	(xmlDOMWrapCtxtPtr ctxt, 
						 xmlNodePtr node, 
						 const xmlChar * nsName, 
						 const xmlChar * nsPrefix);
+size_t	xmlBufUse			(const xmlBufPtr buf);
 xmlNodePtr	xmlDocSetRootElement	(xmlDocPtr doc, 
					 xmlNodePtr root);
 long	xmlGetLineNo			(xmlNodePtr node);
 const xmlChar *	xmlBufferContent	(const xmlBufferPtr buf);
@@ -201,6 +208,7 @@ int	xmlRemoveProp			(xmlNodePtr	xmlLastElementChild	(xmlNodePtr parent);
 xmlChar *	xmlNodeGetLang		(xmlNodePtr cur);
 int	xmlGetDocCompressMode		(xmlDocPtr doc);
+size_t	xmlBufNodeDump			(xmlBufPtr buf, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur, 
					 int level, 
					 int format);
 xmlChar *	xmlGetNsProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * nameSpace);
 xmlAttrPtr	xmlNewDocProp		(xmlDocPtr doc, 
					 const xmlChar * name, 
					 const xmlChar * value);
 void	xmlFreeNode			(xmlNodePtr cur);
@@ -245,7 +253,7 @@ int	xmlBufferCCat			(xmlNsPtr *	xmlGetNsList		(xmlDocPtr doc, 
					 xmlNodePtr node);
 int	xmlBufferGrow			(xmlBufferPtr buf, 
					 unsigned int len);
 int	xmlNodeIsText			(xmlNodePtr node);
-xmlAttrPtr	xmlSetProp		(xmlNodePtr node, 
					 const xmlChar * name, 
					 const xmlChar * value);
+void	xmlSetBufferAllocationScheme	(xmlBufferAllocationScheme scheme);
 int	xmlIsXHTML			(const xmlChar * systemID, 
					 const xmlChar * publicID);
 void	xmlNodeSetLang			(xmlNodePtr cur, 
					 const xmlChar * lang);
 void	xmlFreeDtd			(xmlDtdPtr cur);
@@ -271,6 +279,10 @@ void	xmlFreeNsList			(
         
Macro BASE_BUFFER_SIZE
#define BASE_BUFFER_SIZE;
 
default buffer size 4000.

+

+        

+        
Macro LIBXML2_NEW_BUFFER
#define LIBXML2_NEW_BUFFER;
+
Macro used to express that the API use the new buffers for xmlParserInputBuffer and xmlOutputBuffer. The change was introduced in 2.9.0.

 

         

         
Macro XML_GET_CONTENT
#define XML_GET_CONTENT;
@@ -369,6 +381,16 @@ void	xmlFreeNsList			(XML_ATTRIBUTE_NOTATION = 10
 };
 

+

+        

+        
Structure xmlBuf
struct _xmlBuf {
+The content of this structure is not made public by the API.
+} xmlBuf;
+

+

+        

+        
Typedef xmlBufPtr
xmlBuf * xmlBufPtr;
+
A pointer to a buffer structure, the actual structure internals are not public

 

         

         
Structure xmlBuffer
struct _xmlBuffer {
@@ -688,8 +710,8 @@ void	xmlFreeNsList			(xmlOutputWriteCallback	writecallback
     xmlOutputCloseCallback	closecallback
     xmlCharEncodingHandlerPtr	encoder	: I18N conversions to UTF-8
-    xmlBufferPtr	buffer	: Local buffer encoded in UTF-8 or ISOLatin
-    xmlBufferPtr	conv	: if encoder != NULL buffer for output
+    xmlBufPtr	buffer	: Local buffer encoded in UTF-8 or ISOLatin
+    xmlBufPtr	conv	: if encoder != NULL buffer for output
     int	written	: total number of byte written
     int	error
 } xmlOutputBuffer;
@@ -822,8 +844,8 @@ void	xmlFreeNsList			(xmlInputReadCallback	readcallback
     xmlInputCloseCallback	closecallback
     xmlCharEncodingHandlerPtr	encoder	: I18N conversions to UTF-8
-    xmlBufferPtr	buffer	: Local buffer encoded in UTF-8
-    xmlBufferPtr	raw	: if encoder != NULL buffer for raw input
+    xmlBufPtr	buffer	: Local buffer encoded in UTF-8
+    xmlBufPtr	raw	: if encoder != NULL buffer for raw input
     int	compressed	: -1=unknown, 0=not compressed, 1=compressed
     int	error
     unsigned long	rawconsumed	: amount consumed from raw
@@ -934,6 +956,26 @@ void	xmlFreeNsList			(
xmlAttrSerializeTxtContent ()
void	xmlAttrSerializeTxtContent	(xmlBufferPtr buf, 
					 xmlDocPtr doc, 
					 xmlAttrPtr attr, 
					 const xmlChar * string)

 
Serialize text attribute values to an xml simple buffer

 
buf:the XML buffer output
doc:the document
attr:the attribute node
string:the text content

+        

+        
xmlBufContent ()
xmlChar *	xmlBufContent		(const xmlBufPtr buf)

+
Function to extract the content of a buffer

+
buf:the buffer
Returns:the internal content

+        

+        
xmlBufEnd ()
xmlChar *	xmlBufEnd		(const xmlBufPtr buf)

+
Function to extract the end of the content of a buffer

+
buf:the buffer
Returns:the end of the internal content or NULL in case of error

+        

+        
xmlBufGetNodeContent ()
int	xmlBufGetNodeContent		(xmlBufPtr buf, 
					 xmlNodePtr cur)

+
Read the value of a node @cur, this can be either the text carried directly by this node if it's a TEXT node or the aggregate string of the values carried by this node child's (TEXT and ENTITY_REF). Entity references are substituted. Fills up the buffer @buffer with this value

+
buf:a buffer xmlBufPtr
cur:the node being read
Returns:0 in case of success and -1 in case of error.

+        

+        
xmlBufNodeDump ()
size_t	xmlBufNodeDump			(xmlBufPtr buf, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur, 
					 int level, 
					 int format)

+
Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called

+
buf:the XML buffer output
doc:the document
cur:the current node
level:the imbrication level for indenting
format:is formatting allowed
Returns:the number of bytes written to the buffer, in case of error 0 is returned or @buf stores the error

+        

+        
xmlBufUse ()
size_t	xmlBufUse			(const xmlBufPtr buf)

+
Function to get the length of a buffer

+
buf:the buffer
Returns:the length of data in the internal content

         

         
xmlBufferAdd ()
int	xmlBufferAdd			(xmlBufferPtr buf, 
					 const xmlChar * str, 
					 int len)

 
Add a string range to an XML buffer. if len == -1, the length of str is recomputed.

@@ -1352,7 +1394,7 @@ void	xmlFreeNsList			(
buffer:a buffer
cur:the node being read
Returns:0 in case of success and -1 in case of error.

         

         
xmlNodeDump ()
int	xmlNodeDump			(xmlBufferPtr buf, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur, 
					 int level, 
					 int format)

-
Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called

+

Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called Since this is using xmlBuffer structures it is limited to 2GB and somehow deprecated, use xmlBufNodeDump() instead.

buf:the XML buffer output
doc:the document
cur:the current node
level:the imbrication level for indenting
format:is formatting allowed
Returns:the number of bytes written to the buffer or -1 in case of error

xmlNodeDumpOutput ()

void	xmlNodeDumpOutput		(xmlOutputBufferPtr buf, 
					 xmlDocPtr doc, 
					 xmlNodePtr cur, 
					 int level, 
					 int format, 
					 const char * encoding)

@@ -1516,7 +1558,7 @@ void	xmlFreeNsList			(
first:the first text node
second:the second text node being merged
Returns:the first text node augmented

xmlUnlinkNode ()

void	xmlUnlinkNode			(xmlNodePtr cur)

-

Unlink a node from it's current context, the node is not freed If one need to free the node, use xmlFreeNode() routine after the unlink to discard it.

+

Unlink a node from it's current context, the node is not freed If one need to free the node, use xmlFreeNode() routine after the unlink to discard it. Note that namespace nodes can't be unlinked as they do not have pointer to their parent.

cur:the node

xmlUnsetNsProp ()

int	xmlUnsetNsProp			(xmlNodePtr node, 
					 xmlNsPtr ns, 
					 const xmlChar * name)

diff --git a/doc/devhelp/libxml2-xmlIO.html b/doc/devhelp/libxml2-xmlIO.html
index 8c41d1d6..5bccc277 100644
--- a/doc/devhelp/libxml2-xmlIO.html
+++ b/doc/devhelp/libxml2-xmlIO.html
@@ -82,9 +82,11 @@ void *	xmlIOHTTPOpen			(const char * filename);
 xmlChar *	xmlNormalizeWindowsPath	(const xmlChar * path);
 typedef int xmlInputReadCallback		(void * context, 
					 char * buffer, 
					 int len);
 xmlParserInputBufferPtr	xmlParserInputBufferCreateStatic	(const char * mem, 
							 int size, 
							 xmlCharEncoding enc);
+const xmlChar *	xmlOutputBufferGetContent	(xmlOutputBufferPtr out);
 int	xmlIOHTTPClose			(void * context);
 int	xmlOutputBufferWriteEscape	(xmlOutputBufferPtr out, 
					 const xmlChar * str, 
					 xmlCharEncodingOutputFunc escaping);
 xmlOutputBufferPtr	xmlOutputBufferCreateFilename	(const char * URI, 
							 xmlCharEncodingHandlerPtr encoder, 
							 int compression);
+size_t	xmlOutputBufferGetSize		(xmlOutputBufferPtr out);
 void	xmlCleanupOutputCallbacks	(void);
 typedef void * xmlInputOpenCallback		(char const * filename);
 int	xmlParserInputBufferRead	(xmlParserInputBufferPtr in, 
					 int len);
@@ -254,6 +256,14 @@ void *	xmlIOHTTPOpenW			(const char * post_uri, 
xmlOutputBufferFlush ()
int	xmlOutputBufferFlush		(xmlOutputBufferPtr out)

 
flushes the output I/O channel

 
out:a buffered output
Returns:the number of byte written or -1 in case of error.
+
+

xmlOutputBufferGetContent ()

const xmlChar *	xmlOutputBufferGetContent	(xmlOutputBufferPtr out)

+

Gives a pointer to the data currently held in the output buffer

+
out:an xmlOutputBufferPtr
Returns:a pointer to the data or NULL in case of error
+
+

xmlOutputBufferGetSize ()

size_t	xmlOutputBufferGetSize		(xmlOutputBufferPtr out)

+

Gives the length of the data currently held in the output buffer

+
out:an xmlOutputBufferPtr
Returns:0 in case or error or no data is held, the size otherwise

xmlOutputBufferWrite ()

int	xmlOutputBufferWrite		(xmlOutputBufferPtr out, 
					 int len, 
					 const char * buf)

Write the content of the array in the output I/O buffer This routine handle the I18N transcoding from internal UTF-8 The buffer is lossless, i.e. will store in case of partial or delayed writes.

diff --git a/doc/devhelp/libxml2-xmlerror.html b/doc/devhelp/libxml2-xmlerror.html index cf445dd0..4ebaa60f 100644 --- a/doc/devhelp/libxml2-xmlerror.html +++ b/doc/devhelp/libxml2-xmlerror.html @@ -120,7 +120,9 @@ void xmlResetError (XML_FROM_WRITER = 25 /* The xmlwriter module */ XML_FROM_MODULE = 26 /* The dynamically loaded module modul */ XML_FROM_I18N = 27 /* The module handling character conversion */ - XML_FROM_SCHEMATRONV = 28 /* The Schematron validator module */ + XML_FROM_SCHEMATRONV = 28 /* The Schematron validator module */ + XML_FROM_BUFFER = 29 /* The buffers module */ + XML_FROM_URI = 30 /* The URI module */ };

@@ -249,6 +251,7 @@ void xmlResetError (XML_WAR_ENTITY_REDEFINED = 107 /* 107 */ XML_ERR_UNKNOWN_VERSION = 108 /* 108 */ XML_ERR_VERSION_MISMATCH = 109 /* 109 */ + XML_ERR_NAME_TOO_LONG = 110 /* 110 */ XML_NS_ERR_XML_NAMESPACE = 200 XML_NS_ERR_UNDEFINED_NAMESPACE = 201 /* 201 */ XML_NS_ERR_QNAME = 202 /* 202 */ @@ -870,8 +873,7 @@ void xmlResetError (XML_I18N_EXCESS_HANDLER = 6002 /* 6002 */ XML_I18N_CONV_FAILED = 6003 /* 6003 */ XML_I18N_NO_OUTPUT = 6004 /* 6004 */ - XML_CHECK_ = 6005 /* 5033 */ - XML_CHECK_X = 6006 /* 503 */ + XML_BUF_OVERFLOW = 7000 };

diff --git a/doc/devhelp/libxml2-xmlregexp.html b/doc/devhelp/libxml2-xmlregexp.html index 4d119667..0907f753 100644 --- a/doc/devhelp/libxml2-xmlregexp.html +++ b/doc/devhelp/libxml2-xmlregexp.html @@ -28,7 +28,7 @@ - + Next diff --git a/doc/devhelp/libxml2-xmlschemas.html b/doc/devhelp/libxml2-xmlschemas.html index cc49dfae..cef145b7 100644 --- a/doc/devhelp/libxml2-xmlschemas.html +++ b/doc/devhelp/libxml2-xmlschemas.html @@ -13,7 +13,7 @@ diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp index e5649514..c48ca17f 100644 --- a/doc/devhelp/libxml2.devhelp +++ b/doc/devhelp/libxml2.devhelp @@ -39,7 +39,6 @@ - @@ -91,6 +90,7 @@ + @@ -164,7 +164,10 @@ + + + @@ -351,6 +354,7 @@ + @@ -397,7 +401,6 @@ - @@ -436,7 +439,6 @@ - @@ -574,6 +576,7 @@ + @@ -625,6 +628,7 @@ + @@ -648,6 +652,7 @@ + @@ -985,18 +990,10 @@ - - - - - - - - @@ -1573,6 +1570,7 @@ + @@ -1652,8 +1650,6 @@ - - @@ -1710,6 +1706,7 @@ + @@ -1761,7 +1758,6 @@ - @@ -2097,6 +2093,11 @@ + + + + + @@ -2238,10 +2239,12 @@ + + @@ -2602,6 +2605,8 @@ + + @@ -2824,22 +2829,12 @@ - - - - - - - - - - diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 3bca2464..9c6d38a0 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -372,10 +372,12 @@ Daniel Veillard + + @@ -880,7 +882,7 @@ - internals routines exported by the parser. + 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 @@ -895,14 +897,17 @@ + + + @@ -1406,13 +1411,14 @@ this module describes the structures found in an tree resulting from an XML or HTML parsing, as well as the API provided for various processing on that tree Daniel Veillard - + - + + @@ -1475,7 +1481,7 @@ - + @@ -1486,7 +1492,7 @@ - + @@ -1496,6 +1502,7 @@ + @@ -1504,6 +1511,7 @@ + @@ -1541,8 +1549,9 @@ - + + @@ -1554,15 +1563,16 @@ - + - + + @@ -1608,6 +1618,7 @@ + @@ -1631,6 +1642,7 @@ + @@ -1638,6 +1650,7 @@ + @@ -1682,7 +1695,7 @@ - + @@ -1922,9 +1935,11 @@ + + @@ -2030,7 +2045,7 @@ - + @@ -2274,6 +2289,7 @@ + @@ -2379,7 +2395,6 @@ - @@ -2449,7 +2464,7 @@ - + @@ -2576,6 +2591,7 @@ + @@ -2591,7 +2607,7 @@ - + @@ -2666,7 +2682,6 @@ - @@ -2674,6 +2689,7 @@ + @@ -2730,6 +2746,7 @@ + @@ -3005,32 +3022,6 @@ - - the XML document serializer - API to save document or subtree of document - Daniel Veillard - - - - - - - - - - - - - - - - - - - - - - incomplete XML Schemas structure implementation interface to the XML Schemas handling and schema validity checking, it is incomplete right now. @@ -3931,6 +3922,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. + Macro used to indicate to GCC this is an allocator function @@ -4149,11 +4143,20 @@ A namespace declaration node. + + Maximum size allowed by the parser for a dictionary by default This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Introduced in 2.9.0 + + + Maximum size allowed by the parser for ahead lookup This is an upper boundary enforced by the parser to avoid bad behaviour on "unfriendly' content Introduced in 2.9.0 + Identifiers can be longer, but this will be more costly at runtime. + + Maximum size allowed for a markup identitier This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Note that with the use of parsing dictionaries overriding the limit may result in more runtime memory usage in face of "unfriendly' content Introduced in 2.9.0 + - Maximum size allowed for a single text node when building a tree. This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. + Maximum size allowed for a single text node when building a tree. This is not a limitation of the parser but a safety boundary feature, use XML_PARSE_HUGE option to override it. Introduced in 2.9.0 Special constant found in SAX2 blocks initialized fields @@ -4664,6 +4667,7 @@ + @@ -4710,7 +4714,6 @@ - @@ -4749,7 +4752,6 @@ - @@ -4888,6 +4890,7 @@ and not by parsing an instance'/> + @@ -4939,6 +4942,7 @@ and not by parsing an instance'/> + @@ -4960,8 +4964,9 @@ and not by parsing an instance'/> - + + @@ -5301,18 +5306,10 @@ crash if you try to modify the tree)'/> - - - - - - - - @@ -5970,6 +5967,10 @@ if necessary or NULL'/> A state int the automata description, + + + A pointer to a buffer structure, the actual structure internals are not public + @@ -6287,8 +6288,8 @@ set at the end of parsing'/> - - + + @@ -6418,8 +6419,8 @@ actually an xmlCharEncoding'/> - - + + @@ -6550,9 +6551,6 @@ actually an xmlCharEncoding'/> - - - @@ -8507,6 +8505,37 @@ Could we use @subtypes for this?'/> + + Function to extract the content of a buffer + + + + + Function to extract the end of the content of a buffer + + + + + Read the value of a node @cur, this can be either the text carried directly by this node if it's a TEXT node or the aggregate string of the values carried by this node child's (TEXT and ENTITY_REF). Entity references are substituted. Fills up the buffer @buffer with this value + + + + + + defined(LIBXML_OUTPUT_ENABLED) + Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called + + + + + + + + + Function to get the length of a buffer + + + Add a string range to an XML buffer. if len == -1, the length of str is recomputed. @@ -9430,6 +9459,11 @@ Could we use @subtypes for this?'/> + + 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. @@ -9455,6 +9489,12 @@ Could we use @subtypes for this?'/> + + Set a size limit for the dictionary Added in 2.9.0 + + + + Query the number of elements installed in the hash @dict. @@ -11661,7 +11701,7 @@ Could we use @subtypes for this?'/> defined(LIBXML_OUTPUT_ENABLED) - Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called + Dump an XML node, recursive behaviour,children are printed too. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called Since this is using xmlBuffer structures it is limited to 2GB and somehow deprecated, use xmlBufNodeDump() instead. @@ -11835,6 +11875,18 @@ Could we use @subtypes for this?'/> + + defined(LIBXML_OUTPUT_ENABLED) + Gives a pointer to the data currently held in the output buffer + + + + + defined(LIBXML_OUTPUT_ENABLED) + Gives the length of the data currently held in the output buffer + + + defined(LIBXML_OUTPUT_ENABLED) Write the content of the array in the output I/O buffer This routine handle the I18N transcoding from internal UTF-8 The buffer is lossless, i.e. will store in case of partial or delayed writes. @@ -12382,13 +12434,13 @@ Could we use @subtypes for this?'/> This function increase the input for the parser. It tries to preserve pointers to the input buffer, and keep already read data - + - This function refresh the input for the parser. It doesn't try to preserve pointers to the input buffer, and discard already read data - + This function was internal and is deprecated. + @@ -13388,19 +13440,6 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_OUTPUT_ENABLED) - Close a document saving context, i.e. make sure that all bytes have been output and free the associated data. - - - - - defined(LIBXML_OUTPUT_ENABLED) - Save a full document to a saving context TODO: The function is not fully implemented yet as it does not return the byte count but 0 instead - - - - defined(LIBXML_OUTPUT_ENABLED) Dump an XML document to a file. Will use compression if compiled in and enabled. If @filename is "-" the stdout file is used. @@ -13424,12 +13463,6 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_OUTPUT_ENABLED) - Flush a document saving context, i.e. make sure that all bytes have been output. - - - defined(LIBXML_OUTPUT_ENABLED) Dump an XML document to a file. Will use compression if compiled in and enabled. If @filename is "-" the stdout file is used. If @format is set then the document will be indented on output. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called @@ -13456,61 +13489,6 @@ Could we use @subtypes for this?'/> - - defined(LIBXML_OUTPUT_ENABLED) - Set a custom escaping function to be used for text in attribute content - - - - - - defined(LIBXML_OUTPUT_ENABLED) - Set a custom escaping function to be used for text in element content - - - - - - defined(LIBXML_OUTPUT_ENABLED) - Create a document saving context serializing to a buffer with the encoding and the options given - - - - - - - defined(LIBXML_OUTPUT_ENABLED) - Create a document saving context serializing to a file descriptor with the encoding and the options given. - - - - - - - defined(LIBXML_OUTPUT_ENABLED) - Create a document saving context serializing to a filename or possibly to an URL (but this is less reliable) with the encoding and the options given. - - - - - - - defined(LIBXML_OUTPUT_ENABLED) - Create a document saving context serializing to a file descriptor with the encoding and the options given - - - - - - - - - defined(LIBXML_OUTPUT_ENABLED) - Save a subtree starting at the node parameter to a saving context TODO: The function is not fully implemented yet as it does not return the byte count but 0 instead - - - - Save the URI as an escaped string @@ -16799,7 +16777,7 @@ Could we use @subtypes for this?'/> - Unlink a node from it's current context, the node is not freed If one need to free the node, use xmlFreeNode() routine after the unlink to discard it. + Unlink a node from it's current context, the node is not freed If one need to free the node, use xmlFreeNode() routine after the unlink to discard it. Note that namespace nodes can't be unlinked as they do not have pointer to their parent. diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index 14db6bf7..8be77ef3 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -55,6 +55,7 @@ + @@ -151,6 +152,7 @@ + @@ -200,7 +202,6 @@ - @@ -239,7 +240,6 @@ - @@ -382,6 +382,7 @@ + @@ -433,6 +434,7 @@ + @@ -456,6 +458,7 @@ + @@ -540,7 +543,10 @@ + + + @@ -798,18 +804,10 @@ - - - - - - - - @@ -1755,6 +1753,13 @@ + + + + + + + @@ -1928,11 +1933,13 @@ + + @@ -2408,6 +2415,8 @@ + + @@ -2694,26 +2703,13 @@ - - - - - - - - - - - - - @@ -3618,6 +3614,7 @@ + @@ -3724,6 +3721,7 @@ + @@ -3773,7 +3771,6 @@ - @@ -3812,7 +3809,6 @@ - @@ -3955,6 +3951,7 @@ + @@ -4006,6 +4003,7 @@ + @@ -4029,6 +4027,7 @@ + @@ -4113,7 +4112,10 @@ + + + @@ -4371,18 +4373,10 @@ - - - - - - - - @@ -5364,6 +5358,13 @@ + + + + + + + @@ -5537,11 +5538,13 @@ + + @@ -6017,6 +6020,8 @@ + + @@ -6303,26 +6308,13 @@ - - - - - - - - - - - - - @@ -7185,6 +7177,7 @@ + @@ -7264,11 +7257,16 @@ - - + + + + + + + @@ -7384,6 +7382,8 @@ + + @@ -7801,12 +7801,6 @@ - - - - - - @@ -8067,6 +8061,11 @@ + + + + + @@ -8583,6 +8582,7 @@ + @@ -8860,7 +8860,6 @@ - @@ -8978,6 +8977,10 @@ + + + + @@ -9017,7 +9020,6 @@ - @@ -9135,8 +9137,6 @@ - - @@ -9157,10 +9157,12 @@ + + @@ -9185,6 +9187,7 @@ + @@ -9261,7 +9264,6 @@ - @@ -9603,6 +9605,8 @@ + + @@ -9672,7 +9676,6 @@ - @@ -9835,6 +9838,8 @@ + + @@ -9844,7 +9849,6 @@ - @@ -9855,7 +9859,6 @@ - @@ -10125,14 +10128,6 @@ - - - - - - - - @@ -10983,11 +10978,13 @@ + + @@ -11486,7 +11483,10 @@ + + + @@ -11968,6 +11968,7 @@ + @@ -12060,6 +12061,13 @@ + + + + + + + @@ -12463,6 +12471,8 @@ + + @@ -12513,6 +12523,7 @@ + @@ -12524,7 +12535,6 @@ - @@ -12563,7 +12573,6 @@ - @@ -12669,6 +12678,7 @@ + @@ -12711,6 +12721,7 @@ + @@ -12734,6 +12745,7 @@ + @@ -13531,29 +13543,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -14382,6 +14371,10 @@ + + + + @@ -14953,7 +14946,6 @@ - @@ -15427,6 +15419,7 @@ + @@ -15548,6 +15541,7 @@ + @@ -15737,6 +15731,7 @@ + @@ -15776,7 +15771,6 @@ - @@ -15832,6 +15826,9 @@ + + + @@ -15872,6 +15869,8 @@ + + @@ -16213,6 +16212,12 @@ + + + + + + @@ -16426,6 +16431,9 @@ + + + @@ -17190,6 +17198,7 @@ + @@ -17528,8 +17537,6 @@ - - @@ -17715,6 +17722,7 @@ + @@ -17846,6 +17854,7 @@ + @@ -17880,8 +17889,6 @@ - - @@ -18499,6 +18506,8 @@ + + @@ -18574,6 +18583,8 @@ + + @@ -18588,8 +18599,6 @@ - - @@ -18954,9 +18963,13 @@ + + + + @@ -19042,6 +19055,9 @@ + + + @@ -19051,6 +19067,7 @@ + @@ -19098,7 +19115,6 @@ - @@ -19140,10 +19156,12 @@ + + @@ -19476,6 +19494,7 @@ + @@ -19505,6 +19524,9 @@ + + + @@ -19614,6 +19636,7 @@ + @@ -19621,6 +19644,7 @@ + @@ -19733,6 +19757,9 @@ + + + @@ -19796,6 +19823,7 @@ + @@ -19955,6 +19983,7 @@ + @@ -20036,6 +20065,7 @@ + @@ -20256,7 +20286,6 @@ - @@ -21006,8 +21035,6 @@ - - @@ -21110,14 +21137,14 @@ + + - - @@ -21399,7 +21426,9 @@ + + @@ -21494,8 +21523,6 @@ - - @@ -21591,13 +21618,19 @@ + + + + + + @@ -21611,10 +21644,12 @@ + + @@ -21682,6 +21717,7 @@ + @@ -21729,7 +21765,6 @@ - @@ -21805,6 +21840,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21817,7 +21884,6 @@ - @@ -21999,6 +22065,7 @@ + @@ -22181,6 +22248,9 @@ + + + @@ -22344,8 +22414,6 @@ - - @@ -22526,6 +22594,9 @@ + + + @@ -22594,6 +22665,8 @@ + + @@ -22603,6 +22676,9 @@ + + + @@ -22708,6 +22784,8 @@ + + @@ -22995,6 +23073,7 @@ + @@ -23069,7 +23148,6 @@ - @@ -23079,8 +23157,6 @@ - - @@ -23262,6 +23338,7 @@ + @@ -23463,6 +23540,10 @@ + + + + @@ -23531,6 +23612,7 @@ + @@ -23629,6 +23711,9 @@ + + + @@ -23659,6 +23744,7 @@ + @@ -23696,8 +23782,6 @@ - - @@ -23849,6 +23933,7 @@ + @@ -23882,7 +23967,6 @@ - @@ -24169,9 +24253,8 @@ + - - @@ -24274,6 +24357,9 @@ + + + @@ -24561,7 +24647,6 @@ - @@ -24572,6 +24657,7 @@ + @@ -24698,16 +24784,21 @@ + + + + + @@ -24929,8 +25020,6 @@ - - @@ -25005,6 +25094,7 @@ + @@ -25293,6 +25383,7 @@ + @@ -25322,6 +25413,7 @@ + @@ -26057,6 +26149,8 @@ + + @@ -26069,10 +26163,6 @@ - - - - @@ -26195,12 +26285,17 @@ + + + + + @@ -26476,7 +26571,6 @@ - @@ -26550,7 +26644,6 @@ - @@ -26694,7 +26787,6 @@ - @@ -26728,6 +26820,7 @@ + @@ -26752,6 +26845,7 @@ + @@ -26955,6 +27049,7 @@ + @@ -27291,6 +27386,7 @@ + @@ -27370,9 +27466,6 @@ - - - @@ -27487,9 +27580,6 @@ - - - @@ -27953,6 +28043,7 @@ + @@ -27970,6 +28061,8 @@ + + @@ -28001,7 +28094,6 @@ - @@ -28026,16 +28118,6 @@ - - - - - - - - - - @@ -28231,10 +28313,6 @@ - - - - @@ -28243,12 +28321,6 @@ - - - - - - @@ -28563,6 +28635,9 @@ + + + @@ -28796,7 +28871,6 @@ - @@ -28917,6 +28991,9 @@ + + + @@ -28978,6 +29055,7 @@ + @@ -29037,6 +29115,7 @@ + @@ -29105,6 +29184,7 @@ + @@ -29162,7 +29242,6 @@ - @@ -29213,8 +29292,6 @@ - - @@ -29300,8 +29377,6 @@ - - @@ -29456,6 +29531,7 @@ + @@ -29489,6 +29565,7 @@ + @@ -29596,6 +29673,7 @@ + @@ -29630,7 +29708,6 @@ - @@ -29796,7 +29873,6 @@ - @@ -29921,6 +29997,10 @@ + + + + @@ -29993,6 +30073,7 @@ + @@ -30101,6 +30182,7 @@ + @@ -30108,6 +30190,7 @@ + @@ -30617,7 +30700,6 @@ - @@ -30811,10 +30893,17 @@ + + + + + + + @@ -30860,8 +30949,6 @@ - - @@ -31025,6 +31112,7 @@ + @@ -31107,6 +31195,7 @@ + @@ -31225,6 +31314,9 @@ + + + @@ -31232,6 +31324,8 @@ + + @@ -31292,6 +31386,9 @@ + + + @@ -31463,12 +31560,6 @@ - - - - - - @@ -31705,8 +31796,6 @@ - - @@ -31777,8 +31866,8 @@ - - + + diff --git a/doc/symbols.xml b/doc/symbols.xml index 1695bb3c..ee16185e 100644 --- a/doc/symbols.xml +++ b/doc/symbols.xml @@ -1746,4 +1746,15 @@ xmlBufferDetach xmlInitializeDict + + xmlBufContent + xmlBufEnd + xmlBufGetNodeContent + xmlBufNodeDump + xmlBufUse + xmlDictGetUsage + xmlDictSetLimit + xmlOutputBufferGetContent + xmlOutputBufferGetSize + diff --git a/enc.h b/enc.h index 8b4fcd06..91977604 100644 --- a/enc.h +++ b/enc.h @@ -1,9 +1,12 @@ /* - * enc.h: Internal Interfaces for encoding in libxml2 + * Summary: Internal Interfaces for encoding in libxml2 + * Description: this module describes a few interfaces which were + * addded along with the API changes in 2.9.0 + * those are private routines at this point * - * See Copyright for the status of this software. + * Copy: See Copyright for the status of this software. * - * daniel@veillard.com + * Author: Daniel Veillard */ #ifndef __XML_ENC_H__ diff --git a/encoding.c b/encoding.c index e7f563f0..46a25d84 100644 --- a/encoding.c +++ b/encoding.c @@ -2030,7 +2030,7 @@ xmlCharEncFirstLine(xmlCharEncodingHandler *handler, xmlBufferPtr out, } /** - * xmlCharEncInput: + * xmlCharEncFirstLineInput: * @input: a parser input buffer * @len: number of bytes to convert for the first line, or -1 * @@ -2383,7 +2383,7 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler, xmlBufferPtr out, /** * xmlCharEncOutput: - * @input: a parser input buffer + * @output: a parser output buffer * @init: is this an initialization call without data * * Generic front-end for the encoding handler on parser output diff --git a/include/libxml/tree.h b/include/libxml/tree.h index 7562d9a5..8f4e28a6 100644 --- a/include/libxml/tree.h +++ b/include/libxml/tree.h @@ -120,6 +120,13 @@ XMLPUBFUN xmlChar* XMLCALL xmlBufContent (const xmlBufPtr buf); XMLPUBFUN xmlChar* XMLCALL xmlBufEnd (const xmlBufPtr buf); XMLPUBFUN size_t XMLCALL xmlBufUse (xmlBufPtr buf); +/* + * LIBXML2_NEW_BUFFER: + * + * Macro used to express that the API use the new buffers for + * xmlParserInputBuffer and xmlOutputBuffer. The change was + * introduced in 2.9.0. + */ #define LIBXML2_NEW_BUFFER /** diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h index e5026dc2..48ea145d 100644 --- a/include/libxml/xmlerror.h +++ b/include/libxml/xmlerror.h @@ -830,10 +830,6 @@ typedef enum { XML_I18N_CONV_FAILED, /* 6003 */ XML_I18N_NO_OUTPUT, /* 6004 */ XML_BUF_OVERFLOW = 7000 -#if 0 - XML_CHECK_, /* 5033 */ - XML_CHECK_X /* 503 */ -#endif } xmlParserErrors; /** diff --git a/save.h b/save.h index 26cc51d1..f24f273f 100644 --- a/save.h +++ b/save.h @@ -1,9 +1,12 @@ /* - * save.h: Internal Interfaces for saving + * Summary: Internal Interfaces for saving in libxml2 + * Description: this module describes a few interfaces which were + * addded along with the API changes in 2.9.0 + * those are private routines at this point * - * See Copyright for the status of this software. + * Copy: See Copyright for the status of this software. * - * daniel@veillard.com + * Author: Daniel Veillard */ #ifndef __XML_SAVE_H__ @@ -15,12 +18,14 @@ extern "C" { #endif +#ifdef LIBXML_OUTPUT_ENABLED void xmlBufAttrSerializeTxtContent(xmlBufPtr buf, xmlDocPtr doc, xmlAttrPtr attr, const xmlChar * string); void xmlBufDumpNotationTable(xmlBufPtr buf, xmlNotationTablePtr table); void xmlBufDumpElementDecl(xmlBufPtr buf, xmlElementPtr elem); void xmlBufDumpAttributeDecl(xmlBufPtr buf, xmlAttributePtr attr); void xmlBufDumpEntityDecl(xmlBufPtr buf, xmlEntityPtr ent); +#endif #ifdef __cplusplus } diff --git a/tree.c b/tree.c index e48fd8ac..be9b55a9 100644 --- a/tree.c +++ b/tree.c @@ -5279,7 +5279,7 @@ xmlNodeBufGetContent(xmlBufferPtr buffer, xmlNodePtr cur) /** * xmlBufGetNodeContent: - * @buffer: a buffer + * @buf: a buffer xmlBufPtr * @cur: the node being read * * Read the value of a node @cur, this can be either the text carried
- + Prev