lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-23 01:52:48 +03:00
Code Activity

port patch from Marcus Meissner to add gcc checking for printf like

Browse Source 
* include/libxml/parser.h include/libxml/xmlwriter.h
  include/libxml/relaxng.h include/libxml/xmlversion.h.in
  include/libxml/xmlwin32version.h.in include/libxml/valid.h
  include/libxml/xmlschemas.h include/libxml/xmlerror.h:
  port patch from Marcus Meissner to add gcc checking for
  printf like functions parameters, should fix #65068
* doc/apibuild.py doc/*: modified the script accordingly
  and regenerated
* xpath.c xmlmemory.c threads.c: fix a few warnings
Daniel

svn path=/trunk/; revision=3813
This commit is contained in:
Daniel Veillard
2009-01-18 20:53:59 +00:00
parent d032a5bc21
commit f63085de5e
18 changed files with 279 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
Sun Jan 18 21:48:28 CET 2009 Daniel Veillard <daniel@veillard.com>
* include/libxml/parser.h include/libxml/xmlwriter.h
include/libxml/relaxng.h include/libxml/xmlversion.h.in
include/libxml/xmlwin32version.h.in include/libxml/valid.h
include/libxml/xmlschemas.h include/libxml/xmlerror.h:
port patch from Marcus Meissner to add gcc checking for
printf like functions parameters, should fix #65068
* doc/apibuild.py doc/*: modified the script accordingly
and regenerated
* xpath.c xmlmemory.c threads.c: fix a few warnings
Sun Jan 18 20:40:42 CET 2009 Daniel Veillard <daniel@veillard.com> Sun Jan 18 20:40:42 CET 2009 Daniel Veillard <daniel@veillard.com>
* include/libxml/xmlwin32version.h.in: windows header should * include/libxml/xmlwin32version.h.in: windows header should

3
doc/apibuild.py
View File

@@ -72,7 +72,8 @@ ignored_words = {
"ATTRIBUTE_UNUSED": (0, "macro keyword"), "ATTRIBUTE_UNUSED": (0, "macro keyword"),
"LIBEXSLT_PUBLIC": (0, "macro keyword"), "LIBEXSLT_PUBLIC": (0, "macro keyword"),
"X_IN_Y": (5, "macro function builder"), "X_IN_Y": (5, "macro function builder"),
"ATTRIBUTE_ALLOC_SIZE": (3, "macro for gcc chaking extension"), "ATTRIBUTE_ALLOC_SIZE": (3, "macro for gcc checking extension"),
"ATTRIBUTE_PRINTF": (5, "macro for gcc printf args checking extension"),
} }
def escape(raw): def escape(raw):

2
doc/devhelp/libxml2-parserInternals.html
View File

@@ -268,7 +268,7 @@ void <a href="#xmlParseEntityDecl">xmlParseEntityDecl</a> (<a href="libxml2-tre
</div> </div>
<hr/> <hr/>
<div class="refsect2" lang="en"><h3><a name="XML_MAX_TEXT_LENGHT">Macro </a>XML_MAX_TEXT_LENGHT</h3><pre class="programlisting">#define <a href="#XML_MAX_TEXT_LENGHT">XML_MAX_TEXT_LENGHT</a>; <div class="refsect2" lang="en"><h3><a name="XML_MAX_TEXT_LENGHT">Macro </a>XML_MAX_TEXT_LENGHT</h3><pre class="programlisting">#define <a href="#XML_MAX_TEXT_LENGHT">XML_MAX_TEXT_LENGHT</a>;
</pre><p/> </pre><p>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 <a href="libxml2-parser.html#XML_PARSE_HUGE">XML_PARSE_HUGE</a> option to override it.</p>
</div> </div>
<hr/> <hr/>
<div class="refsect2" lang="en"><h3><a name="XML_SUBSTITUTE_BOTH">Macro </a>XML_SUBSTITUTE_BOTH</h3><pre class="programlisting">#define <a href="#XML_SUBSTITUTE_BOTH">XML_SUBSTITUTE_BOTH</a>; <div class="refsect2" lang="en"><h3><a name="XML_SUBSTITUTE_BOTH">Macro </a>XML_SUBSTITUTE_BOTH</h3><pre class="programlisting">#define <a href="#XML_SUBSTITUTE_BOTH">XML_SUBSTITUTE_BOTH</a>;

18
doc/devhelp/libxml2-xmlversion.html
View File

@@ -44,7 +44,7 @@
<div class="refsynopsisdiv"> <div class="refsynopsisdiv">
<h2>Synopsis</h2> <h2>Synopsis</h2>
<pre class="synopsis">#define <a href="#LIBXML_VERSION_EXTRA">LIBXML_VERSION_EXTRA</a>; <pre class="synopsis">#define <a href="#LIBXML_VERSION_EXTRA">LIBXML_VERSION_EXTRA</a>;
#define <a href="#LIBXML_MODULES_ENABLED">LIBXML_MODULES_ENABLED</a>; #define <a href="#LIBXML_DOCB_ENABLED">LIBXML_DOCB_ENABLED</a>;
#define <a href="#LIBXML_LEGACY_ENABLED">LIBXML_LEGACY_ENABLED</a>; #define <a href="#LIBXML_LEGACY_ENABLED">LIBXML_LEGACY_ENABLED</a>;
#define <a href="#LIBXML_READER_ENABLED">LIBXML_READER_ENABLED</a>; #define <a href="#LIBXML_READER_ENABLED">LIBXML_READER_ENABLED</a>;
#define <a href="#LIBXML_THREAD_ENABLED">LIBXML_THREAD_ENABLED</a>; #define <a href="#LIBXML_THREAD_ENABLED">LIBXML_THREAD_ENABLED</a>;
@@ -53,8 +53,8 @@
#define <a href="#LIBXML_DEBUG_ENABLED">LIBXML_DEBUG_ENABLED</a>; #define <a href="#LIBXML_DEBUG_ENABLED">LIBXML_DEBUG_ENABLED</a>;
#define <a href="#LIBXML_XINCLUDE_ENABLED">LIBXML_XINCLUDE_ENABLED</a>; #define <a href="#LIBXML_XINCLUDE_ENABLED">LIBXML_XINCLUDE_ENABLED</a>;
#define <a href="#ATTRIBUTE_UNUSED">ATTRIBUTE_UNUSED</a>; #define <a href="#ATTRIBUTE_UNUSED">ATTRIBUTE_UNUSED</a>;
#define <a href="#LIBXML_DOCB_ENABLED">LIBXML_DOCB_ENABLED</a>; #define <a href="#LIBXML_MODULES_ENABLED">LIBXML_MODULES_ENABLED</a>;
#define <a href="#LIBXML_PUSH_ENABLED">LIBXML_PUSH_ENABLED</a>; #define <a href="#ATTRIBUTE_PRINTF">ATTRIBUTE_PRINTF</a>;
#define <a href="#LIBXML_SAX1_ENABLED">LIBXML_SAX1_ENABLED</a>; #define <a href="#LIBXML_SAX1_ENABLED">LIBXML_SAX1_ENABLED</a>;
#define <a href="#WITHOUT_TRIO">WITHOUT_TRIO</a>; #define <a href="#WITHOUT_TRIO">WITHOUT_TRIO</a>;
#define <a href="#LIBXML_SCHEMATRON_ENABLED">LIBXML_SCHEMATRON_ENABLED</a>; #define <a href="#LIBXML_SCHEMATRON_ENABLED">LIBXML_SCHEMATRON_ENABLED</a>;
@@ -70,11 +70,13 @@
#define <a href="#LIBXML_MODULE_EXTENSION">LIBXML_MODULE_EXTENSION</a>; #define <a href="#LIBXML_MODULE_EXTENSION">LIBXML_MODULE_EXTENSION</a>;
#define <a href="#LIBXML_ICONV_ENABLED">LIBXML_ICONV_ENABLED</a>; #define <a href="#LIBXML_ICONV_ENABLED">LIBXML_ICONV_ENABLED</a>;
#define <a href="#LIBXML_HTML_ENABLED">LIBXML_HTML_ENABLED</a>; #define <a href="#LIBXML_HTML_ENABLED">LIBXML_HTML_ENABLED</a>;
#define <a href="#LIBXML_WRITER_ENABLED">LIBXML_WRITER_ENABLED</a>;
#define <a href="#LIBXML_UNICODE_ENABLED">LIBXML_UNICODE_ENABLED</a>; #define <a href="#LIBXML_UNICODE_ENABLED">LIBXML_UNICODE_ENABLED</a>;
#define <a href="#LIBXML_FTP_ENABLED">LIBXML_FTP_ENABLED</a>; #define <a href="#LIBXML_FTP_ENABLED">LIBXML_FTP_ENABLED</a>;
#define <a href="#LIBXML_AUTOMATA_ENABLED">LIBXML_AUTOMATA_ENABLED</a>; #define <a href="#LIBXML_AUTOMATA_ENABLED">LIBXML_AUTOMATA_ENABLED</a>;
#define <a href="#LIBXML_ZLIB_ENABLED">LIBXML_ZLIB_ENABLED</a>; #define <a href="#LIBXML_ZLIB_ENABLED">LIBXML_ZLIB_ENABLED</a>;
#define <a href="#LIBXML_WRITER_ENABLED">LIBXML_WRITER_ENABLED</a>; #define <a href="#ATTRIBUTE_ALLOC_SIZE">ATTRIBUTE_ALLOC_SIZE</a>;
#define <a href="#LIBXML_PUSH_ENABLED">LIBXML_PUSH_ENABLED</a>;
#define <a href="#LIBXML_C14N_ENABLED">LIBXML_C14N_ENABLED</a>; #define <a href="#LIBXML_C14N_ENABLED">LIBXML_C14N_ENABLED</a>;
#define <a href="#LIBXML_SCHEMAS_ENABLED">LIBXML_SCHEMAS_ENABLED</a>; #define <a href="#LIBXML_SCHEMAS_ENABLED">LIBXML_SCHEMAS_ENABLED</a>;
#define <a href="#DEBUG_MEMORY_LOCATION">DEBUG_MEMORY_LOCATION</a>; #define <a href="#DEBUG_MEMORY_LOCATION">DEBUG_MEMORY_LOCATION</a>;
@@ -93,6 +95,14 @@ void <a href="#xmlCheckVersion">xmlCheckVersion</a> (int version);
<div class="refsect1" lang="en"> <div class="refsect1" lang="en">
<h2>Details</h2> <h2>Details</h2>
<div class="refsect2" lang="en"> <div class="refsect2" lang="en">
<div class="refsect2" lang="en"><h3><a name="ATTRIBUTE_ALLOC_SIZE">Macro </a>ATTRIBUTE_ALLOC_SIZE</h3><pre class="programlisting">#define <a href="#ATTRIBUTE_ALLOC_SIZE">ATTRIBUTE_ALLOC_SIZE</a>;
</pre><p>Macro used to indicate to GCC this is an allocator function</p>
</div>
<hr/>
<div class="refsect2" lang="en"><h3><a name="ATTRIBUTE_PRINTF">Macro </a>ATTRIBUTE_PRINTF</h3><pre class="programlisting">#define <a href="#ATTRIBUTE_PRINTF">ATTRIBUTE_PRINTF</a>;
</pre><p>Macro used to indicate to GCC the parameter are printf like</p>
</div>
<hr/>
<div class="refsect2" lang="en"><h3><a name="ATTRIBUTE_UNUSED">Macro </a>ATTRIBUTE_UNUSED</h3><pre class="programlisting">#define <a href="#ATTRIBUTE_UNUSED">ATTRIBUTE_UNUSED</a>; <div class="refsect2" lang="en"><h3><a name="ATTRIBUTE_UNUSED">Macro </a>ATTRIBUTE_UNUSED</h3><pre class="programlisting">#define <a href="#ATTRIBUTE_UNUSED">ATTRIBUTE_UNUSED</a>;
</pre><p>Macro used to signal to GCC unused function parameters</p> </pre><p>Macro used to signal to GCC unused function parameters</p>
</div> </div>

2
doc/devhelp/libxml2.devhelp
View File

@@ -52,6 +52,8 @@
</sub> </sub>
</chapters> </chapters>
<functions> <functions>
<function name="ATTRIBUTE_ALLOC_SIZE" link="libxml2-xmlversion.html#ATTRIBUTE_ALLOC_SIZE"/>
<function name="ATTRIBUTE_PRINTF" link="libxml2-xmlversion.html#ATTRIBUTE_PRINTF"/>
<function name="ATTRIBUTE_UNUSED" link="libxml2-xmlversion.html#ATTRIBUTE_UNUSED"/> <function name="ATTRIBUTE_UNUSED" link="libxml2-xmlversion.html#ATTRIBUTE_UNUSED"/>
<function name="BAD_CAST" link="libxml2-xmlstring.html#BAD_CAST"/> <function name="BAD_CAST" link="libxml2-xmlstring.html#BAD_CAST"/>
<function name="BASE_BUFFER_SIZE" link="libxml2-tree.html#BASE_BUFFER_SIZE"/> <function name="BASE_BUFFER_SIZE" link="libxml2-tree.html#BASE_BUFFER_SIZE"/>

17
doc/libxml2-api.xml
View File

@@ -3336,7 +3336,7 @@
<description>compile-time version informations for the XML library </description> <description>compile-time version informations for the XML library </description>
<author>Daniel Veillard </author> <author>Daniel Veillard </author>
<exports symbol='LIBXML_VERSION_EXTRA' type='macro'/> <exports symbol='LIBXML_VERSION_EXTRA' type='macro'/>
<exports symbol='LIBXML_MODULES_ENABLED' type='macro'/> <exports symbol='LIBXML_DOCB_ENABLED' type='macro'/>
<exports symbol='LIBXML_LEGACY_ENABLED' type='macro'/> <exports symbol='LIBXML_LEGACY_ENABLED' type='macro'/>
<exports symbol='LIBXML_READER_ENABLED' type='macro'/> <exports symbol='LIBXML_READER_ENABLED' type='macro'/>
<exports symbol='LIBXML_THREAD_ENABLED' type='macro'/> <exports symbol='LIBXML_THREAD_ENABLED' type='macro'/>
@@ -3345,8 +3345,8 @@
<exports symbol='LIBXML_DEBUG_ENABLED' type='macro'/> <exports symbol='LIBXML_DEBUG_ENABLED' type='macro'/>
<exports symbol='LIBXML_XINCLUDE_ENABLED' type='macro'/> <exports symbol='LIBXML_XINCLUDE_ENABLED' type='macro'/>
<exports symbol='ATTRIBUTE_UNUSED' type='macro'/> <exports symbol='ATTRIBUTE_UNUSED' type='macro'/>
<exports symbol='LIBXML_DOCB_ENABLED' type='macro'/> <exports symbol='LIBXML_MODULES_ENABLED' type='macro'/>
<exports symbol='LIBXML_PUSH_ENABLED' type='macro'/> <exports symbol='ATTRIBUTE_PRINTF' type='macro'/>
<exports symbol='LIBXML_SAX1_ENABLED' type='macro'/> <exports symbol='LIBXML_SAX1_ENABLED' type='macro'/>
<exports symbol='WITHOUT_TRIO' type='macro'/> <exports symbol='WITHOUT_TRIO' type='macro'/>
<exports symbol='LIBXML_SCHEMATRON_ENABLED' type='macro'/> <exports symbol='LIBXML_SCHEMATRON_ENABLED' type='macro'/>
@@ -3362,11 +3362,13 @@
<exports symbol='LIBXML_MODULE_EXTENSION' type='macro'/> <exports symbol='LIBXML_MODULE_EXTENSION' type='macro'/>
<exports symbol='LIBXML_ICONV_ENABLED' type='macro'/> <exports symbol='LIBXML_ICONV_ENABLED' type='macro'/>
<exports symbol='LIBXML_HTML_ENABLED' type='macro'/> <exports symbol='LIBXML_HTML_ENABLED' type='macro'/>
<exports symbol='LIBXML_WRITER_ENABLED' type='macro'/>
<exports symbol='LIBXML_UNICODE_ENABLED' type='macro'/> <exports symbol='LIBXML_UNICODE_ENABLED' type='macro'/>
<exports symbol='LIBXML_FTP_ENABLED' type='macro'/> <exports symbol='LIBXML_FTP_ENABLED' type='macro'/>
<exports symbol='LIBXML_AUTOMATA_ENABLED' type='macro'/> <exports symbol='LIBXML_AUTOMATA_ENABLED' type='macro'/>
<exports symbol='LIBXML_ZLIB_ENABLED' type='macro'/> <exports symbol='LIBXML_ZLIB_ENABLED' type='macro'/>
<exports symbol='LIBXML_WRITER_ENABLED' type='macro'/> <exports symbol='ATTRIBUTE_ALLOC_SIZE' type='macro'/>
<exports symbol='LIBXML_PUSH_ENABLED' type='macro'/>
<exports symbol='LIBXML_C14N_ENABLED' type='macro'/> <exports symbol='LIBXML_C14N_ENABLED' type='macro'/>
<exports symbol='LIBXML_SCHEMAS_ENABLED' type='macro'/> <exports symbol='LIBXML_SCHEMAS_ENABLED' type='macro'/>
<exports symbol='DEBUG_MEMORY_LOCATION' type='macro'/> <exports symbol='DEBUG_MEMORY_LOCATION' type='macro'/>
@@ -3766,6 +3768,12 @@
</file> </file>
</files> </files>
<symbols> <symbols>
<macro name='ATTRIBUTE_ALLOC_SIZE' file='xmlversion'>
<info>Macro used to indicate to GCC this is an allocator function</info>
</macro>
<macro name='ATTRIBUTE_PRINTF' file='xmlversion'>
<info>Macro used to indicate to GCC the parameter are printf like</info>
</macro>
<macro name='ATTRIBUTE_UNUSED' file='xmlversion'> <macro name='ATTRIBUTE_UNUSED' file='xmlversion'>
<info>Macro used to signal to GCC unused function parameters</info> <info>Macro used to signal to GCC unused function parameters</info>
</macro> </macro>
@@ -4109,6 +4117,7 @@
<info>Identifiers can be longer, but this will be more costly at runtime.</info> <info>Identifiers can be longer, but this will be more costly at runtime.</info>
</macro> </macro>
<macro name='XML_MAX_TEXT_LENGHT' file='parserInternals'> <macro name='XML_MAX_TEXT_LENGHT' file='parserInternals'>
<info>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.</info>
</macro> </macro>
<macro name='XML_SAX2_MAGIC' file='parser'> <macro name='XML_SAX2_MAGIC' file='parser'>
<info>Special constant found in SAX2 blocks initialized fields</info> <info>Special constant found in SAX2 blocks initialized fields</info>

31
doc/libxml2-refs.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<apirefs name='libxml2'> <apirefs name='libxml2'>
<references> <references>
<reference name='ATTRIBUTE_ALLOC_SIZE' href='html/libxml-xmlversion.html#ATTRIBUTE_ALLOC_SIZE'/>
<reference name='ATTRIBUTE_PRINTF' href='html/libxml-xmlversion.html#ATTRIBUTE_PRINTF'/>
<reference name='ATTRIBUTE_UNUSED' href='html/libxml-xmlversion.html#ATTRIBUTE_UNUSED'/> <reference name='ATTRIBUTE_UNUSED' href='html/libxml-xmlversion.html#ATTRIBUTE_UNUSED'/>
<reference name='BAD_CAST' href='html/libxml-xmlstring.html#BAD_CAST'/> <reference name='BAD_CAST' href='html/libxml-xmlstring.html#BAD_CAST'/>
<reference name='BASE_BUFFER_SIZE' href='html/libxml-tree.html#BASE_BUFFER_SIZE'/> <reference name='BASE_BUFFER_SIZE' href='html/libxml-tree.html#BASE_BUFFER_SIZE'/>
@@ -3526,6 +3528,8 @@
</references> </references>
<alpha> <alpha>
<letter name='A'> <letter name='A'>
<ref name='ATTRIBUTE_ALLOC_SIZE'/>
<ref name='ATTRIBUTE_PRINTF'/>
<ref name='ATTRIBUTE_UNUSED'/> <ref name='ATTRIBUTE_UNUSED'/>
</letter> </letter>
<letter name='B'> <letter name='B'>
@@ -13782,6 +13786,8 @@
<ref name='xmlUCSIsYijingHexagramSymbols'/> <ref name='xmlUCSIsYijingHexagramSymbols'/>
</file> </file>
<file name='xmlversion'> <file name='xmlversion'>
<ref name='ATTRIBUTE_ALLOC_SIZE'/>
<ref name='ATTRIBUTE_PRINTF'/>
<ref name='ATTRIBUTE_UNUSED'/> <ref name='ATTRIBUTE_UNUSED'/>
<ref name='DEBUG_MEMORY_LOCATION'/> <ref name='DEBUG_MEMORY_LOCATION'/>
<ref name='LIBXML_AUTOMATA_ENABLED'/> <ref name='LIBXML_AUTOMATA_ENABLED'/>
@@ -15751,6 +15757,8 @@
</letter> </letter>
<letter name='G'> <letter name='G'>
<word name='GCC'> <word name='GCC'>
<ref name='ATTRIBUTE_ALLOC_SIZE'/>
<ref name='ATTRIBUTE_PRINTF'/>
<ref name='ATTRIBUTE_UNUSED'/> <ref name='ATTRIBUTE_UNUSED'/>
</word> </word>
<word name='GEDecl'> <word name='GEDecl'>
@@ -16322,6 +16330,9 @@
<ref name='_xmlParserCtxt'/> <ref name='_xmlParserCtxt'/>
<ref name='_xmlValidCtxt'/> <ref name='_xmlValidCtxt'/>
</word> </word>
<word name='Maximum'>
<ref name='XML_MAX_TEXT_LENGHT'/>
</word>
<word name='May'> <word name='May'>
<ref name='xmlURIEscape'/> <ref name='xmlURIEscape'/>
</word> </word>
@@ -18370,6 +18381,9 @@
<word name='XML_ERR_OK'> <word name='XML_ERR_OK'>
<ref name='xmlParseInNodeContext'/> <ref name='xmlParseInNodeContext'/>
</word> </word>
<word name='XML_PARSE_HUGE'>
<ref name='XML_MAX_TEXT_LENGHT'/>
</word>
<word name='XML_SCHEMAS_ELEM_GLOBAL'> <word name='XML_SCHEMAS_ELEM_GLOBAL'>
<ref name='XML_SCHEMAS_ELEM_TOPLEVEL'/> <ref name='XML_SCHEMAS_ELEM_TOPLEVEL'/>
</word> </word>
@@ -18869,6 +18883,7 @@
<ref name='xmlParserInputDeallocate'/> <ref name='xmlParserInputDeallocate'/>
</word> </word>
<word name='allocator'> <word name='allocator'>
<ref name='ATTRIBUTE_ALLOC_SIZE'/>
<ref name='DEBUG_MEMORY'/> <ref name='DEBUG_MEMORY'/>
</word> </word>
<word name='allocators'> <word name='allocators'>
@@ -18901,6 +18916,7 @@
<ref name='xmlSkipBlankChars'/> <ref name='xmlSkipBlankChars'/>
</word> </word>
<word name='allowed'> <word name='allowed'>
<ref name='XML_MAX_TEXT_LENGHT'/>
<ref name='_htmlElemDesc'/> <ref name='_htmlElemDesc'/>
<ref name='_xmlElement'/> <ref name='_xmlElement'/>
<ref name='_xmlSchemaWildcard'/> <ref name='_xmlSchemaWildcard'/>
@@ -19566,6 +19582,7 @@
<ref name='xmlSearchNs'/> <ref name='xmlSearchNs'/>
</word> </word>
<word name='boundary'> <word name='boundary'>
<ref name='XML_MAX_TEXT_LENGHT'/>
<ref name='xmlParseElementChildrenContentDecl'/> <ref name='xmlParseElementChildrenContentDecl'/>
<ref name='xmlParseElementMixedContentDecl'/> <ref name='xmlParseElementMixedContentDecl'/>
</word> </word>
@@ -19631,6 +19648,7 @@
<ref name='XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED'/> <ref name='XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED'/>
</word> </word>
<word name='building'> <word name='building'>
<ref name='XML_MAX_TEXT_LENGHT'/>
<ref name='_xmlParserCtxt'/> <ref name='_xmlParserCtxt'/>
<ref name='docbSAXParseDoc'/> <ref name='docbSAXParseDoc'/>
<ref name='docbSAXParseFile'/> <ref name='docbSAXParseFile'/>
@@ -22485,6 +22503,7 @@
<ref name='xmlNewElementContent'/> <ref name='xmlNewElementContent'/>
</word> </word>
<word name='feature'> <word name='feature'>
<ref name='XML_MAX_TEXT_LENGHT'/>
<ref name='xmlGetFeature'/> <ref name='xmlGetFeature'/>
<ref name='xmlGetFeaturesList'/> <ref name='xmlGetFeaturesList'/>
<ref name='xmlHasFeature'/> <ref name='xmlHasFeature'/>
@@ -23632,6 +23651,8 @@
<ref name='xmlXPtrNewRange'/> <ref name='xmlXPtrNewRange'/>
</word> </word>
<word name='indicate'> <word name='indicate'>
<ref name='ATTRIBUTE_ALLOC_SIZE'/>
<ref name='ATTRIBUTE_PRINTF'/>
<ref name='xmlParseExternalID'/> <ref name='xmlParseExternalID'/>
<ref name='xmlParserInputGrow'/> <ref name='xmlParserInputGrow'/>
<ref name='xmlParserInputRead'/> <ref name='xmlParserInputRead'/>
@@ -24401,6 +24422,7 @@
<ref name='xmlExpCtxtNbCons'/> <ref name='xmlExpCtxtNbCons'/>
</word> </word>
<word name='like'> <word name='like'>
<ref name='ATTRIBUTE_PRINTF'/>
<ref name='IS_CHAR_CH'/> <ref name='IS_CHAR_CH'/>
<ref name='IS_DIGIT_CH'/> <ref name='IS_DIGIT_CH'/>
<ref name='IS_EXTENDER_CH'/> <ref name='IS_EXTENDER_CH'/>
@@ -24422,6 +24444,9 @@
<ref name='xmlDecodeEntities'/> <ref name='xmlDecodeEntities'/>
<ref name='xmlPatternMaxDepth'/> <ref name='xmlPatternMaxDepth'/>
</word> </word>
<word name='limitation'>
<ref name='XML_MAX_TEXT_LENGHT'/>
</word>
<word name='limited'> <word name='limited'>
<ref name='_htmlElemDesc'/> <ref name='_htmlElemDesc'/>
</word> </word>
@@ -25776,6 +25801,7 @@
<ref name='xmlXPathNodeSetAddUnique'/> <ref name='xmlXPathNodeSetAddUnique'/>
</word> </word>
<word name='option'> <word name='option'>
<ref name='XML_MAX_TEXT_LENGHT'/>
<ref name='xmlDOMWrapAdoptNode'/> <ref name='xmlDOMWrapAdoptNode'/>
<ref name='xmlDOMWrapCloneNode'/> <ref name='xmlDOMWrapCloneNode'/>
<ref name='xmlDOMWrapReconcileNamespaces'/> <ref name='xmlDOMWrapReconcileNamespaces'/>
@@ -25911,6 +25937,7 @@
<ref name='_xmlParserInput'/> <ref name='_xmlParserInput'/>
</word> </word>
<word name='override'> <word name='override'>
<ref name='XML_MAX_TEXT_LENGHT'/>
<ref name='resolveEntity'/> <ref name='resolveEntity'/>
<ref name='resolveEntitySAXFunc'/> <ref name='resolveEntitySAXFunc'/>
<ref name='xmlCatalogAdd'/> <ref name='xmlCatalogAdd'/>
@@ -27626,6 +27653,9 @@
<ref name='xmlLoadCatalog'/> <ref name='xmlLoadCatalog'/>
<ref name='xmlLoadCatalogs'/> <ref name='xmlLoadCatalogs'/>
</word> </word>
<word name='safety'>
<ref name='XML_MAX_TEXT_LENGHT'/>
</word>
<word name='same'> <word name='same'>
<ref name='HTML_COMMENT_NODE'/> <ref name='HTML_COMMENT_NODE'/>
<ref name='HTML_ENTITY_REF_NODE'/> <ref name='HTML_ENTITY_REF_NODE'/>
@@ -28102,6 +28132,7 @@
</word> </word>
<word name='single'> <word name='single'>
<ref name='IS_DIGIT_CH'/> <ref name='IS_DIGIT_CH'/>
<ref name='XML_MAX_TEXT_LENGHT'/>
<ref name='xmlCurrentChar'/> <ref name='xmlCurrentChar'/>
<ref name='xmlParseAttValue'/> <ref name='xmlParseAttValue'/>
<ref name='xmlParseElementMixedContentDecl'/> <ref name='xmlParseElementMixedContentDecl'/>

6
include/libxml/parser.h
View File

@@ -594,7 +594,7 @@ typedef void (*cdataBlockSAXFunc) (
* Display and format a warning messages, callback. * Display and format a warning messages, callback.
*/ */
typedef void (XMLCDECL *warningSAXFunc) (void *ctx, typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
const char *msg, ...); const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
/** /**
* errorSAXFunc: * errorSAXFunc:
* @ctx: an XML parser context * @ctx: an XML parser context
@@ -604,7 +604,7 @@ typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
* Display and format an error messages, callback. * Display and format an error messages, callback.
*/ */
typedef void (XMLCDECL *errorSAXFunc) (void *ctx, typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
const char *msg, ...); const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
/** /**
* fatalErrorSAXFunc: * fatalErrorSAXFunc:
* @ctx: an XML parser context * @ctx: an XML parser context
@@ -616,7 +616,7 @@ typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
* get all the callbacks for errors. * get all the callbacks for errors.
*/ */
typedef void (XMLCDECL *fatalErrorSAXFunc) (void *ctx, typedef void (XMLCDECL *fatalErrorSAXFunc) (void *ctx,
const char *msg, ...); const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
/** /**
* isStandaloneSAXFunc: * isStandaloneSAXFunc:
* @ctx: the user data (XML parser context) * @ctx: the user data (XML parser context)

44
include/libxml/relaxng.h
View File

@@ -32,7 +32,7 @@ typedef xmlRelaxNG *xmlRelaxNGPtr;
* *
* Signature of an error callback from a Relax-NG validation * Signature of an error callback from a Relax-NG validation
*/ */
typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...); typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
/** /**
* xmlRelaxNGValidityWarningFunc: * xmlRelaxNGValidityWarningFunc:
@@ -42,7 +42,7 @@ typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg
* *
* Signature of a warning callback from a Relax-NG validation * Signature of a warning callback from a Relax-NG validation
*/ */
typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...); typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
/** /**
* A schemas validation context * A schemas validation context
@@ -114,27 +114,27 @@ typedef enum {
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlRelaxNGInitTypes (void); xmlRelaxNGInitTypes (void);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlRelaxNGCleanupTypes (void); xmlRelaxNGCleanupTypes (void);
/* /*
* Interfaces for parsing. * Interfaces for parsing.
*/ */
XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
xmlRelaxNGNewParserCtxt (const char *URL); xmlRelaxNGNewParserCtxt (const char *URL);
XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
xmlRelaxNGNewMemParserCtxt (const char *buffer, xmlRelaxNGNewMemParserCtxt (const char *buffer,
int size); int size);
XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
xmlRelaxNGNewDocParserCtxt (xmlDocPtr doc); xmlRelaxNGNewDocParserCtxt (xmlDocPtr doc);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlRelaxParserSetFlag (xmlRelaxNGParserCtxtPtr ctxt, xmlRelaxParserSetFlag (xmlRelaxNGParserCtxtPtr ctxt,
int flag); int flag);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlRelaxNGFreeParserCtxt (xmlRelaxNGParserCtxtPtr ctxt); xmlRelaxNGFreeParserCtxt (xmlRelaxNGParserCtxtPtr ctxt);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxtPtr ctxt, xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxtPtr ctxt,
xmlRelaxNGValidityErrorFunc err, xmlRelaxNGValidityErrorFunc err,
xmlRelaxNGValidityWarningFunc warn, xmlRelaxNGValidityWarningFunc warn,
@@ -149,12 +149,12 @@ XMLPUBFUN void XMLCALL
xmlRelaxNGParserCtxtPtr ctxt, xmlRelaxNGParserCtxtPtr ctxt,
xmlStructuredErrorFunc serror, xmlStructuredErrorFunc serror,
void *ctx); void *ctx);
XMLPUBFUN xmlRelaxNGPtr XMLCALL XMLPUBFUN xmlRelaxNGPtr XMLCALL
xmlRelaxNGParse (xmlRelaxNGParserCtxtPtr ctxt); xmlRelaxNGParse (xmlRelaxNGParserCtxtPtr ctxt);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlRelaxNGFree (xmlRelaxNGPtr schema); xmlRelaxNGFree (xmlRelaxNGPtr schema);
#ifdef LIBXML_OUTPUT_ENABLED #ifdef LIBXML_OUTPUT_ENABLED
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlRelaxNGDump (FILE *output, xmlRelaxNGDump (FILE *output,
xmlRelaxNGPtr schema); xmlRelaxNGPtr schema);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
@@ -164,12 +164,12 @@ XMLPUBFUN void XMLCALL
/* /*
* Interfaces for validating * Interfaces for validating
*/ */
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxtPtr ctxt,
xmlRelaxNGValidityErrorFunc err, xmlRelaxNGValidityErrorFunc err,
xmlRelaxNGValidityWarningFunc warn, xmlRelaxNGValidityWarningFunc warn,
void *ctx); void *ctx);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxtPtr ctxt,
xmlRelaxNGValidityErrorFunc *err, xmlRelaxNGValidityErrorFunc *err,
xmlRelaxNGValidityWarningFunc *warn, xmlRelaxNGValidityWarningFunc *warn,
@@ -177,29 +177,29 @@ XMLPUBFUN int XMLCALL
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxtPtr ctxt,
xmlStructuredErrorFunc serror, void *ctx); xmlStructuredErrorFunc serror, void *ctx);
XMLPUBFUN xmlRelaxNGValidCtxtPtr XMLCALL XMLPUBFUN xmlRelaxNGValidCtxtPtr XMLCALL
xmlRelaxNGNewValidCtxt (xmlRelaxNGPtr schema); xmlRelaxNGNewValidCtxt (xmlRelaxNGPtr schema);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlRelaxNGFreeValidCtxt (xmlRelaxNGValidCtxtPtr ctxt); xmlRelaxNGFreeValidCtxt (xmlRelaxNGValidCtxtPtr ctxt);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlRelaxNGValidateDoc (xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGValidateDoc (xmlRelaxNGValidCtxtPtr ctxt,
xmlDocPtr doc); xmlDocPtr doc);
/* /*
* Interfaces for progressive validation when possible * Interfaces for progressive validation when possible
*/ */
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlRelaxNGValidatePushElement (xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGValidatePushElement (xmlRelaxNGValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlNodePtr elem); xmlNodePtr elem);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlRelaxNGValidatePushCData (xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGValidatePushCData (xmlRelaxNGValidCtxtPtr ctxt,
const xmlChar *data, const xmlChar *data,
int len); int len);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlRelaxNGValidatePopElement (xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGValidatePopElement (xmlRelaxNGValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlNodePtr elem); xmlNodePtr elem);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlRelaxNGValidateFullElement (xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGValidateFullElement (xmlRelaxNGValidCtxtPtr ctxt,
xmlDocPtr doc, xmlDocPtr doc,
xmlNodePtr elem); xmlNodePtr elem);

