fixing bug #303068 increasing the nanoftp buffer. fixed __attribute()

* nanoftp.c: fixing bug #303068 increasing the nanoftp buffer.
* doc/apibuild.py: fixed __attribute() parsing problem
* doc/* testapi.c: regenerated the descriptions and docs.
Daniel

ChangeLog

@@ -1,3 +1,9 @@
+Fri May  6 13:40:03 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+	* nanoftp.c: fixing bug #303068 increasing the nanoftp buffer.
+	* doc/apibuild.py: fixed __attribute() parsing problem
+	* doc/* testapi.c: regenerated the descriptions and docs.
+
 Wed May  4 11:16:00 CEST 2005 Daniel Veillard <daniel@veillard.com>
 
 	* Makefile.am configure.in threads.c: on linux/gcc use weak definitions

doc/apibuild.py

@@ -958,6 +958,14 @@ class CParser:
 	    elif token[0] == 'preproc':
 		token = self.parsePreproc(token)
 		continue
+	    elif token[0] == "name" and token[1] == "__const":
+	        token = ("name", "const")
+		return token
+	    elif token[0] == "name" and token[1] == "__attribute":
+		token = self.lexer.token()
+		while token != None and token[1] != ";":
+		    token = self.lexer.token()
+		return token
 	    elif token[0] == "name" and ignored_words.has_key(token[1]):
 	        (n, info) = ignored_words[token[1]]
 		i = 0

doc/libxml2-api.xml

@@ -1073,7 +1073,7 @@
      <exports symbol='XML_SCHEMAS_ELEM_NILLABLE' type='macro'/>
      <exports symbol='XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION' type='macro'/>
      <exports symbol='XML_SCHEMAS_ELEM_INTERNAL_RESOLVED' type='macro'/>
-     <exports symbol='XML_SCHEMAS_WILDCARD_COMPLETE' type='macro'/>
+     <exports symbol='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD' type='macro'/>
      <exports symbol='XML_SCHEMAS_TYPE_BLOCK_DEFAULT' type='macro'/>
      <exports symbol='XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION' type='macro'/>
      <exports symbol='XML_SCHEMAS_TYPE_FINAL_EXTENSION' type='macro'/>
@@ -1099,6 +1099,7 @@
      <exports symbol='XML_SCHEMAS_FINAL_DEFAULT_LIST' type='macro'/>
      <exports symbol='XML_SCHEMAS_TYPE_VARIETY_ABSENT' type='macro'/>
      <exports symbol='XML_SCHEMAS_ELEM_FINAL_RESTRICTION' type='macro'/>
+     <exports symbol='XML_SCHEMAS_WILDCARD_COMPLETE' type='macro'/>
      <exports symbol='XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED' type='macro'/>
      <exports symbol='XML_SCHEMAS_ELEM_NSDEFAULT' type='macro'/>
      <exports symbol='XML_SCHEMAS_ELEM_GLOBAL' type='macro'/>
@@ -2871,6 +2872,7 @@
      <exports symbol='XML_SCHEMA_WHITESPACE_PRESERVE' type='enum'/>
      <exports symbol='xmlSchemaWhitespaceValueType' type='typedef'/>
      <exports symbol='xmlSchemaValPredefTypeNode' type='function'/>
+     <exports symbol='xmlSchemaGetCanonValueWhtsp' type='function'/>
      <exports symbol='xmlSchemaValidateLengthFacetWhtsp' type='function'/>
      <exports symbol='xmlSchemaIsBuiltInTypeFacet' type='function'/>
      <exports symbol='xmlSchemaGetCanonValue' type='function'/>
@@ -3973,6 +3975,9 @@
     <macro name='XML_SCHEMAS_ELEM_REF' file='schemasInternals'>
       <info>the element is a reference to a type</info>
     </macro>
+    <macro name='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD' file='schemasInternals'>
+      <info>the declaration is a substitution group head</info>
+    </macro>
     <macro name='XML_SCHEMAS_ELEM_TOPLEVEL' file='schemasInternals'>
       <info>the element is top level obsolete: use XML_SCHEMAS_ELEM_GLOBAL instead</info>
     </macro>
@@ -6133,7 +6138,7 @@ actually an xmlCharEncoding'/>
       <field name='substGroupNs' type='const xmlChar *' info=''/>
       <field name='scope' type='const xmlChar *' info=''/>
       <field name='value' type='const xmlChar *' info=''/>
-      <field name='refDecl' type='struct _xmlSchemaElement *' info=' the element declaration if a particle'/>
+      <field name='refDecl' type='struct _xmlSchemaElement *' info=' This will now be used for the substitution group affiliation'/>
       <field name='contModel' type='xmlRegexpPtr' info=''/>
       <field name='contentType' type='xmlSchemaContentType' info=''/>
       <field name='refPrefix' type='const xmlChar *' info=''/>
@@ -12758,11 +12763,19 @@ actually an xmlCharEncoding'/>
     </function>
     <function name='xmlSchemaGetCanonValue' file='xmlschemastypes' module='xmlschemastypes'>
       <cond>defined(LIBXML_SCHEMAS_ENABLED)</cond>
-      <info>Get a the cononical lexical representation of the value. The caller has to free the returned retValue. WARNING: Some value types are not supported yet, resulting in a @retValue of &quot;???&quot;.</info>
-      <return type='int' info='0 if the value could be built and -1 in case of API errors.'/>
+      <info>Get a the cononical lexical representation of the value. The caller has to FREE the returned retValue.  WARNING: Some value types are not supported yet, resulting in a @retValue of &quot;???&quot;.  TODO: XML Schema 1.0 does not define canonical representations for: duration, gYearMonth, gYear, gMonthDay, gMonth, gDay, anyURI, QName, NOTATION. This will be fixed in XML Schema 1.1.</info>
+      <return type='int' info='0 if the value could be built, 1 if the value type is not supported yet and -1 in case of API errors.'/>
       <arg name='val' type='xmlSchemaValPtr' info='the precomputed value'/>
       <arg name='retValue' type='const xmlChar **' info='the returned value'/>
     </function>
+    <function name='xmlSchemaGetCanonValueWhtsp' file='xmlschemastypes' module='xmlschemastypes'>
+      <cond>defined(LIBXML_SCHEMAS_ENABLED)</cond>
+      <info>Get a the cononical representation of the value. The caller has to free the returned @retValue.</info>
+      <return type='int' info='0 if the value could be built, 1 if the value type is not supported yet and -1 in case of API errors.'/>
+      <arg name='val' type='xmlSchemaValPtr' info='the precomputed value'/>
+      <arg name='retValue' type='const xmlChar **' info='the returned value'/>
+      <arg name='ws' type='xmlSchemaWhitespaceValueType' info='the whitespace type of the value'/>
+    </function>
     <function name='xmlSchemaGetFacetValueAsULong' file='xmlschemastypes' module='xmlschemastypes'>
       <cond>defined(LIBXML_SCHEMAS_ENABLED)</cond>
       <info>Extract the value of a facet</info>

doc/libxml2-refs.xml

@@ -971,6 +971,7 @@
     <reference name='XML_SCHEMAS_ELEM_NILLABLE' href='html/libxml-schemasInternals.html#XML_SCHEMAS_ELEM_NILLABLE'/>
     <reference name='XML_SCHEMAS_ELEM_NSDEFAULT' href='html/libxml-schemasInternals.html#XML_SCHEMAS_ELEM_NSDEFAULT'/>
     <reference name='XML_SCHEMAS_ELEM_REF' href='html/libxml-schemasInternals.html#XML_SCHEMAS_ELEM_REF'/>
+    <reference name='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD' href='html/libxml-schemasInternals.html#XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD'/>
     <reference name='XML_SCHEMAS_ELEM_TOPLEVEL' href='html/libxml-schemasInternals.html#XML_SCHEMAS_ELEM_TOPLEVEL'/>
     <reference name='XML_SCHEMAS_ENTITIES' href='html/libxml-schemasInternals.html#XML_SCHEMAS_ENTITIES'/>
     <reference name='XML_SCHEMAS_ENTITY' href='html/libxml-schemasInternals.html#XML_SCHEMAS_ENTITY'/>
@@ -2543,6 +2544,7 @@
     <reference name='xmlSchemaGetBuiltInListSimpleTypeItemType' href='html/libxml-xmlschemastypes.html#xmlSchemaGetBuiltInListSimpleTypeItemType'/>
     <reference name='xmlSchemaGetBuiltInType' href='html/libxml-xmlschemastypes.html#xmlSchemaGetBuiltInType'/>
     <reference name='xmlSchemaGetCanonValue' href='html/libxml-xmlschemastypes.html#xmlSchemaGetCanonValue'/>
+    <reference name='xmlSchemaGetCanonValueWhtsp' href='html/libxml-xmlschemastypes.html#xmlSchemaGetCanonValueWhtsp'/>
     <reference name='xmlSchemaGetFacetValueAsULong' href='html/libxml-xmlschemastypes.html#xmlSchemaGetFacetValueAsULong'/>
     <reference name='xmlSchemaGetParserErrors' href='html/libxml-xmlschemas.html#xmlSchemaGetParserErrors'/>
     <reference name='xmlSchemaGetPredefinedType' href='html/libxml-xmlschemastypes.html#xmlSchemaGetPredefinedType'/>
@@ -4292,6 +4294,7 @@
       <ref name='XML_SCHEMAS_ELEM_NILLABLE'/>
       <ref name='XML_SCHEMAS_ELEM_NSDEFAULT'/>
       <ref name='XML_SCHEMAS_ELEM_REF'/>
+      <ref name='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD'/>
       <ref name='XML_SCHEMAS_ELEM_TOPLEVEL'/>
       <ref name='XML_SCHEMAS_ENTITIES'/>
       <ref name='XML_SCHEMAS_ENTITY'/>
@@ -5900,6 +5903,7 @@
       <ref name='xmlSchemaGetBuiltInListSimpleTypeItemType'/>
       <ref name='xmlSchemaGetBuiltInType'/>
       <ref name='xmlSchemaGetCanonValue'/>
+      <ref name='xmlSchemaGetCanonValueWhtsp'/>
       <ref name='xmlSchemaGetFacetValueAsULong'/>
       <ref name='xmlSchemaGetParserErrors'/>
       <ref name='xmlSchemaGetPredefinedType'/>
@@ -7906,6 +7910,7 @@
       <ref name='xmlSAX2StartElement'/>
       <ref name='xmlSAX2StartElementNs'/>
       <ref name='xmlSchemaGetCanonValue'/>
+      <ref name='xmlSchemaGetCanonValueWhtsp'/>
       <ref name='xmlTextReaderPreservePattern'/>
       <ref name='xmlValidGetPotentialChildren'/>
       <ref name='xmlValidGetValidElements'/>
@@ -9508,6 +9513,7 @@
       <ref name='xmlSchemaCopyValue'/>
       <ref name='xmlSchemaFreeValue'/>
       <ref name='xmlSchemaGetCanonValue'/>
+      <ref name='xmlSchemaGetCanonValueWhtsp'/>
       <ref name='xmlSchemaGetValType'/>
       <ref name='xmlSchemaValidateFacet'/>
       <ref name='xmlSchemaValidateFacetWhtsp'/>
@@ -9553,6 +9559,7 @@
     </type>
     <type name='xmlSchemaWhitespaceValueType'>
       <ref name='xmlSchemaCompareValuesWhtsp'/>
+      <ref name='xmlSchemaGetCanonValueWhtsp'/>
       <ref name='xmlSchemaValidateFacetWhtsp'/>
       <ref name='xmlSchemaValidateLengthFacetWhtsp'/>
     </type>
@@ -10960,6 +10967,7 @@
       <ref name='XML_SCHEMAS_ELEM_NILLABLE'/>
       <ref name='XML_SCHEMAS_ELEM_NSDEFAULT'/>
       <ref name='XML_SCHEMAS_ELEM_REF'/>
+      <ref name='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD'/>
       <ref name='XML_SCHEMAS_ELEM_TOPLEVEL'/>
       <ref name='XML_SCHEMAS_ENTITIES'/>
       <ref name='XML_SCHEMAS_ENTITY'/>
@@ -12691,6 +12699,7 @@
       <ref name='xmlSchemaGetBuiltInListSimpleTypeItemType'/>
       <ref name='xmlSchemaGetBuiltInType'/>
       <ref name='xmlSchemaGetCanonValue'/>
+      <ref name='xmlSchemaGetCanonValueWhtsp'/>
       <ref name='xmlSchemaGetFacetValueAsULong'/>
       <ref name='xmlSchemaGetPredefinedType'/>
       <ref name='xmlSchemaGetValType'/>
@@ -14730,6 +14739,9 @@
           <ref name='xmlHasProp'/>
           <ref name='xmlParseDefaultDecl'/>
         </word>
+        <word name='FREE'>
+          <ref name='xmlSchemaGetCanonValue'/>
+        </word>
         <word name='Facet'>
           <ref name='xmlSchemaFreeFacet'/>
           <ref name='xmlSchemaNewFacet'/>
@@ -15510,6 +15522,7 @@
         <word name='NOTATION'>
           <ref name='xmlParseEnumeratedType'/>
           <ref name='xmlParseNotationType'/>
+          <ref name='xmlSchemaGetCanonValue'/>
           <ref name='xmlSchemaNewNOTATIONValue'/>
           <ref name='xmlValidateDtdFinal'/>
         </word>
@@ -16078,6 +16091,7 @@
           <ref name='xmlParseAttribute'/>
           <ref name='xmlParseEndTag'/>
           <ref name='xmlParseStartTag'/>
+          <ref name='xmlSchemaGetCanonValue'/>
           <ref name='xmlSplitQName'/>
           <ref name='xmlSplitQName2'/>
           <ref name='xmlSplitQName3'/>
@@ -16468,6 +16482,7 @@
           <ref name='xmlSchemaFreeFacet'/>
           <ref name='xmlSchemaFreeType'/>
           <ref name='xmlSchemaGetBuiltInListSimpleTypeItemType'/>
+          <ref name='xmlSchemaGetCanonValue'/>
           <ref name='xmlSchemaParse'/>
         </word>
         <word name='Schemas'>
@@ -16803,6 +16818,7 @@
           <ref name='xmlSaveDoc'/>
           <ref name='xmlSaveTree'/>
           <ref name='xmlScanName'/>
+          <ref name='xmlSchemaGetCanonValue'/>
           <ref name='xmlTextWriterWriteRawLen'/>
           <ref name='xmlXPathNextAttribute'/>
         </word>
@@ -17724,6 +17740,9 @@
         <word name='affect'>
           <ref name='xmlKeepBlanksDefault'/>
         </word>
+        <word name='affiliation'>
+          <ref name='_xmlSchemaElement'/>
+        </word>
         <word name='afraid'>
           <ref name='xmlEncodeEntities'/>
         </word>
@@ -17983,6 +18002,9 @@
         <word name='anySimpleType'>
           <ref name='xmlSchemaNewStringValue'/>
         </word>
+        <word name='anyURI'>
+          <ref name='xmlSchemaGetCanonValue'/>
+        </word>
         <word name='anymore'>
           <ref name='XML_SCHEMAS_ANYATTR_LAX'/>
           <ref name='XML_SCHEMAS_ANYATTR_SKIP'/>
@@ -18526,6 +18548,7 @@
           <ref name='xmlRelaxNGParse'/>
           <ref name='xmlSchemaGetBuiltInType'/>
           <ref name='xmlSchemaGetCanonValue'/>
+          <ref name='xmlSchemaGetCanonValueWhtsp'/>
           <ref name='xmlSchemaParse'/>
           <ref name='xmlTextReaderNextSibling'/>
         </word>
@@ -18590,6 +18613,7 @@
           <ref name='xmlC14NDocSaveTo'/>
           <ref name='xmlC14NExecute'/>
           <ref name='xmlGetCharEncodingName'/>
+          <ref name='xmlSchemaGetCanonValue'/>
         </word>
         <word name='canonicalization'>
           <ref name='xmlC14NDocDumpMemory'/>
@@ -19309,6 +19333,7 @@
         </word>
         <word name='cononical'>
           <ref name='xmlSchemaGetCanonValue'/>
+          <ref name='xmlSchemaGetCanonValueWhtsp'/>
         </word>
         <word name='consequent'>
           <ref name='_xmlError'/>
@@ -19585,6 +19610,7 @@
           <ref name='xmlByteConsumed'/>
           <ref name='xmlModuleClose'/>
           <ref name='xmlSchemaGetCanonValue'/>
+          <ref name='xmlSchemaGetCanonValueWhtsp'/>
           <ref name='xmlTextReaderByteConsumed'/>
           <ref name='xmlTextReaderRelaxNGSetSchema'/>
           <ref name='xmlTextReaderRelaxNGValidate'/>
@@ -19865,6 +19891,7 @@
           <ref name='DEBUG_MEMORY'/>
           <ref name='XML_CAST_FPTR'/>
           <ref name='xmlHandleEntity'/>
+          <ref name='xmlSchemaGetCanonValue'/>
         </word>
         <word name='defined'>
           <ref name='WITHOUT_TRIO'/>
@@ -20329,6 +20356,7 @@
           <ref name='xmlResetLastError'/>
           <ref name='xmlSaveDoc'/>
           <ref name='xmlSaveTree'/>
+          <ref name='xmlSchemaGetCanonValue'/>
           <ref name='xmlSchemaValPredefTypeNodeNoNorm'/>
           <ref name='xmlURIEscape'/>
           <ref name='xmlURIUnescapeString'/>
@@ -20468,6 +20496,9 @@
         <word name='duplicates'>
           <ref name='xmlSchemaCopyValue'/>
         </word>
+        <word name='duration'>
+          <ref name='xmlSchemaGetCanonValue'/>
+        </word>
         <word name='during'>
           <ref name='xmlSAXDefaultVersion'/>
           <ref name='xmlSchemaNewDocParserCtxt'/>
@@ -20801,6 +20832,7 @@
           <ref name='xmlRelaxNGGetParserErrors'/>
           <ref name='xmlRelaxNGSetParserErrors'/>
           <ref name='xmlSchemaGetCanonValue'/>
+          <ref name='xmlSchemaGetCanonValueWhtsp'/>
           <ref name='xmlSchemaGetParserErrors'/>
           <ref name='xmlSchemaSetParserErrors'/>
           <ref name='xmlShellCmd'/>
@@ -21289,6 +21321,7 @@
           <ref name='XML_SCHEMAS_ATTR_FIXED'/>
           <ref name='XML_SCHEMAS_ELEM_FIXED'/>
           <ref name='xmlParseDefaultDecl'/>
+          <ref name='xmlSchemaGetCanonValue'/>
         </word>
         <word name='flag'>
           <ref name='XML_SCHEMAS_ELEM_CIRCULAR'/>
@@ -21357,6 +21390,9 @@
           <ref name='xmlInputMatchCallback'/>
           <ref name='xmlOutputMatchCallback'/>
         </word>
+        <word name='for:'>
+          <ref name='xmlSchemaGetCanonValue'/>
+        </word>
         <word name='force'>
           <ref name='xmlKeepBlanksDefault'/>
           <ref name='xmlSetGenericErrorFunc'/>
@@ -21555,6 +21591,21 @@
     </chunk>
     <chunk name='chunk14'>
       <letter name='g'>
+        <word name='gDay'>
+          <ref name='xmlSchemaGetCanonValue'/>
+        </word>
+        <word name='gMonth'>
+          <ref name='xmlSchemaGetCanonValue'/>
+        </word>
+        <word name='gMonthDay'>
+          <ref name='xmlSchemaGetCanonValue'/>
+        </word>
+        <word name='gYear'>
+          <ref name='xmlSchemaGetCanonValue'/>
+        </word>
+        <word name='gYearMonth'>
+          <ref name='xmlSchemaGetCanonValue'/>
+        </word>
         <word name='garanteed'>
           <ref name='xmlUTF8Strsize'/>
         </word>
@@ -21727,8 +21778,10 @@
           <ref name='XML_SCHEMAS_ELEM_FINAL_ABSENT'/>
           <ref name='XML_SCHEMAS_ELEM_FINAL_EXTENSION'/>
           <ref name='XML_SCHEMAS_ELEM_FINAL_RESTRICTION'/>
+          <ref name='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD'/>
           <ref name='_xmlSchemaAttribute'/>
           <ref name='_xmlSchemaAttributeGroup'/>
+          <ref name='_xmlSchemaElement'/>
           <ref name='ftpListCallback'/>
         </word>
         <word name='groups'>
@@ -21836,6 +21889,9 @@
           <ref name='xmlStrstr'/>
           <ref name='xmlStrsub'/>
         </word>
+        <word name='head'>
+          <ref name='XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD'/>
+        </word>
         <word name='header'>
           <ref name='xmlNanoHTTPAuthHeader'/>
           <ref name='xmlNanoHTTPContentLength'/>
@@ -23965,6 +24021,7 @@
         <word name='now'>
           <ref name='XML_CAST_FPTR'/>
           <ref name='_xmlSchema'/>
+          <ref name='_xmlSchemaElement'/>
           <ref name='xmlDecodeEntities'/>
           <ref name='xmlNewGlobalNs'/>
           <ref name='xmlParserHandleReference'/>
@@ -24769,6 +24826,7 @@
         <word name='precomputed'>
           <ref name='xmlSchemaCopyValue'/>
           <ref name='xmlSchemaGetCanonValue'/>
+          <ref name='xmlSchemaGetCanonValueWhtsp'/>
           <ref name='xmlSchemaValidateFacet'/>
           <ref name='xmlSchemaValidateFacetWhtsp'/>
           <ref name='xmlSchemaValidateLengthFacet'/>
@@ -25724,9 +25782,11 @@
         <word name='representation'>
           <ref name='_htmlElemDesc'/>
           <ref name='xmlSchemaGetCanonValue'/>
+          <ref name='xmlSchemaGetCanonValueWhtsp'/>
         </word>
         <word name='representations'>
           <ref name='xmlNewTextChild'/>
+          <ref name='xmlSchemaGetCanonValue'/>
         </word>
         <word name='represented'>
           <ref name='xmlParseCharData'/>
@@ -27148,6 +27208,7 @@
           <ref name='xmlInitCharEncodingHandlers'/>
           <ref name='xmlNanoFTPGetConnection'/>
           <ref name='xmlSchemaGetCanonValue'/>
+          <ref name='xmlSchemaGetCanonValueWhtsp'/>
           <ref name='xmlTextReaderNormalization'/>
         </word>
         <word name='supposed'>
@@ -28241,6 +28302,7 @@
           <ref name='xmlIsBlankNode'/>
           <ref name='xmlParseAttValue'/>
           <ref name='xmlSchemaCompareValuesWhtsp'/>
+          <ref name='xmlSchemaGetCanonValueWhtsp'/>
           <ref name='xmlSchemaValidateFacetWhtsp'/>
           <ref name='xmlSchemaValidateLengthFacetWhtsp'/>
           <ref name='xmlXPathIdFunction'/>
@@ -29399,6 +29461,7 @@
           <ref name='xmlSaveDoc'/>
           <ref name='xmlSaveTree'/>
           <ref name='xmlSchemaGetCanonValue'/>
+          <ref name='xmlSchemaGetCanonValueWhtsp'/>
         </word>
         <word name='you'>
           <ref name='xmlNewDocNode'/>

elfgcchack.h

@@ -9092,6 +9092,18 @@ extern __typeof (xmlSchemaGetCanonValue) xmlSchemaGetCanonValue__internal_alias
 #endif
 #endif
 
+#if defined(LIBXML_SCHEMAS_ENABLED)
+#ifdef bottom_xmlschemastypes
+#undef xmlSchemaGetCanonValueWhtsp
+extern __typeof (xmlSchemaGetCanonValueWhtsp) xmlSchemaGetCanonValueWhtsp __attribute((alias("xmlSchemaGetCanonValueWhtsp__internal_alias")));
+#else
+#ifndef xmlSchemaGetCanonValueWhtsp
+extern __typeof (xmlSchemaGetCanonValueWhtsp) xmlSchemaGetCanonValueWhtsp__internal_alias __attribute((visibility("hidden")));
+#define xmlSchemaGetCanonValueWhtsp xmlSchemaGetCanonValueWhtsp__internal_alias
+#endif
+#endif
+#endif
+
 #if defined(LIBXML_SCHEMAS_ENABLED)
 #ifdef bottom_xmlschemastypes
 #undef xmlSchemaGetFacetValueAsULong

nanoftp.c

@@ -112,7 +112,7 @@
 #define FTP_COMMAND_OK		200
 #define FTP_SYNTAX_ERROR	500
 #define FTP_GET_PASSWD		331
-#define FTP_BUF_SIZE		512
+#define FTP_BUF_SIZE		1024
 
 #define XML_NANO_MAX_URLBUF	4096
 

testapi.c

@@ -32985,6 +32985,54 @@ test_xmlSchemaGetCanonValue(void) {
 }
 
 
+static int
+test_xmlSchemaGetCanonValueWhtsp(void) {
+    int test_ret = 0;
+
+#if defined(LIBXML_SCHEMAS_ENABLED)
+    int mem_base;
+    int ret_val;
+    xmlSchemaValPtr val; /* the precomputed value */
+    int n_val;
+    xmlChar ** retValue; /* the returned value */
+    int n_retValue;
+    xmlSchemaWhitespaceValueType ws; /* the whitespace type of the value */
+    int n_ws;
+
+    for (n_val = 0;n_val < gen_nb_xmlSchemaValPtr;n_val++) {
+    for (n_retValue = 0;n_retValue < gen_nb_const_xmlChar_ptr_ptr;n_retValue++) {
+    for (n_ws = 0;n_ws < gen_nb_xmlSchemaWhitespaceValueType;n_ws++) {
+        mem_base = xmlMemBlocks();
+        val = gen_xmlSchemaValPtr(n_val, 0);
+        retValue = gen_const_xmlChar_ptr_ptr(n_retValue, 1);
+        ws = gen_xmlSchemaWhitespaceValueType(n_ws, 2);
+
+        ret_val = xmlSchemaGetCanonValueWhtsp(val, (const xmlChar **)retValue, ws);
+        desret_int(ret_val);
+        call_tests++;
+        des_xmlSchemaValPtr(n_val, val, 0);
+        des_const_xmlChar_ptr_ptr(n_retValue, (const xmlChar **)retValue, 1);
+        des_xmlSchemaWhitespaceValueType(n_ws, ws, 2);
+        xmlResetLastError();
+        if (mem_base != xmlMemBlocks()) {
+            printf("Leak of %d blocks found in xmlSchemaGetCanonValueWhtsp",
+	           xmlMemBlocks() - mem_base);
+	    test_ret++;
+            printf(" %d", n_val);
+            printf(" %d", n_retValue);
+            printf(" %d", n_ws);
+            printf("\n");
+        }
+    }
+    }
+    }
+    function_tests++;
+#endif
+
+    return(test_ret);
+}
+
+
 static int
 test_xmlSchemaGetFacetValueAsULong(void) {
     int test_ret = 0;
@@ -33697,7 +33745,7 @@ static int
 test_xmlschemastypes(void) {
     int test_ret = 0;
 
-    if (quiet == 0) printf("Testing xmlschemastypes : 22 of 28 functions ...\n");
+    if (quiet == 0) printf("Testing xmlschemastypes : 23 of 29 functions ...\n");
     test_ret += test_xmlSchemaCheckFacet();
     test_ret += test_xmlSchemaCleanupTypes();
     test_ret += test_xmlSchemaCollapseString();
@@ -33707,6 +33755,7 @@ test_xmlschemastypes(void) {
     test_ret += test_xmlSchemaGetBuiltInListSimpleTypeItemType();
     test_ret += test_xmlSchemaGetBuiltInType();
     test_ret += test_xmlSchemaGetCanonValue();
+    test_ret += test_xmlSchemaGetCanonValueWhtsp();
     test_ret += test_xmlSchemaGetFacetValueAsULong();
     test_ret += test_xmlSchemaGetPredefinedType();
     test_ret += test_xmlSchemaGetValType();

win32/libxml2.def.src

@@ -1557,6 +1557,9 @@ xmlSchemaGetBuiltInType
 xmlSchemaGetCanonValue
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaGetCanonValueWhtsp
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaGetFacetValueAsULong
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED