mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-07-29 11:41:22 +03:00
warning message cleanup. Now compiles warning-free, all tests passed.
* xmlschemas.c, xmlschemastypes.c: warning message cleanup. Now compiles warning-free, all tests passed. * SAX2.c: small change to comments for documentation. No change to logic.
This commit is contained in:
William M. Brack
@ -1,3 +1,10 @@
|
|||||||
|
Wed Jun 30 19:45:23 HKT 2004 William Brack <wbrack@mmm.com.hk>
|
||||||
|
|
||||||
|
* xmlschemas.c, xmlschemastypes.c: warning message cleanup.
|
||||||
|
Now compiles warning-free, all tests passed.
|
||||||
|
* SAX2.c: small change to comments for documentation.
|
||||||
|
No change to logic.
|
||||||
|
|
||||||
Tue Jun 29 15:00:13 PDT 2004 Daniel Veillard <daniel@veillard.com>
|
Tue Jun 29 15:00:13 PDT 2004 Daniel Veillard <daniel@veillard.com>
|
||||||
|
|
||||||
* xmlschemas.c: more fixes with Kasimier, looks far cleaner :-)
|
* xmlschemas.c: more fixes with Kasimier, looks far cleaner :-)
|
||||||
|
|||||||
7
SAX2.c
7
SAX2.c
@ -2513,9 +2513,10 @@ static int xmlSAX2DefaultVersionValue = 2;
|
|||||||
* @version: the version, 1 or 2
|
* @version: the version, 1 or 2
|
||||||
*
|
*
|
||||||
* Set the default version of SAX used globally by the library.
|
* Set the default version of SAX used globally by the library.
|
||||||
* Note that this may not be a good thing to do from a library
|
* By default, during initialization the default is set to 2.
|
||||||
* it is better to use xmlSAXVersion() to set up specifically the
|
* Note that it is generally a better coding style to use
|
||||||
* version for a given parsing context.
|
* xmlSAXVersion() to set up the version explicitly for a given
|
||||||
|
* parsing context.
|
||||||
*
|
*
|
||||||
* Returns the previous value in case of success and -1 in case of error.
|
* Returns the previous value in case of success and -1 in case of error.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -635,57 +635,6 @@ Class xmlDoc(xmlNode)
|
|||||||
|
|
||||||
# functions from module xpointer
|
# functions from module xpointer
|
||||||
xpointerNewContext()
|
xpointerNewContext()
|
||||||
Class xpathContext()
|
|
||||||
# accessors
|
|
||||||
contextDoc()
|
|
||||||
contextNode()
|
|
||||||
contextPosition()
|
|
||||||
contextSize()
|
|
||||||
function()
|
|
||||||
functionURI()
|
|
||||||
setContextDoc()
|
|
||||||
setContextNode()
|
|
||||||
|
|
||||||
# functions from module python
|
|
||||||
registerXPathFunction()
|
|
||||||
|
|
||||||
# functions from module xpath
|
|
||||||
xpathEval()
|
|
||||||
xpathEvalExpression()
|
|
||||||
xpathFreeContext()
|
|
||||||
|
|
||||||
# functions from module xpathInternals
|
|
||||||
xpathNewParserContext()
|
|
||||||
xpathNsLookup()
|
|
||||||
xpathRegisterAllFunctions()
|
|
||||||
xpathRegisterNs()
|
|
||||||
xpathRegisteredFuncsCleanup()
|
|
||||||
xpathRegisteredNsCleanup()
|
|
||||||
xpathRegisteredVariablesCleanup()
|
|
||||||
xpathVariableLookup()
|
|
||||||
xpathVariableLookupNS()
|
|
||||||
|
|
||||||
# functions from module xpointer
|
|
||||||
xpointerEval()
|
|
||||||
|
|
||||||
|
|
||||||
Class xmlAttribute(xmlNode)
|
|
||||||
Class catalog()
|
|
||||||
|
|
||||||
# functions from module catalog
|
|
||||||
add()
|
|
||||||
catalogIsEmpty()
|
|
||||||
convertSGMLCatalog()
|
|
||||||
dump()
|
|
||||||
freeCatalog()
|
|
||||||
remove()
|
|
||||||
resolve()
|
|
||||||
resolvePublic()
|
|
||||||
resolveSystem()
|
|
||||||
resolveURI()
|
|
||||||
|
|
||||||
|
|
||||||
Class xmlElement(xmlNode)
|
|
||||||
|
|
||||||
|
|
||||||
Class xmlAttr(xmlNode)
|
Class xmlAttr(xmlNode)
|
||||||
@ -704,62 +653,6 @@ Class xmlAttr(xmlNode)
|
|||||||
# functions from module valid
|
# functions from module valid
|
||||||
removeID()
|
removeID()
|
||||||
removeRef()
|
removeRef()
|
||||||
|
|
||||||
|
|
||||||
Class xmlTextReader(xmlTextReaderCore)
|
|
||||||
|
|
||||||
# functions from module xmlreader
|
|
||||||
AttributeCount()
|
|
||||||
BaseUri()
|
|
||||||
Close()
|
|
||||||
CurrentDoc()
|
|
||||||
CurrentNode()
|
|
||||||
Depth()
|
|
||||||
Expand()
|
|
||||||
GetAttribute()
|
|
||||||
GetAttributeNo()
|
|
||||||
GetAttributeNs()
|
|
||||||
GetParserProp()
|
|
||||||
GetRemainder()
|
|
||||||
HasAttributes()
|
|
||||||
HasValue()
|
|
||||||
IsDefault()
|
|
||||||
IsEmptyElement()
|
|
||||||
IsValid()
|
|
||||||
LocalName()
|
|
||||||
LookupNamespace()
|
|
||||||
MoveToAttribute()
|
|
||||||
MoveToAttributeNo()
|
|
||||||
MoveToAttributeNs()
|
|
||||||
MoveToElement()
|
|
||||||
MoveToFirstAttribute()
|
|
||||||
MoveToNextAttribute()
|
|
||||||
Name()
|
|
||||||
NamespaceUri()
|
|
||||||
NewDoc()
|
|
||||||
NewFd()
|
|
||||||
NewFile()
|
|
||||||
NewMemory()
|
|
||||||
NewWalker()
|
|
||||||
Next()
|
|
||||||
NextSibling()
|
|
||||||
NodeType()
|
|
||||||
Normalization()
|
|
||||||
Prefix()
|
|
||||||
Preserve()
|
|
||||||
QuoteChar()
|
|
||||||
Read()
|
|
||||||
ReadAttributeValue()
|
|
||||||
ReadInnerXml()
|
|
||||||
ReadOuterXml()
|
|
||||||
ReadState()
|
|
||||||
ReadString()
|
|
||||||
RelaxNGSetSchema()
|
|
||||||
RelaxNGValidate()
|
|
||||||
SetParserProp()
|
|
||||||
String()
|
|
||||||
Value()
|
|
||||||
XmlLang()
|
|
||||||
Class xmlReg()
|
Class xmlReg()
|
||||||
|
|
||||||
# functions from module xmlregexp
|
# functions from module xmlregexp
|
||||||
@ -767,34 +660,6 @@ Class xmlReg()
|
|||||||
regexpFreeRegexp()
|
regexpFreeRegexp()
|
||||||
regexpIsDeterminist()
|
regexpIsDeterminist()
|
||||||
regexpPrint()
|
regexpPrint()
|
||||||
|
|
||||||
|
|
||||||
Class xmlEntity(xmlNode)
|
|
||||||
|
|
||||||
# functions from module parserInternals
|
|
||||||
handleEntity()
|
|
||||||
Class relaxNgSchema()
|
|
||||||
|
|
||||||
# functions from module relaxng
|
|
||||||
relaxNGDump()
|
|
||||||
relaxNGDumpTree()
|
|
||||||
relaxNGFree()
|
|
||||||
relaxNGNewValidCtxt()
|
|
||||||
|
|
||||||
# functions from module xmlreader
|
|
||||||
RelaxNGSetSchema()
|
|
||||||
Class Error()
|
|
||||||
# accessors
|
|
||||||
code()
|
|
||||||
domain()
|
|
||||||
file()
|
|
||||||
level()
|
|
||||||
line()
|
|
||||||
message()
|
|
||||||
|
|
||||||
# functions from module xmlerror
|
|
||||||
copyError()
|
|
||||||
resetError()
|
|
||||||
Class relaxNgValidCtxt()
|
Class relaxNgValidCtxt()
|
||||||
|
|
||||||
# functions from module relaxng
|
# functions from module relaxng
|
||||||
@ -803,73 +668,6 @@ Class relaxNgValidCtxt()
|
|||||||
relaxNGValidatePopElement()
|
relaxNGValidatePopElement()
|
||||||
relaxNGValidatePushCData()
|
relaxNGValidatePushCData()
|
||||||
relaxNGValidatePushElement()
|
relaxNGValidatePushElement()
|
||||||
Class xpathParserContext()
|
|
||||||
# accessors
|
|
||||||
context()
|
|
||||||
|
|
||||||
# functions from module xpathInternals
|
|
||||||
xpathAddValues()
|
|
||||||
xpathBooleanFunction()
|
|
||||||
xpathCeilingFunction()
|
|
||||||
xpathCompareValues()
|
|
||||||
xpathConcatFunction()
|
|
||||||
xpathContainsFunction()
|
|
||||||
xpathCountFunction()
|
|
||||||
xpathDivValues()
|
|
||||||
xpathEqualValues()
|
|
||||||
xpathErr()
|
|
||||||
xpathEvalExpr()
|
|
||||||
xpathFalseFunction()
|
|
||||||
xpathFloorFunction()
|
|
||||||
xpathFreeParserContext()
|
|
||||||
xpathIdFunction()
|
|
||||||
xpathLangFunction()
|
|
||||||
xpathLastFunction()
|
|
||||||
xpathLocalNameFunction()
|
|
||||||
xpathModValues()
|
|
||||||
xpathMultValues()
|
|
||||||
xpathNamespaceURIFunction()
|
|
||||||
xpathNextAncestor()
|
|
||||||
xpathNextAncestorOrSelf()
|
|
||||||
xpathNextAttribute()
|
|
||||||
xpathNextChild()
|
|
||||||
xpathNextDescendant()
|
|
||||||
xpathNextDescendantOrSelf()
|
|
||||||
xpathNextFollowing()
|
|
||||||
xpathNextFollowingSibling()
|
|
||||||
xpathNextNamespace()
|
|
||||||
xpathNextParent()
|
|
||||||
xpathNextPreceding()
|
|
||||||
xpathNextPrecedingSibling()
|
|
||||||
xpathNextSelf()
|
|
||||||
xpathNormalizeFunction()
|
|
||||||
xpathNotEqualValues()
|
|
||||||
xpathNotFunction()
|
|
||||||
xpathNumberFunction()
|
|
||||||
xpathParseNCName()
|
|
||||||
xpathParseName()
|
|
||||||
xpathPopBoolean()
|
|
||||||
xpathPopNumber()
|
|
||||||
xpathPopString()
|
|
||||||
xpathPositionFunction()
|
|
||||||
xpathRoot()
|
|
||||||
xpathRoundFunction()
|
|
||||||
xpathStartsWithFunction()
|
|
||||||
xpathStringFunction()
|
|
||||||
xpathStringLengthFunction()
|
|
||||||
xpathSubValues()
|
|
||||||
xpathSubstringAfterFunction()
|
|
||||||
xpathSubstringBeforeFunction()
|
|
||||||
xpathSubstringFunction()
|
|
||||||
xpathSumFunction()
|
|
||||||
xpathTranslateFunction()
|
|
||||||
xpathTrueFunction()
|
|
||||||
xpathValueFlipSign()
|
|
||||||
xpatherror()
|
|
||||||
|
|
||||||
# functions from module xpointer
|
|
||||||
xpointerEvalRangePredicate()
|
|
||||||
xpointerRangeToFunction()
|
|
||||||
|
|
||||||
|
|
||||||
Class parserCtxt(parserCtxtCore)
|
Class parserCtxt(parserCtxtCore)
|
||||||
@ -977,6 +775,92 @@ Class xmlDtd(xmlNode)
|
|||||||
dtdElementDesc()
|
dtdElementDesc()
|
||||||
dtdQAttrDesc()
|
dtdQAttrDesc()
|
||||||
dtdQElementDesc()
|
dtdQElementDesc()
|
||||||
|
Class relaxNgParserCtxt()
|
||||||
|
|
||||||
|
# functions from module relaxng
|
||||||
|
relaxNGFreeParserCtxt()
|
||||||
|
relaxNGParse()
|
||||||
|
relaxParserSetFlag()
|
||||||
|
Class xpathParserContext()
|
||||||
|
# accessors
|
||||||
|
context()
|
||||||
|
|
||||||
|
# functions from module xpathInternals
|
||||||
|
xpathAddValues()
|
||||||
|
xpathBooleanFunction()
|
||||||
|
xpathCeilingFunction()
|
||||||
|
xpathCompareValues()
|
||||||
|
xpathConcatFunction()
|
||||||
|
xpathContainsFunction()
|
||||||
|
xpathCountFunction()
|
||||||
|
xpathDivValues()
|
||||||
|
xpathEqualValues()
|
||||||
|
xpathErr()
|
||||||
|
xpathEvalExpr()
|
||||||
|
xpathFalseFunction()
|
||||||
|
xpathFloorFunction()
|
||||||
|
xpathFreeParserContext()
|
||||||
|
xpathIdFunction()
|
||||||
|
xpathLangFunction()
|
||||||
|
xpathLastFunction()
|
||||||
|
xpathLocalNameFunction()
|
||||||
|
xpathModValues()
|
||||||
|
xpathMultValues()
|
||||||
|
xpathNamespaceURIFunction()
|
||||||
|
xpathNextAncestor()
|
||||||
|
xpathNextAncestorOrSelf()
|
||||||
|
xpathNextAttribute()
|
||||||
|
xpathNextChild()
|
||||||
|
xpathNextDescendant()
|
||||||
|
xpathNextDescendantOrSelf()
|
||||||
|
xpathNextFollowing()
|
||||||
|
xpathNextFollowingSibling()
|
||||||
|
xpathNextNamespace()
|
||||||
|
xpathNextParent()
|
||||||
|
xpathNextPreceding()
|
||||||
|
xpathNextPrecedingSibling()
|
||||||
|
xpathNextSelf()
|
||||||
|
xpathNormalizeFunction()
|
||||||
|
xpathNotEqualValues()
|
||||||
|
xpathNotFunction()
|
||||||
|
xpathNumberFunction()
|
||||||
|
xpathParseNCName()
|
||||||
|
xpathParseName()
|
||||||
|
xpathPopBoolean()
|
||||||
|
xpathPopNumber()
|
||||||
|
xpathPopString()
|
||||||
|
xpathPositionFunction()
|
||||||
|
xpathRoot()
|
||||||
|
xpathRoundFunction()
|
||||||
|
xpathStartsWithFunction()
|
||||||
|
xpathStringFunction()
|
||||||
|
xpathStringLengthFunction()
|
||||||
|
xpathSubValues()
|
||||||
|
xpathSubstringAfterFunction()
|
||||||
|
xpathSubstringBeforeFunction()
|
||||||
|
xpathSubstringFunction()
|
||||||
|
xpathSumFunction()
|
||||||
|
xpathTranslateFunction()
|
||||||
|
xpathTrueFunction()
|
||||||
|
xpathValueFlipSign()
|
||||||
|
xpatherror()
|
||||||
|
|
||||||
|
# functions from module xpointer
|
||||||
|
xpointerEvalRangePredicate()
|
||||||
|
xpointerRangeToFunction()
|
||||||
|
Class catalog()
|
||||||
|
|
||||||
|
# functions from module catalog
|
||||||
|
add()
|
||||||
|
catalogIsEmpty()
|
||||||
|
convertSGMLCatalog()
|
||||||
|
dump()
|
||||||
|
freeCatalog()
|
||||||
|
remove()
|
||||||
|
resolve()
|
||||||
|
resolvePublic()
|
||||||
|
resolveSystem()
|
||||||
|
resolveURI()
|
||||||
|
|
||||||
|
|
||||||
Class xmlNs(xmlNode)
|
Class xmlNs(xmlNode)
|
||||||
@ -1000,42 +884,6 @@ Class xmlNs(xmlNode)
|
|||||||
|
|
||||||
# functions from module xpathInternals
|
# functions from module xpathInternals
|
||||||
xpathNodeSetFreeNs()
|
xpathNodeSetFreeNs()
|
||||||
|
|
||||||
|
|
||||||
Class inputBuffer(ioReadWrapper)
|
|
||||||
|
|
||||||
# functions from module xmlIO
|
|
||||||
freeParserInputBuffer()
|
|
||||||
grow()
|
|
||||||
push()
|
|
||||||
read()
|
|
||||||
|
|
||||||
# functions from module xmlreader
|
|
||||||
newTextReader()
|
|
||||||
Class relaxNgParserCtxt()
|
|
||||||
|
|
||||||
# functions from module relaxng
|
|
||||||
relaxNGFreeParserCtxt()
|
|
||||||
relaxNGParse()
|
|
||||||
relaxParserSetFlag()
|
|
||||||
|
|
||||||
|
|
||||||
Class outputBuffer(ioWriteWrapper)
|
|
||||||
|
|
||||||
# functions from module HTMLtree
|
|
||||||
htmlDocContentDumpFormatOutput()
|
|
||||||
htmlDocContentDumpOutput()
|
|
||||||
htmlNodeDumpFormatOutput()
|
|
||||||
htmlNodeDumpOutput()
|
|
||||||
|
|
||||||
# functions from module tree
|
|
||||||
nodeDumpOutput()
|
|
||||||
saveFileTo()
|
|
||||||
saveFormatFileTo()
|
|
||||||
|
|
||||||
# functions from module xmlIO
|
|
||||||
write()
|
|
||||||
writeString()
|
|
||||||
Class xmlTextReaderLocator()
|
Class xmlTextReaderLocator()
|
||||||
|
|
||||||
# functions from module xmlreader
|
# functions from module xmlreader
|
||||||
@ -1067,3 +915,155 @@ Class URI()
|
|||||||
parseURIReference()
|
parseURIReference()
|
||||||
printURI()
|
printURI()
|
||||||
saveUri()
|
saveUri()
|
||||||
|
|
||||||
|
|
||||||
|
Class xmlAttribute(xmlNode)
|
||||||
|
Class xpathContext()
|
||||||
|
# accessors
|
||||||
|
contextDoc()
|
||||||
|
contextNode()
|
||||||
|
contextPosition()
|
||||||
|
contextSize()
|
||||||
|
function()
|
||||||
|
functionURI()
|
||||||
|
setContextDoc()
|
||||||
|
setContextNode()
|
||||||
|
|
||||||
|
# functions from module python
|
||||||
|
registerXPathFunction()
|
||||||
|
|
||||||
|
# functions from module xpath
|
||||||
|
xpathEval()
|
||||||
|
xpathEvalExpression()
|
||||||
|
xpathFreeContext()
|
||||||
|
|
||||||
|
# functions from module xpathInternals
|
||||||
|
xpathNewParserContext()
|
||||||
|
xpathNsLookup()
|
||||||
|
xpathRegisterAllFunctions()
|
||||||
|
xpathRegisterNs()
|
||||||
|
xpathRegisteredFuncsCleanup()
|
||||||
|
xpathRegisteredNsCleanup()
|
||||||
|
xpathRegisteredVariablesCleanup()
|
||||||
|
xpathVariableLookup()
|
||||||
|
xpathVariableLookupNS()
|
||||||
|
|
||||||
|
# functions from module xpointer
|
||||||
|
xpointerEval()
|
||||||
|
|
||||||
|
|
||||||
|
Class xmlElement(xmlNode)
|
||||||
|
|
||||||
|
|
||||||
|
Class xmlTextReader(xmlTextReaderCore)
|
||||||
|
|
||||||
|
# functions from module xmlreader
|
||||||
|
AttributeCount()
|
||||||
|
BaseUri()
|
||||||
|
Close()
|
||||||
|
CurrentDoc()
|
||||||
|
CurrentNode()
|
||||||
|
Depth()
|
||||||
|
Expand()
|
||||||
|
GetAttribute()
|
||||||
|
GetAttributeNo()
|
||||||
|
GetAttributeNs()
|
||||||
|
GetParserProp()
|
||||||
|
GetRemainder()
|
||||||
|
HasAttributes()
|
||||||
|
HasValue()
|
||||||
|
IsDefault()
|
||||||
|
IsEmptyElement()
|
||||||
|
IsValid()
|
||||||
|
LocalName()
|
||||||
|
LookupNamespace()
|
||||||
|
MoveToAttribute()
|
||||||
|
MoveToAttributeNo()
|
||||||
|
MoveToAttributeNs()
|
||||||
|
MoveToElement()
|
||||||
|
MoveToFirstAttribute()
|
||||||
|
MoveToNextAttribute()
|
||||||
|
Name()
|
||||||
|
NamespaceUri()
|
||||||
|
NewDoc()
|
||||||
|
NewFd()
|
||||||
|
NewFile()
|
||||||
|
NewMemory()
|
||||||
|
NewWalker()
|
||||||
|
Next()
|
||||||
|
NextSibling()
|
||||||
|
NodeType()
|
||||||
|
Normalization()
|
||||||
|
Prefix()
|
||||||
|
Preserve()
|
||||||
|
QuoteChar()
|
||||||
|
Read()
|
||||||
|
ReadAttributeValue()
|
||||||
|
ReadInnerXml()
|
||||||
|
ReadOuterXml()
|
||||||
|
ReadState()
|
||||||
|
ReadString()
|
||||||
|
RelaxNGSetSchema()
|
||||||
|
RelaxNGValidate()
|
||||||
|
SetParserProp()
|
||||||
|
String()
|
||||||
|
Value()
|
||||||
|
XmlLang()
|
||||||
|
|
||||||
|
|
||||||
|
Class xmlEntity(xmlNode)
|
||||||
|
|
||||||
|
# functions from module parserInternals
|
||||||
|
handleEntity()
|
||||||
|
Class Error()
|
||||||
|
# accessors
|
||||||
|
code()
|
||||||
|
domain()
|
||||||
|
file()
|
||||||
|
level()
|
||||||
|
line()
|
||||||
|
message()
|
||||||
|
|
||||||
|
# functions from module xmlerror
|
||||||
|
copyError()
|
||||||
|
resetError()
|
||||||
|
Class relaxNgSchema()
|
||||||
|
|
||||||
|
# functions from module relaxng
|
||||||
|
relaxNGDump()
|
||||||
|
relaxNGDumpTree()
|
||||||
|
relaxNGFree()
|
||||||
|
relaxNGNewValidCtxt()
|
||||||
|
|
||||||
|
# functions from module xmlreader
|
||||||
|
RelaxNGSetSchema()
|
||||||
|
|
||||||
|
|
||||||
|
Class inputBuffer(ioReadWrapper)
|
||||||
|
|
||||||
|
# functions from module xmlIO
|
||||||
|
freeParserInputBuffer()
|
||||||
|
grow()
|
||||||
|
push()
|
||||||
|
read()
|
||||||
|
|
||||||
|
# functions from module xmlreader
|
||||||
|
newTextReader()
|
||||||
|
|
||||||
|
|
||||||
|
Class outputBuffer(ioWriteWrapper)
|
||||||
|
|
||||||
|
# functions from module HTMLtree
|
||||||
|
htmlDocContentDumpFormatOutput()
|
||||||
|
htmlDocContentDumpOutput()
|
||||||
|
htmlNodeDumpFormatOutput()
|
||||||
|
htmlNodeDumpOutput()
|
||||||
|
|
||||||
|
# functions from module tree
|
||||||
|
nodeDumpOutput()
|
||||||
|
saveFileTo()
|
||||||
|
saveFormatFileTo()
|
||||||
|
|
||||||
|
# functions from module xmlIO
|
||||||
|
write()
|
||||||
|
writeString()
|
||||||
|
|||||||
@ -7304,6 +7304,7 @@ xmlSchemaCheckCOSSTRestricts(xmlSchemaParserCtxtPtr ctxt,
|
|||||||
"Atomic simple type \"%s\": the facet \"%s\" "
|
"Atomic simple type \"%s\": the facet \"%s\" "
|
||||||
"is not allowed on primitive type \"%s\".\n",
|
"is not allowed on primitive type \"%s\".\n",
|
||||||
type->name,
|
type->name,
|
||||||
|
(const xmlChar *)
|
||||||
xmlSchemaFacetTypeToString(facet->type),
|
xmlSchemaFacetTypeToString(facet->type),
|
||||||
BAD_CAST primitive->name, NULL, NULL);
|
BAD_CAST primitive->name, NULL, NULL);
|
||||||
|
|
||||||
@ -9804,21 +9805,22 @@ xmlSchemaValidateSimpleTypeValue(xmlSchemaValidCtxtPtr ctxt,
|
|||||||
xmlSchemaVErr(ctxt, ctxt->cur, ret,
|
xmlSchemaVErr(ctxt, ctxt->cur, ret,
|
||||||
"The value with length \"%s\" is not "
|
"The value with length \"%s\" is not "
|
||||||
"facet-valid with respect to length = \"%s\".\n",
|
"facet-valid with respect to length = \"%s\".\n",
|
||||||
l, fl);
|
(const xmlChar *)l, (const xmlChar *)fl);
|
||||||
} else if (ret == XML_SCHEMAV_CVC_MINLENGTH_VALID) {
|
} else if (ret == XML_SCHEMAV_CVC_MINLENGTH_VALID) {
|
||||||
xmlSchemaVErr(ctxt, ctxt->cur, ret,
|
xmlSchemaVErr(ctxt, ctxt->cur, ret,
|
||||||
"The value with length \"%s\" is not "
|
"The value with length \"%s\" is not "
|
||||||
"facet-valid with respect to minLength = \"%s\".\n",
|
"facet-valid with respect to minLength = \"%s\".\n",
|
||||||
l, fl);
|
(const xmlChar *)l, (const xmlChar *)fl);
|
||||||
} else if (ret == XML_SCHEMAV_CVC_MAXLENGTH_VALID) {
|
} else if (ret == XML_SCHEMAV_CVC_MAXLENGTH_VALID) {
|
||||||
xmlSchemaVErr(ctxt, ctxt->cur, ret,
|
xmlSchemaVErr(ctxt, ctxt->cur, ret,
|
||||||
"The value with length \"%s\" is not "
|
"The value with length \"%s\" is not "
|
||||||
"facet-valid with respect to maxLength = \"%s\".\n",
|
"facet-valid with respect to maxLength = \"%s\".\n",
|
||||||
l, fl);
|
(const xmlChar *)l, (const xmlChar *)fl);
|
||||||
} else {
|
} else {
|
||||||
xmlSchemaVErr(ctxt, ctxt->cur, ret,
|
xmlSchemaVErr(ctxt, ctxt->cur, ret,
|
||||||
"The value is not valid with respect "
|
"The value is not valid with respect "
|
||||||
"to the facet \"%s\".\n",
|
"to the facet \"%s\".\n",
|
||||||
|
(const xmlChar *)
|
||||||
xmlSchemaFacetTypeToString(facet->type),
|
xmlSchemaFacetTypeToString(facet->type),
|
||||||
NULL);
|
NULL);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -250,6 +250,8 @@ xmlSchemaInitBasicType(const char *name, xmlSchemaValType type,
|
|||||||
case XML_SCHEMAS_QNAME:
|
case XML_SCHEMAS_QNAME:
|
||||||
case XML_SCHEMAS_NOTATION:
|
case XML_SCHEMAS_NOTATION:
|
||||||
ret->flags |= XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE;
|
ret->flags |= XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
xmlHashAddEntry2(xmlSchemaTypesBank, ret->name,
|
xmlHashAddEntry2(xmlSchemaTypesBank, ret->name,
|
||||||
@ -3665,6 +3667,9 @@ xmlSchemaCompareValues(xmlSchemaValPtr x, xmlSchemaValPtr y) {
|
|||||||
case XML_SCHEMAS_NMTOKENS:
|
case XML_SCHEMAS_NMTOKENS:
|
||||||
TODO
|
TODO
|
||||||
break;
|
break;
|
||||||
|
case XML_SCHEMAS_ANYTYPE:
|
||||||
|
case XML_SCHEMAS_ANYSIMPLETYPE:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user