4
include/libxml/valid.h
View File

@@ -41,7 +41,7 @@ typedef xmlValidState *xmlValidStatePtr;
*/ */
typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx, typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx,
const char *msg, const char *msg,
...); ...) ATTRIBUTE_PRINTF(2,3);
/** /**
* xmlValidityWarningFunc: * xmlValidityWarningFunc:
@@ -56,7 +56,7 @@ typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx,
*/ */
typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx, typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx,
const char *msg, const char *msg,
...); ...) ATTRIBUTE_PRINTF(2,3);
#ifdef IN_LIBXML #ifdef IN_LIBXML
/** /**

64
include/libxml/xmlerror.h
View File

@@ -61,7 +61,7 @@ typedef enum {
XML_FROM_CHECK, /* The error checking module */ XML_FROM_CHECK, /* The error checking module */
XML_FROM_WRITER, /* The xmlwriter module */ XML_FROM_WRITER, /* The xmlwriter module */
XML_FROM_MODULE, /* The dynamically loaded module module*/ XML_FROM_MODULE, /* The dynamically loaded module module*/
XML_FROM_I18N, /* The module handling character conversion */ XML_FROM_I18N, /* The module handling character conversion */
XML_FROM_SCHEMATRONV /* The Schematron validator module */ XML_FROM_SCHEMATRONV /* The Schematron validator module */
} xmlErrorDomain; } xmlErrorDomain;
@@ -645,7 +645,7 @@ typedef enum {
XML_SCHEMAV_CVC_ELT_4_3, /* 1852 */ XML_SCHEMAV_CVC_ELT_4_3, /* 1852 */
XML_SCHEMAV_CVC_ELT_5_1_1, /* 1853 */ XML_SCHEMAV_CVC_ELT_5_1_1, /* 1853 */
XML_SCHEMAV_CVC_ELT_5_1_2, /* 1854 */ XML_SCHEMAV_CVC_ELT_5_1_2, /* 1854 */
XML_SCHEMAV_CVC_ELT_5_2_1, /* 1855 */ XML_SCHEMAV_CVC_ELT_5_2_1, /* 1855 */
XML_SCHEMAV_CVC_ELT_5_2_2_1, /* 1856 */ XML_SCHEMAV_CVC_ELT_5_2_2_1, /* 1856 */
XML_SCHEMAV_CVC_ELT_5_2_2_2_1, /* 1857 */ XML_SCHEMAV_CVC_ELT_5_2_2_2_1, /* 1857 */
XML_SCHEMAV_CVC_ELT_5_2_2_2_2, /* 1858 */ XML_SCHEMAV_CVC_ELT_5_2_2_2_2, /* 1858 */
@@ -670,7 +670,7 @@ typedef enum {
XML_SCHEMAV_CVC_IDC, /* 1877 */ XML_SCHEMAV_CVC_IDC, /* 1877 */
XML_SCHEMAV_CVC_WILDCARD, /* 1878 */ XML_SCHEMAV_CVC_WILDCARD, /* 1878 */
XML_SCHEMAV_MISC, /* 1879 */ XML_SCHEMAV_MISC, /* 1879 */
XML_XPTR_UNKNOWN_SCHEME = 1900, XML_XPTR_UNKNOWN_SCHEME = 1900,
XML_XPTR_CHILDSEQ_START, /* 1901 */ XML_XPTR_CHILDSEQ_START, /* 1901 */
XML_XPTR_EVAL_FAILED, /* 1902 */ XML_XPTR_EVAL_FAILED, /* 1902 */
XML_XPTR_EXTRA_OBJECTS, /* 1903 */ XML_XPTR_EXTRA_OBJECTS, /* 1903 */
@@ -691,15 +691,15 @@ typedef enum {
XML_SCHEMAP_SRC_SIMPLE_TYPE_2, /* 3001 */ XML_SCHEMAP_SRC_SIMPLE_TYPE_2, /* 3001 */
XML_SCHEMAP_SRC_SIMPLE_TYPE_3, /* 3002 */ XML_SCHEMAP_SRC_SIMPLE_TYPE_3, /* 3002 */
XML_SCHEMAP_SRC_SIMPLE_TYPE_4, /* 3003 */ XML_SCHEMAP_SRC_SIMPLE_TYPE_4, /* 3003 */
XML_SCHEMAP_SRC_RESOLVE, /* 3004 */ XML_SCHEMAP_SRC_RESOLVE, /* 3004 */
XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE, /* 3005 */ XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE, /* 3005 */
XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE, /* 3006 */ XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE, /* 3006 */
XML_SCHEMAP_SRC_UNION_MEMBERTYPES_OR_SIMPLETYPES, /* 3007 */ XML_SCHEMAP_SRC_UNION_MEMBERTYPES_OR_SIMPLETYPES, /* 3007 */
XML_SCHEMAP_ST_PROPS_CORRECT_1, /* 3008 */ XML_SCHEMAP_ST_PROPS_CORRECT_1, /* 3008 */
XML_SCHEMAP_ST_PROPS_CORRECT_2, /* 3009 */ XML_SCHEMAP_ST_PROPS_CORRECT_2, /* 3009 */
XML_SCHEMAP_ST_PROPS_CORRECT_3, /* 3010 */ XML_SCHEMAP_ST_PROPS_CORRECT_3, /* 3010 */
XML_SCHEMAP_COS_ST_RESTRICTS_1_1, /* 3011 */ XML_SCHEMAP_COS_ST_RESTRICTS_1_1, /* 3011 */
XML_SCHEMAP_COS_ST_RESTRICTS_1_2, /* 3012 */ XML_SCHEMAP_COS_ST_RESTRICTS_1_2, /* 3012 */
XML_SCHEMAP_COS_ST_RESTRICTS_1_3_1, /* 3013 */ XML_SCHEMAP_COS_ST_RESTRICTS_1_3_1, /* 3013 */
XML_SCHEMAP_COS_ST_RESTRICTS_1_3_2, /* 3014 */ XML_SCHEMAP_COS_ST_RESTRICTS_1_3_2, /* 3014 */
XML_SCHEMAP_COS_ST_RESTRICTS_2_1, /* 3015 */ XML_SCHEMAP_COS_ST_RESTRICTS_2_1, /* 3015 */
@@ -718,7 +718,7 @@ typedef enum {
XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_3, /* 3028 */ XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_3, /* 3028 */
XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_4, /* 3029 */ XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_4, /* 3029 */
XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_5, /* 3030 */ XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_5, /* 3030 */
XML_SCHEMAP_COS_ST_DERIVED_OK_2_1, /* 3031 */ XML_SCHEMAP_COS_ST_DERIVED_OK_2_1, /* 3031 */
XML_SCHEMAP_COS_ST_DERIVED_OK_2_2, /* 3032 */ XML_SCHEMAP_COS_ST_DERIVED_OK_2_2, /* 3032 */
XML_SCHEMAP_S4S_ELEM_NOT_ALLOWED, /* 3033 */ XML_SCHEMAP_S4S_ELEM_NOT_ALLOWED, /* 3033 */
XML_SCHEMAP_S4S_ELEM_MISSING, /* 3034 */ XML_SCHEMAP_S4S_ELEM_MISSING, /* 3034 */
@@ -737,14 +737,14 @@ typedef enum {
XML_SCHEMAP_E_PROPS_CORRECT_4, /* 3047 */ XML_SCHEMAP_E_PROPS_CORRECT_4, /* 3047 */
XML_SCHEMAP_E_PROPS_CORRECT_5, /* 3048 */ XML_SCHEMAP_E_PROPS_CORRECT_5, /* 3048 */
XML_SCHEMAP_E_PROPS_CORRECT_6, /* 3049 */ XML_SCHEMAP_E_PROPS_CORRECT_6, /* 3049 */
XML_SCHEMAP_SRC_INCLUDE, /* 3050 */ XML_SCHEMAP_SRC_INCLUDE, /* 3050 */
XML_SCHEMAP_SRC_ATTRIBUTE_1, /* 3051 */ XML_SCHEMAP_SRC_ATTRIBUTE_1, /* 3051 */
XML_SCHEMAP_SRC_ATTRIBUTE_2, /* 3052 */ XML_SCHEMAP_SRC_ATTRIBUTE_2, /* 3052 */
XML_SCHEMAP_SRC_ATTRIBUTE_3_1, /* 3053 */ XML_SCHEMAP_SRC_ATTRIBUTE_3_1, /* 3053 */
XML_SCHEMAP_SRC_ATTRIBUTE_3_2, /* 3054 */ XML_SCHEMAP_SRC_ATTRIBUTE_3_2, /* 3054 */
XML_SCHEMAP_SRC_ATTRIBUTE_4, /* 3055 */ XML_SCHEMAP_SRC_ATTRIBUTE_4, /* 3055 */
XML_SCHEMAP_NO_XMLNS, /* 3056 */ XML_SCHEMAP_NO_XMLNS, /* 3056 */
XML_SCHEMAP_NO_XSI, /* 3057 */ XML_SCHEMAP_NO_XSI, /* 3057 */
XML_SCHEMAP_COS_VALID_DEFAULT_1, /* 3058 */ XML_SCHEMAP_COS_VALID_DEFAULT_1, /* 3058 */
XML_SCHEMAP_COS_VALID_DEFAULT_2_1, /* 3059 */ XML_SCHEMAP_COS_VALID_DEFAULT_2_1, /* 3059 */
XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1, /* 3060 */ XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1, /* 3060 */
@@ -843,7 +843,7 @@ typedef enum {
*/ */
typedef void (XMLCDECL *xmlGenericErrorFunc) (void *ctx, typedef void (XMLCDECL *xmlGenericErrorFunc) (void *ctx,
const char *msg, const char *msg,
...); ...) ATTRIBUTE_PRINTF(2,3);
/** /**
* xmlStructuredErrorFunc: * xmlStructuredErrorFunc:
* @userData: user provided data for the error callback * @userData: user provided data for the error callback
@@ -858,38 +858,38 @@ typedef void (XMLCALL *xmlStructuredErrorFunc) (void *userData, xmlErrorPtr erro
* Use the following function to reset the two global variables * Use the following function to reset the two global variables
* xmlGenericError and xmlGenericErrorContext. * xmlGenericError and xmlGenericErrorContext.
*/ */
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlSetGenericErrorFunc (void *ctx, xmlSetGenericErrorFunc (void *ctx,
xmlGenericErrorFunc handler); xmlGenericErrorFunc handler);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
initGenericErrorDefaultFunc (xmlGenericErrorFunc *handler); initGenericErrorDefaultFunc (xmlGenericErrorFunc *handler);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlSetStructuredErrorFunc (void *ctx, xmlSetStructuredErrorFunc (void *ctx,
xmlStructuredErrorFunc handler); xmlStructuredErrorFunc handler);
/* /*
* Default message routines used by SAX and Valid context for error * Default message routines used by SAX and Valid context for error
* and warning reporting. * and warning reporting.
*/ */
XMLPUBFUN void XMLCDECL XMLPUBFUN void XMLCDECL
xmlParserError (void *ctx, xmlParserError (void *ctx,
const char *msg, const char *msg,
...); ...) ATTRIBUTE_PRINTF(2,3);
XMLPUBFUN void XMLCDECL XMLPUBFUN void XMLCDECL
xmlParserWarning (void *ctx, xmlParserWarning (void *ctx,
const char *msg, const char *msg,
...); ...) ATTRIBUTE_PRINTF(2,3);
XMLPUBFUN void XMLCDECL XMLPUBFUN void XMLCDECL
xmlParserValidityError (void *ctx, xmlParserValidityError (void *ctx,
const char *msg, const char *msg,
...); ...) ATTRIBUTE_PRINTF(2,3);
XMLPUBFUN void XMLCDECL XMLPUBFUN void XMLCDECL
xmlParserValidityWarning (void *ctx, xmlParserValidityWarning (void *ctx,
const char *msg, const char *msg,
...); ...) ATTRIBUTE_PRINTF(2,3);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlParserPrintFileInfo (xmlParserInputPtr input); xmlParserPrintFileInfo (xmlParserInputPtr input);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
xmlParserPrintFileContext (xmlParserInputPtr input); xmlParserPrintFileContext (xmlParserInputPtr input);
/* /*
@@ -907,19 +907,19 @@ XMLPUBFUN void XMLCALL
xmlResetError (xmlErrorPtr err); xmlResetError (xmlErrorPtr err);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlCopyError (xmlErrorPtr from, xmlCopyError (xmlErrorPtr from,
xmlErrorPtr to); xmlErrorPtr to);
#ifdef IN_LIBXML #ifdef IN_LIBXML
/* /*
* Internal callback reporting routine * Internal callback reporting routine
*/ */
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
__xmlRaiseError (xmlStructuredErrorFunc schannel, __xmlRaiseError (xmlStructuredErrorFunc schannel,
xmlGenericErrorFunc channel, xmlGenericErrorFunc channel,
void *data, void *data,
void *ctx, void *ctx,
void *node, void *node,
int domain, int domain,
int code, int code,
xmlErrorLevel level, xmlErrorLevel level,
const char *file, const char *file,
@@ -930,10 +930,10 @@ XMLPUBFUN void XMLCALL
int int1, int int1,
int col, int col,
const char *msg, const char *msg,
...); ...) ATTRIBUTE_PRINTF(16,17);
XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL
__xmlSimpleError (int domain, __xmlSimpleError (int domain,
int code, int code,
xmlNodePtr node, xmlNodePtr node,
const char *msg, const char *msg,
const char *extra); const char *extra);

4
include/libxml/xmlschemas.h
View File

@@ -92,7 +92,7 @@ typedef xmlSchema *xmlSchemaPtr;
* *
* Signature of an error callback from an XSD validation * Signature of an error callback from an XSD validation
*/ */
typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...); typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
/** /**
* xmlSchemaValidityWarningFunc: * xmlSchemaValidityWarningFunc:
@@ -102,7 +102,7 @@ typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg,
* *
* Signature of a warning callback from an XSD validation * Signature of a warning callback from an XSD validation
*/ */
typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...); typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
/** /**
* A schemas validation context * A schemas validation context

54
include/libxml/xmlversion.h.in
View File

@@ -382,18 +382,27 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
#define LIBXML_ZLIB_ENABLED #define LIBXML_ZLIB_ENABLED
#endif #endif
#ifdef __GNUC__
#ifdef HAVE_ANSIDECL_H
#include <ansidecl.h>
#endif
/** /**
* ATTRIBUTE_UNUSED: * ATTRIBUTE_UNUSED:
* *
* Macro used to signal to GCC unused function parameters * Macro used to signal to GCC unused function parameters
*/ */
#ifdef __GNUC__
#ifdef HAVE_ANSIDECL_H
#include <ansidecl.h>
#endif
#ifndef ATTRIBUTE_UNUSED #ifndef ATTRIBUTE_UNUSED
#define ATTRIBUTE_UNUSED __attribute__((unused)) #define ATTRIBUTE_UNUSED __attribute__((unused))
#endif #endif
/**
* ATTRIBUTE_ALLOC_SIZE:
*
* Macro used to indicate to GCC this is an allocator function
*/
#ifndef ATTRIBUTE_ALLOC_SIZE #ifndef ATTRIBUTE_ALLOC_SIZE
# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) # if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
# define ATTRIBUTE_ALLOC_SIZE(x) __attribute__((alloc_size(x))) # define ATTRIBUTE_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
@@ -403,11 +412,44 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
#else #else
# define ATTRIBUTE_ALLOC_SIZE(x) # define ATTRIBUTE_ALLOC_SIZE(x)
#endif #endif
/**
* ATTRIBUTE_PRINTF:
*
* Macro used to indicate to GCC the parameter are printf like
*/
#ifndef ATTRIBUTE_PRINTF
# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
# define ATTRIBUTE_PRINTF(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
# else
# define ATTRIBUTE_PRINTF(fmt,args)
# endif
#else #else
#define ATTRIBUTE_UNUSED # define ATTRIBUTE_PRINTF(fmt,args)
#define ATTRIBUTE_ALLOC_SIZE(x)
#endif #endif
#else /* ! __GNUC__ */
/**
* ATTRIBUTE_UNUSED:
*
* Macro used to signal to GCC unused function parameters
*/
#define ATTRIBUTE_UNUSED
/**
* ATTRIBUTE_ALLOC_SIZE:
*
* Macro used to indicate to GCC this is an allocator function
*/
#define ATTRIBUTE_ALLOC_SIZE(x)
/**
* ATTRIBUTE_PRINTF:
*
* Macro used to indicate to GCC the parameter are printf like
*/
#define ATTRIBUTE_PRINTF(fmt,args)
#endif /* __GNUC__ */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */

39
include/libxml/xmlwin32version.h.in
View File

@@ -242,18 +242,27 @@ extern void xmlCheckVersion(int version);
#endif #endif
#endif #endif
#ifdef __GNUC__
#ifdef HAVE_ANSIDECL_H
#include <ansidecl.h>
#endif
/** /**
* ATTRIBUTE_UNUSED: * ATTRIBUTE_UNUSED:
* *
* Macro used to signal to GCC unused function parameters * Macro used to signal to GCC unused function parameters
*/ */
#ifdef __GNUC__
#ifdef HAVE_ANSIDECL_H
#include <ansidecl.h>
#endif
#ifndef ATTRIBUTE_UNUSED #ifndef ATTRIBUTE_UNUSED
#define ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED
#endif #endif
/**
* ATTRIBUTE_ALLOC_SIZE:
*
* Macro used to indicate to GCC this is an allocator function
*/
#ifndef ATTRIBUTE_ALLOC_SIZE #ifndef ATTRIBUTE_ALLOC_SIZE
# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) # if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
# define ATTRIBUTE_ALLOC_SIZE(x) __attribute__((alloc_size(x))) # define ATTRIBUTE_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
@@ -263,11 +272,29 @@ extern void xmlCheckVersion(int version);
#else #else
# define ATTRIBUTE_ALLOC_SIZE(x) # define ATTRIBUTE_ALLOC_SIZE(x)
#endif #endif
/**
* ATTRIBUTE_PRINTF:
*
* Macro used to indicate to GCC the parameter are printf like
*/
#ifndef ATTRIBUTE_PRINTF
# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
# define ATTRIBUTE_PRINTF(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
# else
# define ATTRIBUTE_PRINTF(fmt,args)
# endif
#else #else
#define ATTRIBUTE_UNUSED # define ATTRIBUTE_PRINTF(fmt,args)
#define ATTRIBUTE_ALLOC_SIZE(x)
#endif #endif
#else /* !__GNUC__ */
#define ATTRIBUTE_UNUSED
#define ATTRIBUTE_PRINTF(fmt,args)
#define ATTRIBUTE_ALLOC_SIZE(x)
#endif /* __GNUC__ */
/* /*
* #pragma comment(lib, "iconv.lib") * #pragma comment(lib, "iconv.lib")
* *

78
include/libxml/xmlwriter.h
View File

@@ -69,11 +69,13 @@ extern "C" {
XMLPUBFUN int XMLCALL xmlTextWriterEndComment(xmlTextWriterPtr writer); XMLPUBFUN int XMLCALL xmlTextWriterEndComment(xmlTextWriterPtr writer);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer, xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(2,3);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer,
const char *format, const char *format,
va_list argptr); va_list argptr)
ATTRIBUTE_PRINTF(2,0);
XMLPUBFUN int XMLCALL xmlTextWriterWriteComment(xmlTextWriterPtr XMLPUBFUN int XMLCALL xmlTextWriterWriteComment(xmlTextWriterPtr
writer, writer,
const xmlChar * const xmlChar *
@@ -102,12 +104,14 @@ extern "C" {
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer, xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(3,4);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
const char *format, const char *format,
va_list argptr); va_list argptr)
ATTRIBUTE_PRINTF(3,0);
XMLPUBFUN int XMLCALL xmlTextWriterWriteElement(xmlTextWriterPtr XMLPUBFUN int XMLCALL xmlTextWriterWriteElement(xmlTextWriterPtr
writer, writer,
const xmlChar * name, const xmlChar * name,
@@ -118,14 +122,16 @@ extern "C" {
const xmlChar * prefix, const xmlChar * prefix,
const xmlChar * name, const xmlChar * name,
const xmlChar * namespaceURI, const xmlChar * namespaceURI,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(5,6);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer,
const xmlChar * prefix, const xmlChar * prefix,
const xmlChar * name, const xmlChar * name,
const xmlChar * namespaceURI, const xmlChar * namespaceURI,
const char *format, const char *format,
va_list argptr); va_list argptr)
ATTRIBUTE_PRINTF(5,0);
XMLPUBFUN int XMLCALL xmlTextWriterWriteElementNS(xmlTextWriterPtr XMLPUBFUN int XMLCALL xmlTextWriterWriteElementNS(xmlTextWriterPtr
writer, writer,
const xmlChar * const xmlChar *
@@ -141,10 +147,12 @@ extern "C" {
*/ */
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer, xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(2,3);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer,
const char *format, va_list argptr); const char *format, va_list argptr)
ATTRIBUTE_PRINTF(2,0);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteRawLen(xmlTextWriterPtr writer, xmlTextWriterWriteRawLen(xmlTextWriterPtr writer,
const xmlChar * content, int len); const xmlChar * content, int len);
@@ -154,12 +162,14 @@ extern "C" {
XMLPUBFUN int XMLCALL xmlTextWriterWriteFormatString(xmlTextWriterPtr XMLPUBFUN int XMLCALL xmlTextWriterWriteFormatString(xmlTextWriterPtr
writer, writer,
const char const char
*format, ...); *format, ...)
ATTRIBUTE_PRINTF(2,3);
XMLPUBFUN int XMLCALL xmlTextWriterWriteVFormatString(xmlTextWriterPtr XMLPUBFUN int XMLCALL xmlTextWriterWriteVFormatString(xmlTextWriterPtr
writer, writer,
const char const char
*format, *format,
va_list argptr); va_list argptr)
ATTRIBUTE_PRINTF(2,0);
XMLPUBFUN int XMLCALL xmlTextWriterWriteString(xmlTextWriterPtr writer, XMLPUBFUN int XMLCALL xmlTextWriterWriteString(xmlTextWriterPtr writer,
const xmlChar * const xmlChar *
content); content);
@@ -193,12 +203,14 @@ extern "C" {
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer, xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(3,4);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
const char *format, const char *format,
va_list argptr); va_list argptr)
ATTRIBUTE_PRINTF(3,0);
XMLPUBFUN int XMLCALL xmlTextWriterWriteAttribute(xmlTextWriterPtr XMLPUBFUN int XMLCALL xmlTextWriterWriteAttribute(xmlTextWriterPtr
writer, writer,
const xmlChar * name, const xmlChar * name,
@@ -209,14 +221,16 @@ extern "C" {
const xmlChar * prefix, const xmlChar * prefix,
const xmlChar * name, const xmlChar * name,
const xmlChar * namespaceURI, const xmlChar * namespaceURI,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(5,6);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer,
const xmlChar * prefix, const xmlChar * prefix,
const xmlChar * name, const xmlChar * name,
const xmlChar * namespaceURI, const xmlChar * namespaceURI,
const char *format, const char *format,
va_list argptr); va_list argptr)
ATTRIBUTE_PRINTF(5,0);
XMLPUBFUN int XMLCALL xmlTextWriterWriteAttributeNS(xmlTextWriterPtr XMLPUBFUN int XMLCALL xmlTextWriterWriteAttributeNS(xmlTextWriterPtr
writer, writer,
const xmlChar * const xmlChar *
@@ -242,11 +256,13 @@ extern "C" {
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer, xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer,
const xmlChar * target, const xmlChar * target,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(3,4);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer,
const xmlChar * target, const xmlChar * target,
const char *format, va_list argptr); const char *format, va_list argptr)
ATTRIBUTE_PRINTF(3,0);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWritePI(xmlTextWriterPtr writer, xmlTextWriterWritePI(xmlTextWriterPtr writer,
const xmlChar * target, const xmlChar * target,
@@ -270,10 +286,12 @@ extern "C" {
*/ */
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer, xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(2,3);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer,
const char *format, va_list argptr); const char *format, va_list argptr)
ATTRIBUTE_PRINTF(2,0);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteCDATA(xmlTextWriterPtr writer, xmlTextWriterWriteCDATA(xmlTextWriterPtr writer,
const xmlChar * content); const xmlChar * content);
@@ -296,13 +314,15 @@ extern "C" {
const xmlChar * name, const xmlChar * name,
const xmlChar * pubid, const xmlChar * pubid,
const xmlChar * sysid, const xmlChar * sysid,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(5,6);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
const xmlChar * pubid, const xmlChar * pubid,
const xmlChar * sysid, const xmlChar * sysid,
const char *format, va_list argptr); const char *format, va_list argptr)
ATTRIBUTE_PRINTF(5,0);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteDTD(xmlTextWriterPtr writer, xmlTextWriterWriteDTD(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
@@ -332,12 +352,14 @@ extern "C" {
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer, xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(3,4);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
const char *format, const char *format,
va_list argptr); va_list argptr)
ATTRIBUTE_PRINTF(3,0);
XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDElement(xmlTextWriterPtr XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDElement(xmlTextWriterPtr
writer, writer,
const xmlChar * const xmlChar *
@@ -360,12 +382,14 @@ extern "C" {
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer, xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(3,4);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer,
const xmlChar * name, const xmlChar * name,
const char *format, const char *format,
va_list argptr); va_list argptr)
ATTRIBUTE_PRINTF(3,0);
XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr
writer, writer,
const xmlChar * const xmlChar *
@@ -389,13 +413,15 @@ extern "C" {
xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriterPtr writer, xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriterPtr writer,
int pe, int pe,
const xmlChar * name, const xmlChar * name,
const char *format, ...); const char *format, ...)
ATTRIBUTE_PRINTF(4,5);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer, xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer,
int pe, int pe,
const xmlChar * name, const xmlChar * name,
const char *format, const char *format,
va_list argptr); va_list argptr)
ATTRIBUTE_PRINTF(4,0);
XMLPUBFUN int XMLCALL XMLPUBFUN int XMLCALL
xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer, xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer,
int pe, int pe,

2
threads.c
View File

@@ -919,7 +919,7 @@ xmlCleanupThreads(void)
} }
DeleteCriticalSection(&cleanup_helpers_cs); DeleteCriticalSection(&cleanup_helpers_cs);
#elif defined HAVE_PTHREAD_H #elif defined HAVE_PTHREAD_H
if ((pthread_key_delete != NULL) && (globalkey != NULL)) if ((libxml_is_threaded) && (pthread_key_delete != NULL))
pthread_key_delete(globalkey); pthread_key_delete(globalkey);
#endif #endif
} }

