From 0fc063df3ab2ad380d532d210dd1001de473e51b Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 4 Apr 2005 18:23:13 +0000 Subject: Load /tmp/tmp.98zkCi/libxml2-2.6.19 into packages/libxml2/branches/upstream/current. --- include/libxml/parser.h | 4 ++-- include/libxml/schemasInternals.h | 20 ++++++++++++++++++-- include/libxml/xmlerror.h | 2 ++ include/libxml/xmlschemastypes.h | 22 +++++++++++++++++++--- include/libxml/xmlversion.h | 10 +++++----- 5 files changed, 46 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/libxml/parser.h b/include/libxml/parser.h index 6e2d241..e0de43f 100644 --- a/include/libxml/parser.h +++ b/include/libxml/parser.h @@ -825,7 +825,7 @@ XMLPUBFUN int XMLCALL */ #ifdef LIBXML_SAX1_ENABLED XMLPUBFUN xmlDocPtr XMLCALL - xmlParseDoc (xmlChar *cur); + xmlParseDoc (const xmlChar *cur); XMLPUBFUN xmlDocPtr XMLCALL xmlParseFile (const char *filename); XMLPUBFUN xmlDocPtr XMLCALL @@ -877,7 +877,7 @@ XMLPUBFUN int XMLCALL int size); XMLPUBFUN xmlDocPtr XMLCALL xmlSAXParseDoc (xmlSAXHandlerPtr sax, - xmlChar *cur, + const xmlChar *cur, int recovery); XMLPUBFUN xmlDocPtr XMLCALL xmlSAXParseMemory (xmlSAXHandlerPtr sax, diff --git a/include/libxml/schemasInternals.h b/include/libxml/schemasInternals.h index 0cd8053..2c39a87 100644 --- a/include/libxml/schemasInternals.h +++ b/include/libxml/schemasInternals.h @@ -102,6 +102,7 @@ typedef enum { XML_SCHEMA_TYPE_IDC_UNIQUE, XML_SCHEMA_TYPE_IDC_KEY, XML_SCHEMA_TYPE_IDC_KEYREF, + XML_SCHEMA_TYPE_PARTICLE, XML_SCHEMA_FACET_MININCLUSIVE = 1000, XML_SCHEMA_FACET_MINEXCLUSIVE, XML_SCHEMA_FACET_MAXINCLUSIVE, @@ -113,7 +114,8 @@ typedef enum { XML_SCHEMA_FACET_WHITESPACE, XML_SCHEMA_FACET_LENGTH, XML_SCHEMA_FACET_MAXLENGTH, - XML_SCHEMA_FACET_MINLENGTH + XML_SCHEMA_FACET_MINLENGTH, + XML_SCHEMA_EXTRA_QNAMEREF = 2000 } xmlSchemaTypeType; typedef enum { @@ -409,7 +411,7 @@ struct _xmlSchemaFacetLink { * the complexType owns an attribute wildcard, i.e. * it can be freed by the complexType */ -#define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD 1 << 4 +#define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD 1 << 4 /* Obsolete. */ /** * XML_SCHEMAS_TYPE_VARIETY_ABSENT: * @@ -507,6 +509,19 @@ struct _xmlSchemaFacetLink { * indicates if the facets need a computed value */ #define XML_SCHEMAS_TYPE_FACETSNEEDVALUE 1 << 21 +/** + * XML_SCHEMAS_TYPE_INTERNAL_RESOLVED: + * + * indicates that the type was typefixed + */ +#define XML_SCHEMAS_TYPE_INTERNAL_RESOLVED 1 << 22 +/** + * XML_SCHEMAS_TYPE_INTERNAL_INVALID: + * + * indicates that the type is invalid + */ +#define XML_SCHEMAS_TYPE_INTERNAL_INVALID 1 << 23 + /** * _xmlSchemaType: @@ -835,6 +850,7 @@ struct _xmlSchema { int preserve; /* whether to free the document */ int counter; /* used to give ononymous components unique names */ xmlHashTablePtr idcDef; + void *volatiles; /* Misc. helper items (e.g. reference items) */ }; XMLPUBFUN void XMLCALL xmlSchemaFreeType (xmlSchemaTypePtr type); diff --git a/include/libxml/xmlerror.h b/include/libxml/xmlerror.h index df883e5..540a51e 100644 --- a/include/libxml/xmlerror.h +++ b/include/libxml/xmlerror.h @@ -663,6 +663,8 @@ typedef enum { XML_C14N_REQUIRES_UTF8, /* 1951 */ XML_C14N_CREATE_STACK, /* 1952 */ XML_C14N_INVALID_NODE, /* 1953 */ + XML_C14N_UNKNOW_NODE, /* 1954 */ + XML_C14N_RELATIVE_NAMESPACE, /* 1955 */ XML_FTP_PASV_ANSWER = 2000, XML_FTP_EPSV_ANSWER, /* 2001 */ XML_FTP_ACCNT, /* 2002 */ diff --git a/include/libxml/xmlschemastypes.h b/include/libxml/xmlschemastypes.h index 004386f..18014fe 100644 --- a/include/libxml/xmlschemastypes.h +++ b/include/libxml/xmlschemastypes.h @@ -50,7 +50,14 @@ XMLPUBFUN int XMLCALL xmlSchemaValidateFacet (xmlSchemaTypePtr base, xmlSchemaFacetPtr facet, const xmlChar *value, - xmlSchemaValPtr val); + xmlSchemaValPtr val); +XMLPUBFUN int XMLCALL + xmlSchemaValidateFacetWhtsp (xmlSchemaFacetPtr facet, + xmlSchemaWhitespaceValueType fws, + xmlSchemaValType valType, + const xmlChar *value, + xmlSchemaValPtr val, + xmlSchemaWhitespaceValueType ws); XMLPUBFUN void XMLCALL xmlSchemaFreeValue (xmlSchemaValPtr val); XMLPUBFUN xmlSchemaFacetPtr XMLCALL @@ -88,7 +95,14 @@ XMLPUBFUN int XMLCALL xmlSchemaFacetPtr facet, const xmlChar *value, xmlSchemaValPtr val, - unsigned long *length) ; + unsigned long *length); +XMLPUBFUN int XMLCALL + xmlSchemaValidateLengthFacetWhtsp(xmlSchemaFacetPtr facet, + xmlSchemaValType valType, + const xmlChar *value, + xmlSchemaValPtr val, + unsigned long *length, + xmlSchemaWhitespaceValueType ws); XMLPUBFUN int XMLCALL xmlSchemaValPredefTypeNodeNoNorm(xmlSchemaTypePtr type, const xmlChar *value, @@ -110,7 +124,9 @@ XMLPUBFUN int XMLCALL xmlSchemaValPtr y, xmlSchemaWhitespaceValueType yws); XMLPUBFUN xmlSchemaValPtr XMLCALL - xmlSchemaCopyValue (xmlSchemaValPtr val); + xmlSchemaCopyValue (xmlSchemaValPtr val); +XMLPUBFUN xmlSchemaValType XMLCALL + xmlSchemaGetValType (xmlSchemaValPtr val); #ifdef __cplusplus } diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h index 357910e..b31beca 100644 --- a/include/libxml/xmlversion.h +++ b/include/libxml/xmlversion.h @@ -29,28 +29,28 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.6.18" +#define LIBXML_DOTTED_VERSION "2.6.19" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 1002003 */ -#define LIBXML_VERSION 20618 +#define LIBXML_VERSION 20619 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "1002003" */ -#define LIBXML_VERSION_STRING "20618" +#define LIBXML_VERSION_STRING "20619" /** * LIBXML_VERSION_EXTRA: * * extra version information, used to show a CVS compilation */ -#define LIBXML_VERSION_EXTRA "-CVS2374" +#define LIBXML_VERSION_EXTRA "-CVS2405" /** * LIBXML_TEST_VERSION: @@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20618); +#define LIBXML_TEST_VERSION xmlCheckVersion(20619); #ifndef VMS #if 0 -- cgit v1.2.3