From 472b1e115012c92144c073efc6c284e72ff297bf Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 24 Aug 2009 17:39:07 +0200 Subject: [PATCH] Regenerate symbols and API after previous patches * doc/symbols.xml: new global data xmlStructuredErrorContext * doc/checkapisym.xsl: slightly improve output * doc/* libxml2.syms win32/libxml2.def.src: regenerated the API --- doc/APIchunk10.html | 1 + doc/APIchunk11.html | 1 + doc/APIchunk16.html | 1 + doc/APIfiles.html | 1 + doc/APIsymbols.html | 1 + doc/checkapisym.xsl | 4 ++-- doc/devhelp/libxml2-globals.html | 5 +++++ doc/devhelp/libxml2-parser.html | 4 ++-- doc/devhelp/libxml2-tree.html | 2 +- doc/devhelp/libxml2-xmlreader.html | 14 +++++++------- doc/devhelp/libxml2-xmlstring.html | 4 ++-- doc/devhelp/libxml2.devhelp | 1 + doc/html/libxml-globals.html | 1 + doc/html/libxml-tree.html | 2 +- doc/libxml2-api.xml | 8 +++++++- doc/libxml2-refs.xml | 8 ++++++++ doc/symbols.xml | 3 +++ libxml2.syms | 7 +++++++ win32/libxml2.def.src | 1 + 19 files changed, 53 insertions(+), 16 deletions(-) diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 591b5e17..cfab238a 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -253,6 +253,7 @@ A:link, A:visited, A:active { text-decoration: underline }
afraid
xmlEncodeEntities
after
UTF8ToHtml
UTF8Toisolat1
+_xmlParserCtxt
docbEncodeEntities
htmlEncodeEntities
isolat1ToUTF8
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html index 781d7cc9..99fce804 100644 --- a/doc/APIchunk11.html +++ b/doc/APIchunk11.html @@ -187,6 +187,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlMemBlocks
xmlMemDisplay
xmlMemoryDump
+
body
_xmlParserCtxt
book1
xmlBuildRelativeURI
bool
xmlBoolToText
both
xmlBufferFree
diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html index c794e34a..ea2d9483 100644 --- a/doc/APIchunk16.html +++ b/doc/APIchunk16.html @@ -234,6 +234,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStrstr
xmlStrsub
head
XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD
+_xmlParserCtxt
header
xmlNanoHTTPAuthHeader
xmlNanoHTTPContentLength
xmlNanoHTTPRedir
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 5049153b..d8bd3589 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -454,6 +454,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRegisterNodeFunc
xmlSaveNoEmptyTags
xmlStructuredError
+xmlStructuredErrorContext
xmlSubstituteEntitiesDefaultValue
xmlThrDefBufferAllocScheme
xmlThrDefDefaultBufferSize
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index f47d68ba..8769ec9b 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -2903,6 +2903,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStrstr
xmlStrsub
xmlStructuredError
+xmlStructuredErrorContext
xmlStructuredErrorFunc
xmlSubstituteEntitiesDefault
xmlSubstituteEntitiesDefaultValue
diff --git a/doc/checkapisym.xsl b/doc/checkapisym.xsl index 31a050d7..85913932 100644 --- a/doc/checkapisym.xsl +++ b/doc/checkapisym.xsl @@ -19,7 +19,7 @@ Found - functions + functions Looking for variables in symbols.xml @@ -28,7 +28,7 @@ Found - variables + variables diff --git a/doc/devhelp/libxml2-globals.html b/doc/devhelp/libxml2-globals.html index 449049ef..415492b1 100644 --- a/doc/devhelp/libxml2-globals.html +++ b/doc/devhelp/libxml2-globals.html @@ -116,6 +116,7 @@ const char * xmlThrDefTreeIndentString xmlError xmlLastError xmlParserInputBufferCreateFilenameFunc xmlParserInputBufferCreateFilenameValue xmlOutputBufferCreateFilenameFunc xmlOutputBufferCreateFilenameValue + void * xmlStructuredErrorContext } xmlGlobalState;

@@ -258,6 +259,10 @@ const char * xmlThrDefTreeIndentString

Variable xmlStructuredError

xmlStructuredErrorFunc xmlStructuredError;

+

+
+

Variable xmlStructuredErrorContext

void * xmlStructuredErrorContext;
+

Variable xmlSubstituteEntitiesDefaultValue

int xmlSubstituteEntitiesDefaultValue;
diff --git a/doc/devhelp/libxml2-parser.html b/doc/devhelp/libxml2-parser.html
index 3effee76..e4e2d764 100644
--- a/doc/devhelp/libxml2-parser.html
+++ b/doc/devhelp/libxml2-parser.html
@@ -97,7 +97,7 @@ int	xmlGetFeature			(xmlDtdPtr	xmlIOParseDTD		(xmlSAXHandlerPtr sax, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc);
 void	xmlFreeParserCtxt		(xmlParserCtxtPtr ctxt);
 xmlDtdPtr	xmlParseDTD		(const xmlChar * ExternalID, 
					 const xmlChar * SystemID);
-xmlDocPtr	xmlRecoverDoc		(xmlChar * cur);
+xmlDocPtr	xmlRecoverDoc		(const xmlChar * cur);
 typedef void commentSAXFunc			(void * ctx, 
					 const xmlChar * value);
 int	xmlInitParserCtxt		(xmlParserCtxtPtr ctxt);
 typedef void attributeSAXFunc		(void * ctx, 
					 const xmlChar * name, 
					 const xmlChar * value);
@@ -688,7 +688,7 @@ void	xmlSetExternalEntityLoader	(
parse an XML in-memory document and build a tree.

 
buffer:a pointer to a char array
size:the size of the array
URL:the base URL to use for the document
encoding:the document encoding, or NULL
options:a combination of xmlParserOption
Returns:the resulting document tree
-

xmlRecoverDoc ()

xmlDocPtr	xmlRecoverDoc		(xmlChar * cur)

+        
xmlRecoverDoc ()
xmlDocPtr	xmlRecoverDoc		(const xmlChar * cur)

 
parse an XML in-memory document and build a tree. In the case the document is not Well Formed, a attempt to build a tree is tried anyway

 
cur:a pointer to an array of xmlChar
Returns:the resulting document tree or NULL in case of failure

         

diff --git a/doc/devhelp/libxml2-tree.html b/doc/devhelp/libxml2-tree.html
index 6e709900..c3702036 100644
--- a/doc/devhelp/libxml2-tree.html
+++ b/doc/devhelp/libxml2-tree.html
@@ -707,7 +707,7 @@ void	xmlFreeNsList			(xmlChar *	version	: the XML version string
     const xmlChar *	encoding	: the declared encoding, if any
     int	standalone	: standalone document
-    int	html	: an HTML(1)/Docbook(2) document Input stream stack
+    int	html	: an HTML(1)/Docbook(2) document * 3 is HTML after <head> * 10 is HTML
     xmlParserInputPtr	input	: Current input stream
     int	inputNr	: Number of current input streams
     int	inputMax	: Max number of input streams
diff --git a/doc/devhelp/libxml2-xmlreader.html b/doc/devhelp/libxml2-xmlreader.html
index 2466e752..0ecf704b 100644
--- a/doc/devhelp/libxml2-xmlreader.html
+++ b/doc/devhelp/libxml2-xmlreader.html
@@ -280,7 +280,7 @@ The content of this structure is not made public by the API.
         

         
xmlTextReaderBaseUri ()
xmlChar *	xmlTextReaderBaseUri	(xmlTextReaderPtr reader)

 
The base URI of the node.

-
reader:the xmlTextReaderPtr used
Returns:the base URI or NULL if not available

+
reader:the xmlTextReaderPtr used
Returns:the base URI or NULL if not available, if non NULL it need to be freed by the caller.

xmlTextReaderByteConsumed ()

long	xmlTextReaderByteConsumed	(xmlTextReaderPtr reader)

This function provides the current index of the parser used by the reader, relative to the start of the current entity. This function actually just wraps a call to xmlBytesConsumed() for the parser context associated with the reader. See xmlBytesConsumed() for more information.

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

xmlTextReaderLocalName ()

xmlChar *	xmlTextReaderLocalName	(xmlTextReaderPtr reader)

The local name of the node.

-
reader:the xmlTextReaderPtr used
Returns:the local name or NULL if not available
+
reader:the xmlTextReaderPtr used
Returns:the local name or NULL if not available, if non NULL it need to be freed by the caller.

xmlTextReaderLocatorBaseURI ()

xmlChar *	xmlTextReaderLocatorBaseURI	(xmlTextReaderLocatorPtr locator)

Obtain the base URI for the given locator.

-
locator:the xmlTextReaderLocatorPtr used
Returns:the base URI or NULL in case of error.
+
locator:the xmlTextReaderLocatorPtr used
Returns:the base URI or NULL in case of error, if non NULL it need to be freed by the caller.

xmlTextReaderLocatorLineNumber ()

int	xmlTextReaderLocatorLineNumber	(xmlTextReaderLocatorPtr locator)

Obtain the line number for the given locator.

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

xmlTextReaderName ()

xmlChar *	xmlTextReaderName	(xmlTextReaderPtr reader)

The qualified name of the node, equal to Prefix :LocalName.

-
reader:the xmlTextReaderPtr used
Returns:the local name or NULL if not available
+
reader:the xmlTextReaderPtr used
Returns:the local name or NULL if not available, if non NULL it need to be freed by the caller.

xmlTextReaderNamespaceUri ()

xmlChar *	xmlTextReaderNamespaceUri	(xmlTextReaderPtr reader)

The URI defining the namespace associated with the node.

-
reader:the xmlTextReaderPtr used
Returns:the namespace URI or NULL if not available
+
reader:the xmlTextReaderPtr used
Returns:the namespace URI or NULL if not available, if non NULL it need to be freed by the caller.

xmlTextReaderNext ()

int	xmlTextReaderNext		(xmlTextReaderPtr reader)

Skip to the node following the current one in document order while avoiding the subtree if any.

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

xmlTextReaderPrefix ()

xmlChar *	xmlTextReaderPrefix	(xmlTextReaderPtr reader)

A shorthand reference to the namespace associated with the node.

-
reader:the xmlTextReaderPtr used
Returns:the prefix or NULL if not available
+
reader:the xmlTextReaderPtr used
Returns:the prefix or NULL if not available, if non NULL it need to be freed by the caller.

xmlTextReaderPreserve ()

xmlNodePtr	xmlTextReaderPreserve	(xmlTextReaderPtr reader)

This tells the XML Reader to preserve the current node. The caller must also use xmlTextReaderCurrentDoc() to keep an handle on the resulting document once parsing has finished

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

xmlTextReaderXmlLang ()

xmlChar *	xmlTextReaderXmlLang	(xmlTextReaderPtr reader)

The xml:lang scope within which the node resides.

-
reader:the xmlTextReaderPtr used
Returns:the xml:lang value or NULL if none exists.
+
reader:the xmlTextReaderPtr used
Returns:the xml:lang value or NULL if none exists., if non NULL it need to be freed by the caller.
diff --git a/doc/devhelp/libxml2-xmlstring.html b/doc/devhelp/libxml2-xmlstring.html index 43da9a40..6dfc70b4 100644 --- a/doc/devhelp/libxml2-xmlstring.html +++ b/doc/devhelp/libxml2-xmlstring.html @@ -47,7 +47,7 @@ typedef unsigned char xmlChar; int xmlStrcmp (const xmlChar * str1,
const xmlChar * str2); xmlChar * xmlCharStrndup (const char * cur,
int len); -const xmlChar * xmlStrcasestr (const xmlChar * str,
xmlChar * val); +const xmlChar * xmlStrcasestr (const xmlChar * str,
const xmlChar * val); xmlChar * xmlStrcat (xmlChar * cur,
const xmlChar * add); int xmlStrPrintf (xmlChar * buf,
int len,
const xmlChar * msg,
... ...); const xmlChar * xmlStrstr (const xmlChar * str,
const xmlChar * val); @@ -127,7 +127,7 @@ int xmlUTF8Strloc (const
str1:the first xmlChar *
str2:the second xmlChar *
Returns:the integer result of the comparison
-

xmlStrcasestr ()

const xmlChar *	xmlStrcasestr		(const xmlChar * str, 
					 xmlChar * val)

+        
xmlStrcasestr ()
const xmlChar *	xmlStrcasestr		(const xmlChar * str, 
					 const xmlChar * val)

 
a case-ignoring strstr for xmlChar's

 
str:the xmlChar * array (haystack)
val:the xmlChar to search (needle)
Returns:the xmlChar * for the first occurrence or NULL.

         

diff --git a/doc/devhelp/libxml2.devhelp b/doc/devhelp/libxml2.devhelp
index 9690218a..a98ed75d 100644
--- a/doc/devhelp/libxml2.devhelp
+++ b/doc/devhelp/libxml2.devhelp
@@ -1913,6 +1913,7 @@
     
     
     
+    
     
     
     
diff --git a/doc/html/libxml-globals.html b/doc/html/libxml-globals.html
index 37845fb3..7dfa7869 100644
--- a/doc/html/libxml-globals.html
+++ b/doc/html/libxml-globals.html
@@ -84,6 +84,7 @@ void	xmlRegisterNodeFunc		(xmlError	xmlLastError
     xmlParserInputBufferCreateFilenameFunc	xmlParserInputBufferCreateFilenameValue
     xmlOutputBufferCreateFilenameFunc	xmlOutputBufferCreateFilenameValue
+    void *	xmlStructuredErrorContext
 }

Function: xmlCleanupGlobals

void	xmlCleanupGlobals		(void)

Additional cleanup for multi-threading

Function: xmlDeregisterNodeDefault

xmlDeregisterNodeFunc	xmlDeregisterNodeDefault	(xmlDeregisterNodeFunc func)

diff --git a/doc/html/libxml-tree.html b/doc/html/libxml-tree.html
index 71202ba3..6f916056 100644
--- a/doc/html/libxml-tree.html
+++ b/doc/html/libxml-tree.html
@@ -489,7 +489,7 @@ A:link, A:visited, A:active { text-decoration: underline }
     const xmlChar *	version	: the XML version string
     const xmlChar *	encoding	: the declared encoding, if any
     int	standalone	: standalone document
-    int	html	: an HTML(1)/Docbook(2) document Input st
+    int	html	: an HTML(1)/Docbook(2) document * 3 is H
     xmlParserInputPtr	input	: Current input stream
     int	inputNr	: Number of current input streams
     int	inputMax	: Max number of input streams
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 8c8f6c2d..0adb9ae5 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -485,6 +485,7 @@
      
      
      
+     
      
      
      
@@ -6159,6 +6160,7 @@ set at the end of parsing'/>
       
       
       
+      
     
     
     
@@ -6254,7 +6256,10 @@ set at the end of parsing'/>
       
       
       
-      
+      
       
       
       
@@ -6900,6 +6905,7 @@ Could we use @subtypes for this?'/>
     
     
     
+    
     
     
     
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index a5b497ce..11d8e441 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -2897,6 +2897,7 @@
     
     
     
+    
     
     
     
@@ -6486,6 +6487,7 @@
       
       
       
+      
       
       
       
@@ -11062,6 +11064,7 @@
       
       
       
+      
       
       
       
@@ -18810,6 +18813,7 @@
         
           
           
+          
           
           
           
@@ -19584,6 +19588,9 @@
           
           
         
+        
+          
+        
         
           
         
@@ -23280,6 +23287,7 @@
         
         
           
+          
         
         
           
diff --git a/doc/symbols.xml b/doc/symbols.xml
index 042833f5..be221175 100644
--- a/doc/symbols.xml
+++ b/doc/symbols.xml
@@ -1737,4 +1737,7 @@
     xmlNextElementSibling
     xmlPreviousElementSibling
   
+  
+    xmlStructuredErrorContext
+  
 
diff --git a/libxml2.syms b/libxml2.syms
index d106c3a5..95294771 100644
--- a/libxml2.syms
+++ b/libxml2.syms
@@ -2221,3 +2221,10 @@ LIBXML2_2.7.3 {
   xmlPreviousElementSibling;
 } LIBXML2_2.7.0;
 
+LIBXML2_2.7.4 {
+    global:
+
+# globals
+  xmlStructuredErrorContext; # variable
+} LIBXML2_2.7.3;
+
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index 995b790f..df195920 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -161,6 +161,7 @@ xmlStringComment DATA
 xmlStringText DATA
 xmlStringTextNoenc DATA
 xmlStructuredError DATA
+xmlStructuredErrorContext DATA
 #ifdef LIBXML_THREAD_ENABLED
 __xmlSubstituteEntitiesDefaultValue
 #else