6
xmlmemory.c
View File

@@ -205,7 +205,7 @@ xmlMallocLoc(size_t size, const char * file, int line)
if (xmlMemTraceBlockAt == ret) { if (xmlMemTraceBlockAt == ret) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"%p : Malloc(%d) Ok\n", xmlMemTraceBlockAt, size); "%p : Malloc(%ld) Ok\n", xmlMemTraceBlockAt, size);
xmlMallocBreakpoint(); xmlMallocBreakpoint();
} }
@@ -273,7 +273,7 @@ xmlMallocAtomicLoc(size_t size, const char * file, int line)
if (xmlMemTraceBlockAt == ret) { if (xmlMemTraceBlockAt == ret) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"%p : Malloc(%d) Ok\n", xmlMemTraceBlockAt, size); "%p : Malloc(%ld) Ok\n", xmlMemTraceBlockAt, size);
xmlMallocBreakpoint(); xmlMallocBreakpoint();
} }
@@ -348,7 +348,7 @@ xmlReallocLoc(void *ptr,size_t size, const char * file, int line)
} }
if (xmlMemTraceBlockAt == ptr) { if (xmlMemTraceBlockAt == ptr) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"%p : Realloced(%d -> %d) Ok\n", "%p : Realloced(%ld -> %ld) Ok\n",
xmlMemTraceBlockAt, p->mh_size, size); xmlMemTraceBlockAt, p->mh_size, size);
xmlMallocBreakpoint(); xmlMallocBreakpoint();
} }

12
xpath.c
View File

@@ -13329,8 +13329,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
URI = xmlXPathNsLookup(ctxt->context, op->value5); URI = xmlXPathNsLookup(ctxt->context, op->value5);
if (URI == NULL) { if (URI == NULL) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n", "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n",
op->value4, op->value5); (char *) op->value4, (char *)op->value5);
return (total); return (total);
} }
val = xmlXPathVariableLookupNS(ctxt->context, val = xmlXPathVariableLookupNS(ctxt->context,
@@ -13377,8 +13377,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
URI = xmlXPathNsLookup(ctxt->context, op->value5); URI = xmlXPathNsLookup(ctxt->context, op->value5);
if (URI == NULL) { if (URI == NULL) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n",
op->value4, op->value5); (char *)op->value4, (char *)op->value5);
return (total); return (total);
} }
func = xmlXPathFunctionLookupNS(ctxt->context, func = xmlXPathFunctionLookupNS(ctxt->context,
@@ -13386,8 +13386,8 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)
} }
if (func == NULL) { if (func == NULL) {
xmlGenericError(xmlGenericErrorContext, xmlGenericError(xmlGenericErrorContext,
"xmlXPathCompOpEval: function %s not found\n", "xmlXPathCompOpEval: function %s not found\n",
op->value4); (char *)op->value4);
XP_ERROR0(XPATH_UNKNOWN_FUNC_ERROR); XP_ERROR0(XPATH_UNKNOWN_FUNC_ERROR);
} }
op->cache = XML_CAST_FPTR(func); op->cache = XML_CAST_FPTR(func);