diff --git a/ChangeLog b/ChangeLog index 74d9ad55..df3c002f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 19 19:25:14 CET 2005 Daniel Veillard + + * xmlschemastypes.c: a bit of cleanup + * elfgcchack.h testapi.c doc/*: rebuilt the API the tests and + the documentation as a result. + Fri Feb 18 20:34:03 CET 2005 Daniel Veillard * xmlreader.c include/libxml/xmlreader.h: applied patch from diff --git a/doc/APIchunk0.html b/doc/APIchunk0.html index 805f11c7..5e909315 100644 --- a/doc/APIchunk0.html +++ b/doc/APIchunk0.html @@ -58,6 +58,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlOutputOpenCallback
xmlOutputWriteCallback
xmlRelaxNGValidateDoc
+xmlSchemaGetCanonValue
xmlSchemaSetValidOptions
xmlSchemaValPredefTypeNode
xmlSchemaValPredefTypeNodeNoNorm
@@ -126,6 +127,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewParserCtxt
xmlNewValidCtxt
xmlSchemaNewFacet
+xmlSchemaNewNOTATIONValue
+xmlSchemaNewStringValue
Allows
xmlCatalogSetDefaultPrefer
AlphabeticPresentationForms
xmlUCSIsAlphabeticPresentationForms
Also
xmlCheckUTF8
@@ -242,7 +245,6 @@ A:link, A:visited, A:active { text-decoration: underline }
Bopomofo
xmlUCSIsBopomofo
BopomofoExtended
xmlUCSIsBopomofoExtended
Both
XML_SUBSTITUTE_BOTH
-xmlStreamPush
BoxDrawing
xmlUCSIsBoxDrawing
BraillePatterns
xmlUCSIsBraillePatterns
Buffer
xmlIOParseDTD
diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html index 28b00380..6d5cbd2d 100644 --- a/doc/APIchunk1.html +++ b/doc/APIchunk1.html @@ -237,9 +237,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseMisc
Compare
xmlParseCharEncoding
xmlSchemaCompareValues
+xmlSchemaCompareValuesWhtsp
xmlXPathCmpNodes
Compile
xmlAutomataCompile
-xmlPatterncompile
xmlXPathCompile
xmlXPathCtxtCompile
xmlXPathStringEvalNumber
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index 4133b119..83ce973d 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -52,7 +52,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSaveFileTo
xmlSaveFormatFileTo
xmlSetEntityReferenceFunc
-xmlStreamPush
+xmlTextReaderByteConsumed
xmlTextReaderCurrentDoc
xmlTextReaderExpand
xmlTextReaderSetErrorHandler
@@ -219,6 +219,7 @@ A:link, A:visited, A:active { text-decoration: underline }
checking
xlinkIsLink
xmlBufferWriteQuotedString
xmlBuildURI
+xmlMemFree
xmlUTF8Strlen
checkings
xmlValidateOneElement
checks
XML_SCHEMAS_ATTRGROUP_MARKED
@@ -330,7 +331,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlBuildRelativeURI
xmlSAX2GetSystemId
combining
IS_COMBINING_CH
-
come
xmlStreamPush
coment
xmlTextWriterEndComment
comes
xmlValidityErrorFunc
xmlValidityWarningFunc
@@ -398,10 +398,8 @@ A:link, A:visited, A:active { text-decoration: underline }
compatible
LIBXML_TEST_VERSION
xmlShellPwd
compilation
LIBXML_VERSION_EXTRA
-xmlPatterncompile
xmlXPathCompile
xmlXPathCtxtCompile
-
compile
xmlPatterncompile
compile-time
docbCreateFileParserCtxt
docbParseFile
docbSAXParseFile
@@ -427,7 +425,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAutomataCompile
xmlCheckVersion
xmlGetLastError
-xmlPatterncompile
xmlRegexpCompile
xmlRegexpExec
xmlRegexpIsDeterminist
@@ -512,6 +509,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaValPredefTypeNodeNoNorm
xmlSchemaValidateLengthFacet
xmlSchemaValidatePredefinedType
+xmlTextReaderByteConsumed
concat
xmlXPathConcatFunction
concatenated
xmlStrcat
concatenation
xmlXPathConcatFunction
@@ -567,6 +565,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNanoHTTPOpenRedir
xmlNanoHTTPRead
connector
xmlParseElementChildrenContentDecl
+
cononical
xmlSchemaGetCanonValue
consequent
_xmlError
consideration
xmlBuildRelativeURI
considered
xmlHashScan3
@@ -757,6 +756,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlByteConsumed
could
xmlByteConsumed
xmlModuleClose
+xmlSchemaGetCanonValue
+xmlTextReaderByteConsumed
xmlTextReaderRelaxNGSetSchema
xmlTextReaderRelaxNGValidate
xmlValidateDtd
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html index 4de67275..42964684 100644 --- a/doc/APIchunk11.html +++ b/doc/APIchunk11.html @@ -200,7 +200,6 @@ A:link, A:visited, A:active { text-decoration: underline } startElementNsSAX2Func
xmlLoadCatalog
xmlLoadCatalogs
-xmlPatterncompile
xmlSAX2StartElementNs
xmlTextReaderPreservePattern
xmlValidateDtd
@@ -358,7 +357,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDictCreateSub
xmlDictReference
xmlHashCreateDict
-xmlStreamPush
dictionnary
_xmlParserCtxt
_xmlXPathContext
xmlDictCreate
@@ -370,8 +368,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDictQLookup
xmlDictReference
xmlDictSize
-xmlPatterncompile
-xmlStreamPush
did
XML_SCHEMAS_TYPE_BLOCK_DEFAULT
xmlTextReaderGetRemainder
xmlTextReaderStandalone
@@ -510,7 +506,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlKeepBlanksDefault
xmlNodeListGetRawString
xmlParserInputRead
-xmlPatternMatch
xmlRemoveProp
xmlUTF8Strlen
xmlValidateRoot
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html index b6e80df7..760638f9 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -231,7 +231,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlListDataCompare
equivalent
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemFree
+xmlMemMalloc
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlNodeListGetRawString
xmlNodeListGetString
xmlReallocLoc
@@ -255,6 +259,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlHashAddEntry3
xmlRelaxNGGetParserErrors
xmlRelaxNGSetParserErrors
+xmlSchemaGetCanonValue
xmlSchemaGetParserErrors
xmlSchemaSetParserErrors
xmlShellCmd
@@ -359,7 +364,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaNewMemParserCtxt
xmlSchemaNewParserCtxt
xmlSchemaValidateListSimpleTypeFacet
-xmlStreamPush
explicitly
xmlSAXDefaultVersion
explored
xmlXPathAxisFunc
exposing
xmlTextReaderRead
@@ -381,8 +385,7 @@ A:link, A:visited, A:active { text-decoration: underline } xlinkExtendedLinkSetFunk
xmlXPathNodeSetMerge
xmlXPtrLocationSetMerge
-
extension
LIBXML_MODULE_EXTENSION
-XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION
+
extension
XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION
XML_SCHEMAS_ELEM_FINAL_EXTENSION
XML_SCHEMAS_FINAL_DEFAULT_EXTENSION
XML_SCHEMAS_TYPE_BLOCK_EXTENSION
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index 1db52ff6..34808918 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -100,8 +100,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNanoHTTPOpenRedir
xmlNanoHTTPSave
xmlNewAutomata
-xmlPatternGetStreamCtxt
-xmlPatternMatch
xmlRelaxNGGetParserErrors
xmlSaveFile
xmlSaveFileEnc
@@ -218,8 +216,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextReaderIsValid
flagged
_htmlElemDesc
htmlGetMetaEncoding
-
flags
xmlPatterncompile
-xmlReaderForDoc
+
flags
xmlReaderForDoc
xmlReaderForFd
xmlReaderForFile
xmlReaderForIO
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index fc016a7a..066762f6 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -195,6 +195,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlByteConsumed
xmlParserFindNodeInfoIndex
xmlStrsub
+xmlTextReaderByteConsumed
xmlTextReaderGetAttributeNo
xmlTextReaderMoveToAttributeNo
xmlXPathNodeSetRemove
@@ -211,7 +212,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNanoHTTPMethodRedir
xmlNanoHTTPOpen
xmlNanoHTTPOpenRedir
-xmlStreamPush
indicates
XML_SCHEMAS_TYPE_FACETSNEEDVALUE
xmlHasNsProp
xmlNanoFTPRead
@@ -248,7 +248,10 @@ A:link, A:visited, A:active { text-decoration: underline } xmlInitNodeInfoSeq
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlNanoFTPList
xmlParserAddNodeInfo
xmlParserFindNodeInfo
@@ -275,6 +278,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGGetParserErrors
xmlSchemaGetParserErrors
xmlSchemaValidateStream
+xmlTextReaderByteConsumed
xmlXPathOrderDocElems
informations
_xmlAttr
_xmlDoc
@@ -315,7 +319,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAutomataGetInitState
xmlBufferCreateSize
xmlInitNodeInfoSeq
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlReallocLoc
xmlShell
xmlXPathNodeSetAdd
@@ -438,8 +444,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGNewDocParserCtxt
xmlRemoveID
xmlRemoveRef
-
interned
xmlPatterncompile
-xmlTextReaderConstString
+
interned
xmlTextReaderConstString
interning
xmlCopyNodeList
xmlNewPI
interoperability
xmlParseElementChildrenContentDecl
diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html index a44bb858..3079509f 100644 --- a/doc/APIchunk16.html +++ b/doc/APIchunk16.html @@ -47,6 +47,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNanoFTPInit
xmlNanoHTTPInit
xmlSnprintfElementContent
+xmlTextReaderByteConsumed
xmlXPathNewContext
xmlXPathNewParserContext
xmlXPathNextSelf
@@ -95,6 +96,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCharEncodingOutputFunc
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlReallocLoc
lang
xmlNodeGetLang
xmlXPathLangFunction
@@ -174,7 +177,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNodeDump
xmlNodeDumpOutput
xmlShellPwd
-xmlStreamPop
xmlXPathDebugDumpCompExpr
xmlXPathDebugDumpObject
lexical
xmlParseDefaultDecl
@@ -328,7 +330,10 @@ A:link, A:visited, A:active { text-decoration: underline } xmlUnlockLibrary
logging
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlReallocLoc
long
IS_BASECHAR
IS_COMBINING
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index af4cb7ee..60e32665 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -61,6 +61,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlMallocFunc
xmlMallocLoc
xmlMemGet
+xmlMemMalloc
xmlMemSetup
mallocAtomicFunc
xmlGcMemGet
xmlGcMemSetup
@@ -105,7 +106,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseCtxtExternalEntity
xmlParseExtParsedEnt
xmlParseExternalEntity
-xmlPatternMatch
xmlRegexpExec
xmlValidateDtdFinal
matching
xmlFileMatch
@@ -139,7 +139,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCheckUTF8
means
xmlSetGenericErrorFunc
xmlSetStructuredErrorFunc
-xmlStreamPush
mechanism
_xmlXPathContext
xmlStructuredErrorFunc
xmlXPathRegisterFuncLookup
@@ -258,7 +257,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlModuleSymbol
xmlOutputMatchCallback
xmlStructuredErrorFunc
-
modules
LIBXML_MODULE_EXTENSION
month
ftpListCallback
more
XML_MAX_NAMELEN
xmlLoadExternalEntity
@@ -267,6 +265,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseElementMixedContentDecl
xmlParseStartTag
xmlStrEqual
+xmlTextReaderByteConsumed
xmlTextReaderNext
xmlTextReaderNextSibling
xmlTextReaderRead
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index edf45c62..fce17ae6 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -67,6 +67,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAutomataNewOnceTrans
xmlAutomataNewOnceTrans2
occurred
xmlMemStrdupLoc
+xmlMemoryStrdup
occurrence
xmlStrcasestr
xmlStrchr
xmlStrstr
@@ -146,7 +147,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlConvertSGMLCatalog
ononymous
_xmlSchema
onto
xmlParserInputBufferGrow
-xmlStreamPush
opaque
_xmlSchema
_xmlURI
open
htmlCtxtReadFd
@@ -228,7 +228,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNodeDumpOutput
xmlOutputBufferWriteEscape
xmlParseMisc
-xmlPatterncompile
xmlSchemaValidateStream
xmlShellSave
xmlShellValidate
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index a9f2d00e..b14a54e0 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -124,10 +124,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlShellPwd
xmlShellValidate
xmlTextReaderRelaxNGValidate
-
pattern
xmlPatternGetStreamCtxt
-xmlPatternMatch
-xmlPatterncompile
-xmlTextReaderPreservePattern
+
pattern
xmlTextReaderPreservePattern
pcdata
cdataBlock
cdataBlockSAXFunc
xmlSAX2CDataBlock
@@ -255,14 +252,13 @@ A:link, A:visited, A:active { text-decoration: underline }
preceding-sibling
xmlXPathNextPrecedingSibling
precisely
xmlXPathSubstringFunction
precompiled
_xmlXPathParserContext
-xmlPatternGetStreamCtxt
-xmlPatternMatch
xmlRegNewExecCtxt
xmlRelaxNGNewValidCtxt
xmlSchemaNewValidCtxt
xmlTextReaderRelaxNGSetSchema
xmlXPathDebugDumpCompExpr
-
precomputed
xmlSchemaValidateFacet
+
precomputed
xmlSchemaGetCanonValue
+xmlSchemaValidateFacet
xmlSchemaValidateLengthFacet
predefined
XML_XML_NAMESPACE
xmlCleanupPredefinedEntities
@@ -486,6 +482,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlByteConsumed
xmlSAX2EndElementNs
xmlSAX2StartElementNs
+xmlTextReaderByteConsumed
providing
INPUT_CHUNK
provoked
xmlCheckUTF8
proximity
_xmlXPathContext
@@ -507,8 +504,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCreatePushParserCtxt
xmlCtxtResetPush
xmlParserInputBufferPush
-xmlStreamPop
-xmlStreamPush
xmlXPathEvalExpr
pushed
xmlRegExecErrInfo
xmlXPathFunction
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html index cb5c932f..b29e7d52 100644 --- a/doc/APIchunk21.html +++ b/doc/APIchunk21.html @@ -119,6 +119,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlGcMemGet
xmlGcMemSetup
xmlMemGet
+xmlMemRealloc
xmlMemSetup
xmlReallocFunc
xmlReallocLoc
@@ -311,6 +312,7 @@ A:link, A:visited, A:active { text-decoration: underline }
relationships
_htmlElemDesc
relative
xmlBuildRelativeURI
xmlByteConsumed
+xmlTextReaderByteConsumed
xmlTextReaderGetAttributeNo
xmlTextReaderMoveToAttributeNo
xmlUTF8Strloc
@@ -404,6 +406,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaValidateLengthFacet
xmlSchemaValidateListSimpleTypeFacet
representation
_htmlElemDesc
+xmlSchemaGetCanonValue
representations
xmlNewTextChild
represented
xmlParseCharData
xmlXPathStringFunction
@@ -449,7 +452,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSetNsProp
xmlSetProp
xmlSetStructuredErrorFunc
-xmlStreamPush
resides
xmlTextReaderConstXmlLang
xmlTextReaderXmlLang
resize
xmlBufferResize
@@ -501,6 +503,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAS_TYPE_FINAL_RESTRICTION
results
xmlXPathEqualValues
xmlXPathNotEqualValues
+
retValue
xmlSchemaGetCanonValue
retrieve
xmlGetGlobalState
xmlNanoFTPGet
xmlNanoFTPGetSocket
@@ -561,7 +564,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSAX2ExternalSubset
xmlSAX2InternalSubset
xmlShellPwd
-xmlStreamPush
xmlValidateRoot
xmlXPathNewValueTree
xmlXPathRoot
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index 7aff7ae4..162061ca 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -316,6 +316,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlMutexUnlock
xmlNewMutex
xmlSchemaGetBuiltInListSimpleTypeItemType
+xmlSchemaNewStringValue
xmlSchemaValidateListSimpleTypeFacet
simpleType
XML_SCHEMAS_TYPE_FINAL_DEFAULT
XML_SCHEMAS_TYPE_FINAL_LIST
@@ -469,6 +470,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextReaderStandalone
specifying
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlReallocLoc
speed
xmlXPathOrderDocElems
speedup
xmlTextReaderConstString
@@ -502,6 +505,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGValidatePushElement
xmlSAX2StartDocument
xmlSAX2StartElementNs
+xmlTextReaderByteConsumed
xmlValidatePushElement
xmlXPtrNewLocationSetNodes
xmlXPtrNewRange
@@ -606,9 +610,28 @@ A:link, A:visited, A:active { text-decoration: underline } xmlMemGet
xmlMemSetup
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlStrdup
xmlStrdupFunc
-
streaming
xmlPatternGetStreamCtxt
+
stream
_xmlParserCtxt
+xmlCheckHTTPInput
+xmlCreateIOParserCtxt
+xmlFreeInputStream
+xmlFreeStreamCtxt
+xmlHandleEntity
+xmlNewEntityInputStream
+xmlNewIOInputStream
+xmlNewInputFromFile
+xmlNewInputStream
+xmlNewStringInputStream
+xmlParsePEReference
+xmlParserHandlePEReference
+xmlParserHandleReference
+xmlPrintURI
+xmlPushInput
+xmlSwitchInputEncoding
+xmlTextReaderGetRemainder
+xmlTextReaderRead
streams
_xmlParserCtxt
xmlSkipBlankChars
strict
XML_SCHEMAS_ANYATTR_STRICT
@@ -623,11 +646,9 @@ A:link, A:visited, A:active { text-decoration: underline }
strings
_xmlParserCtxt
xmlDictCreateSub
xmlGetFeaturesList
-xmlPatterncompile
xmlRegExecErrInfo
xmlRegExecNextValues
xmlRegexpCompile
-xmlStreamPush
xmlStrncatNew
stripping
xmlXPathNormalizeFunction
strncasecmp
xmlStrncasecmp
@@ -778,6 +799,7 @@ A:link, A:visited, A:active { text-decoration: underline }
supplied
xmlGetRefs
supported
xmlInitCharEncodingHandlers
xmlNanoFTPGetConnection
+xmlSchemaGetCanonValue
xmlTextReaderNormalization
supposed
xmlIsMixedElement
xmlNewChild
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html index 8e3a79d5..6b2223cf 100644 --- a/doc/APIchunk24.html +++ b/doc/APIchunk24.html @@ -45,7 +45,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlGetDocCompressMode
xmlSetCompressMode
xmlSetDocCompressMode
-
undefined
xmlPatterncompile
under
xmlBuildRelativeURI
xmlSearchNs
xmlSetTreeDoc
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html index 97e1381d..4effee16 100644 --- a/doc/APIchunk25.html +++ b/doc/APIchunk25.html @@ -116,7 +116,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXIncludeProcessTree
xmlXIncludeProcessTreeFlags
wether
_xmlNodeSet
-xmlPatternMatch
what
xmlCatalogGetDefaults
xmlCatalogSetDefaults
xmlParseNamespace
@@ -150,6 +149,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathNormalizeFunction
whitespace
xmlIsBlankNode
xmlParseAttValue
+xmlSchemaCompareValuesWhtsp
xmlXPathIdFunction
xmlXPathNormalizeFunction
whitespace-separated
xmlXPathIdFunction
@@ -237,6 +237,7 @@ A:link, A:visited, A:active { text-decoration: underline }
would
_xmlError
htmlAutoCloseTag
xmlTextReaderGetRemainder
+
wraps
xmlTextReaderByteConsumed
write
xmlFileRead
xmlFindCharEncodingHandler
xmlGetCharEncodingHandler
diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html index c99d5f7a..f590601e 100644 --- a/doc/APIchunk26.html +++ b/doc/APIchunk26.html @@ -109,6 +109,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCharEncOutFunc
xmlBufferPtr
xmlNewTextWriterMemory
xmlBuildURI
xmlBuildRelativeURI
+
xmlBytesConsumed
xmlTextReaderByteConsumed
xmlCatalogAllow
xmlCatalogGetDefaults
xmlCatalogPtr
xmlNewCatalog
xmlCatalogResolvePublic
xmlCatalogGetPublic
@@ -187,7 +188,6 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlFreeDoc
xmlTextReaderCurrentDoc
xmlFreeDocElementContent
xmlFreeElementContent
xmlFreeMutex
xmlFreeMutex
-
xmlFreeStreamCtxt
xmlPatternGetStreamCtxt
xmlGetGlobalState
xmlGetGlobalState
xmlGetNoNsProp
xmlGetProp
xmlGetNsProp
xmlGetProp
@@ -325,7 +325,6 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlParserProperties
xmlTextReaderGetParserProp
xmlTextReaderSetParserProp
xmlPattern
LIBXML_PATTERN_ENABLED
-
xmlPatterncompile
xmlStreamPush
xmlPopInput:
xmlPopInput
xmlPushInput:
xmlPushInput
xmlRFreeMutex
xmlFreeRMutex
diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html index 082dd33f..5bb08b29 100644 --- a/doc/APIchunk4.html +++ b/doc/APIchunk4.html @@ -184,6 +184,7 @@ A:link, A:visited, A:active { text-decoration: underline }
NMToken
xmlValidateNMToken
NOTATION
xmlParseEnumeratedType
xmlParseNotationType
+xmlSchemaNewNOTATIONValue
xmlValidateDtdFinal
NOTE
xmlCtxtReadFd
xmlParseExternalID
@@ -205,7 +206,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseExternalID
xmlParsePEReference
xmlParserHandlePEReference
-xmlStreamPush
xmlTextReaderCurrentDoc
NRK
_htmlElemDesc
NSDef
xmlNamespaceParseNSDef
diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html index 6dc25db9..82be4d89 100644 --- a/doc/APIchunk6.html +++ b/doc/APIchunk6.html @@ -344,6 +344,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNormalizeURIPath
See
xmlLinkGetData
xmlParseNotationDecl
+xmlTextReaderByteConsumed
Seems
xmlParseTextDecl
Semi
xmlRelaxParserSetFlag
Send
xmlNanoFTPQuit
diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html index eed7024d..60ab9b24 100644 --- a/doc/APIchunk7.html +++ b/doc/APIchunk7.html @@ -93,7 +93,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStringLenDecodeEntities
Tamil
xmlUCSIsTamil
Telugu
xmlUCSIsTelugu
-
Test
xmlPatternMatch
Text
xmlNodeIsText
xmlTextReaderReadAttributeValue
xmlTextReaderReadString
@@ -235,7 +234,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewNodeEatName
xmlNewPI
xmlNewTextChild
-xmlPatternGetStreamCtxt
xmlTextReaderRelaxNGSetSchema
xmlTextReaderRelaxNGValidate
Used
XML_SCHEMAS_ANY_LAX
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html index 282a4d65..39a9dc4c 100644 --- a/doc/APIchunk8.html +++ b/doc/APIchunk8.html @@ -176,6 +176,7 @@ A:link, A:visited, A:active { text-decoration: underline }
XML_ENTITY_DECL
_xmlEntity
XML_ERR_OK
xmlParseInNodeContext
XML_SCHEMAS_ELEM_GLOBAL
XML_SCHEMAS_ELEM_TOPLEVEL
+
XML_SCHEMAS_STRING
xmlSchemaNewStringValue
XML_SUBSTITUTE_PEREF
xmlDecodeEntities
xmlStringDecodeEntities
xmlStringLenDecodeEntities
@@ -289,7 +290,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParserHandlePEReference
xmlParserHandleReference
xmlValidCtxtNormalizeAttributeValue
-
act
xmlStreamPush
activate
xmlTextReaderSetParserProp
activated
DEBUG_MEMORY
xmlAutomataNewAllTrans
@@ -320,6 +320,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseNotationDecl
xmlSAX2SetDocumentLocator
xmlStringCurrentChar
+xmlTextReaderByteConsumed
xmlXPathOrderDocElems
actuate
xlinkExtendedLinkFunk
add
xmlACatalogAdd
@@ -435,6 +436,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlBuildQName
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlNewMutex
xmlNewRMutex
xmlReallocLoc
@@ -443,7 +446,10 @@ A:link, A:visited, A:active { text-decoration: underline } xmlGetBufferAllocationScheme
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlMemStrdupLoc
+xmlMemoryStrdup
xmlNormalizeURIPath
xmlReallocLoc
xmlSetBufferAllocationScheme
@@ -521,7 +527,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlHasProp
xmlKeepBlanksDefault
xmlNanoFTPProxy
-xmlStreamPush
xmlTextReaderPreserve
xmlTextReaderPreservePattern
xmlXPathStringEvalNumber
@@ -645,6 +650,8 @@ A:link, A:visited, A:active { text-decoration: underline }
area
xmlBufferCreateStatic
xmlMallocAtomicLoc
xmlMallocLoc
+xmlMemMalloc
+xmlMemRealloc
xmlParserInputBufferCreateMem
xmlParserInputBufferCreateStatic
xmlReallocLoc
diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html index e5b70331..362e6253 100644 --- a/doc/APIchunk9.html +++ b/doc/APIchunk9.html @@ -98,6 +98,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlListInsert
xmlListPushFront
xmlStringCurrentChar
+xmlTextReaderByteConsumed
xmlValidGetValidElements
begins
_xmlParserNodeInfo
behaves
IS_LETTER_CH
@@ -243,6 +244,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRecoverMemory
xmlRelaxNGParse
xmlSchemaGetBuiltInType
+xmlSchemaGetCanonValue
xmlSchemaParse
xmlTextReaderNextSibling
built-in
xmlSchemaGetBuiltInListSimpleTypeItemType
diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html index 8a22203b..b8e7628f 100644 --- a/doc/APIconstructors.html +++ b/doc/APIconstructors.html @@ -85,6 +85,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlGetLineNo
xmlSaveDoc
xmlSaveTree
+xmlTextReaderByteConsumed
xmlXPathOrderDocElems

Type unsigned long:

xmlParserFindNodeInfoIndex
xmlSchemaGetFacetValueAsULong
@@ -480,6 +481,8 @@ A:link, A:visited, A:active { text-decoration: underline }

Type xmlSchemaTypePtr:

xmlSchemaGetBuiltInListSimpleTypeItemType
xmlSchemaGetBuiltInType
xmlSchemaGetPredefinedType
+

Type xmlSchemaValPtr:

xmlSchemaNewNOTATIONValue
+xmlSchemaNewStringValue

Type xmlSchemaValidCtxtPtr:

xmlSchemaNewValidCtxt

Type xmlStreamCtxtPtr:

xmlPatternGetStreamCtxt

Type xmlTextReaderPtr:

xmlNewTextReader
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index 5411aac7..a5086167 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -860,14 +860,18 @@ A:link, A:visited, A:active { text-decoration: underline } xmlFreePatternList
xmlFreeStreamCtxt
xmlPattern
+xmlPatternFromRoot
xmlPatternGetStreamCtxt
xmlPatternMatch
+xmlPatternMaxDepth
xmlPatternPtr
+xmlPatternStreamable
xmlPatterncompile
xmlStreamCtxt
xmlStreamCtxtPtr
xmlStreamPop
xmlStreamPush
+xmlStreamPushAttr

Module relaxng:

XML_RELAXNGP_CRNG
XML_RELAXNGP_FREE_DOC
XML_RELAXNGP_NONE
@@ -2318,6 +2322,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAV_CVC_TYPE_2
XML_SCHEMAV_CVC_TYPE_3_1_1
XML_SCHEMAV_CVC_TYPE_3_1_2
+XML_SCHEMAV_CVC_WILDCARD
XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING
XML_SCHEMAV_ELEMCONT
XML_SCHEMAV_ELEMENT_CONTENT
@@ -2512,6 +2517,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextReader
xmlTextReaderAttributeCount
xmlTextReaderBaseUri
+xmlTextReaderByteConsumed
xmlTextReaderClose
xmlTextReaderConstBaseUri
xmlTextReaderConstEncoding
@@ -2663,19 +2669,27 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaValidateStream
xmlSchemaValidityErrorFunc
xmlSchemaValidityWarningFunc
-

Module xmlschemastypes:

xmlSchemaCheckFacet
+

Module xmlschemastypes:

XML_SCHEMA_WHITESPACE_COLLAPSE
+XML_SCHEMA_WHITESPACE_PRESERVE
+XML_SCHEMA_WHITESPACE_REPLACE
+XML_SCHEMA_WHITESPACE_UNKNOWN
+xmlSchemaCheckFacet
xmlSchemaCleanupTypes
xmlSchemaCollapseString
xmlSchemaCompareValues
+xmlSchemaCompareValuesWhtsp
xmlSchemaFreeFacet
xmlSchemaFreeValue
xmlSchemaGetBuiltInListSimpleTypeItemType
xmlSchemaGetBuiltInType
+xmlSchemaGetCanonValue
xmlSchemaGetFacetValueAsULong
xmlSchemaGetPredefinedType
xmlSchemaInitTypes
xmlSchemaIsBuiltInTypeFacet
xmlSchemaNewFacet
+xmlSchemaNewNOTATIONValue
+xmlSchemaNewStringValue
xmlSchemaValPredefTypeNode
xmlSchemaValPredefTypeNodeNoNorm
xmlSchemaValidateFacet
@@ -2683,6 +2697,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaValidateListSimpleTypeFacet
xmlSchemaValidatePredefinedType
xmlSchemaWhiteSpaceReplace
+xmlSchemaWhitespaceValueType

Module xmlstring:

BAD_CAST
xmlChar
xmlCharStrdup
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html index 7aa8600d..3a5bad60 100644 --- a/doc/APIfunctions.html +++ b/doc/APIfunctions.html @@ -332,6 +332,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaCheckFacet
xmlSchemaCollapseString
xmlSchemaGetPredefinedType
+xmlSchemaNewNOTATIONValue
+xmlSchemaNewStringValue
xmlSchemaValPredefTypeNode
xmlSchemaValPredefTypeNodeNoNorm
xmlSchemaValidateFacet
@@ -358,6 +360,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStrcmp
xmlStrdup
xmlStreamPush
+xmlStreamPushAttr
xmlStringCurrentChar
xmlStringDecodeEntities
xmlStringGetNodeList
@@ -487,6 +490,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRegExecErrInfo
xmlSAX2StartElement
xmlSAX2StartElementNs
+xmlSchemaGetCanonValue
xmlTextReaderPreservePattern
xmlValidGetPotentialChildren
xmlValidGetValidElements
@@ -1699,8 +1703,11 @@ A:link, A:visited, A:active { text-decoration: underline }

Type xmlParserSeverities:

xmlTextReaderErrorFunc

Type xmlPatternPtr:

xmlFreePattern
xmlFreePatternList
+xmlPatternFromRoot
xmlPatternGetStreamCtxt
xmlPatternMatch
+xmlPatternMaxDepth
+xmlPatternStreamable

Type xmlRMutexPtr:

xmlFreeRMutex
xmlRMutexLock
xmlRMutexUnlock
@@ -1805,13 +1812,16 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaValidateLengthFacet
xmlSchemaValidatePredefinedType

Type xmlSchemaValPtr:

xmlSchemaCompareValues
+xmlSchemaCompareValuesWhtsp
xmlSchemaFreeValue
+xmlSchemaGetCanonValue
xmlSchemaValidateFacet
xmlSchemaValidateLengthFacet

Type xmlSchemaValPtr *:

xmlSchemaValPredefTypeNode
xmlSchemaValPredefTypeNodeNoNorm
xmlSchemaValidatePredefinedType

Type xmlSchemaValType:

xmlSchemaGetBuiltInType
+xmlSchemaNewStringValue

Type xmlSchemaValidCtxtPtr:

xmlSchemaFreeValidCtxt
xmlSchemaGetValidErrors
xmlSchemaSetValidErrors
@@ -1828,6 +1838,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaSetValidErrors

Type xmlSchemaValidityWarningFunc *:

xmlSchemaGetParserErrors
xmlSchemaGetValidErrors
+

Type xmlSchemaWhitespaceValueType:

xmlSchemaCompareValuesWhtsp

Type xmlSchemaWildcardPtr:

xmlSchemaFreeWildcard

Type xmlShellCtxtPtr:

xmlShellBase
xmlShellCat
@@ -1848,6 +1859,7 @@ A:link, A:visited, A:active { text-decoration: underline }

Type xmlStreamCtxtPtr:

xmlFreeStreamCtxt
xmlStreamPop
xmlStreamPush
+xmlStreamPushAttr

Type xmlStructuredErrorFunc:

xmlSetStructuredErrorFunc
xmlTextReaderSetStructuredErrorHandler
xmlThrDefSetStructuredErrorFunc
@@ -1865,6 +1877,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlReaderNewWalker
xmlTextReaderAttributeCount
xmlTextReaderBaseUri
+xmlTextReaderByteConsumed
xmlTextReaderClose
xmlTextReaderConstBaseUri
xmlTextReaderConstEncoding
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 86ff490a..f688e10a 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -1126,6 +1126,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAV_CVC_TYPE_2
XML_SCHEMAV_CVC_TYPE_3_1_1
XML_SCHEMAV_CVC_TYPE_3_1_2
+XML_SCHEMAV_CVC_WILDCARD
XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING
XML_SCHEMAV_ELEMCONT
XML_SCHEMAV_ELEMENT_CONTENT
@@ -1193,6 +1194,10 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMA_TYPE_UNION
XML_SCHEMA_TYPE_UR
XML_SCHEMA_VAL_VC_I_CREATE
+XML_SCHEMA_WHITESPACE_COLLAPSE
+XML_SCHEMA_WHITESPACE_PRESERVE
+XML_SCHEMA_WHITESPACE_REPLACE
+XML_SCHEMA_WHITESPACE_UNKNOWN
XML_SKIP_IDS
XML_SUBSTITUTE_BOTH
XML_SUBSTITUTE_NONE
@@ -2324,9 +2329,12 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParserVersion
xmlParserWarning
xmlPattern
+xmlPatternFromRoot
xmlPatternGetStreamCtxt
xmlPatternMatch
+xmlPatternMaxDepth
xmlPatternPtr
+xmlPatternStreamable
xmlPatterncompile
xmlPedanticParserDefault
xmlPedanticParserDefaultValue
@@ -2515,6 +2523,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaCleanupTypes
xmlSchemaCollapseString
xmlSchemaCompareValues
+xmlSchemaCompareValuesWhtsp
xmlSchemaContentType
xmlSchemaDump
xmlSchemaElement
@@ -2532,6 +2541,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaFreeWildcard
xmlSchemaGetBuiltInListSimpleTypeItemType
xmlSchemaGetBuiltInType
+xmlSchemaGetCanonValue
xmlSchemaGetFacetValueAsULong
xmlSchemaGetParserErrors
xmlSchemaGetPredefinedType
@@ -2541,7 +2551,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaNewDocParserCtxt
xmlSchemaNewFacet
xmlSchemaNewMemParserCtxt
+xmlSchemaNewNOTATIONValue
xmlSchemaNewParserCtxt
+xmlSchemaNewStringValue
xmlSchemaNewValidCtxt
xmlSchemaNotation
xmlSchemaNotationPtr
@@ -2577,6 +2589,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaValidityErrorFunc
xmlSchemaValidityWarningFunc
xmlSchemaWhiteSpaceReplace
+xmlSchemaWhitespaceValueType
xmlSchemaWildcard
xmlSchemaWildcardNs
xmlSchemaWildcardNsPtr
@@ -2637,6 +2650,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStreamCtxtPtr
xmlStreamPop
xmlStreamPush
+xmlStreamPushAttr
xmlStringComment
xmlStringCurrentChar
xmlStringDecodeEntities
@@ -2665,6 +2679,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlTextReader
xmlTextReaderAttributeCount
xmlTextReaderBaseUri
+xmlTextReaderByteConsumed
xmlTextReaderClose
xmlTextReaderConstBaseUri
xmlTextReaderConstEncoding
diff --git a/doc/html/libxml-encoding.html b/doc/html/libxml-encoding.html index f16f046c..03585f44 100644 --- a/doc/html/libxml-encoding.html +++ b/doc/html/libxml-encoding.html @@ -73,9 +73,9 @@ int xmlCharEncodingOutputFunc (unsigned iconv_t iconv_out }

Function: UTF8Toisolat1

int	UTF8Toisolat1			(unsigned char * out, 
int * outlen,
const unsigned char * in,
int * inlen)

Take a block of UTF-8 chars in and try to convert it to an ISO Latin 1 block of chars out.

-
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of UTF-8 chars
inlen:the length of @in
Returns:0 if success, -2 if the transcoding fails, or -1 otherwise The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictable. The value of @outlen after return is the number of octets consumed.

Function: isolat1ToUTF8

int	isolat1ToUTF8			(unsigned char * out, 
int * outlen,
const unsigned char * in,
int * inlen)
+
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of UTF-8 chars
inlen:the length of @in
Returns:the number of bytes written if success, -2 if the transcoding fails, or -1 otherwise The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictable. The value of @outlen after return is the number of octets consumed.

Function: isolat1ToUTF8

int	isolat1ToUTF8			(unsigned char * out, 
int * outlen,
const unsigned char * in,
int * inlen)

Take a block of ISO Latin 1 chars in and try to convert it to an UTF-8 block of chars out.

-
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of ISO Latin 1 chars
inlen:the length of @in
Returns:0 if success, or -1 otherwise The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictable. The value of @outlen after return is the number of octets consumed.

Function: xmlAddEncodingAlias

int	xmlAddEncodingAlias		(const char * name, 
const char * alias)
+
out:a pointer to an array of bytes to store the result
outlen:the length of @out
in:a pointer to an array of ISO Latin 1 chars
inlen:the length of @in
Returns:the number of bytes written if success, or -1 otherwise The value of @inlen after return is the number of octets consumed if the return value is positive, else unpredictable. The value of @outlen after return is the number of octets consumed.

Function: xmlAddEncodingAlias

int	xmlAddEncodingAlias		(const char * name, 
const char * alias)

Registers an alias @alias for an encoding named @name. Existing alias will be overwritten.

name:the encoding name as parsed, in UTF-8 format (ASCII actually)
alias:the alias name as parsed, in UTF-8 format (ASCII actually)
Returns:0 in case of success, -1 in case of error

Function: xmlCharEncCloseFunc

int	xmlCharEncCloseFunc		(xmlCharEncodingHandler * handler)

Generic front-end for encoding handler close function

diff --git a/doc/html/libxml-pattern.html b/doc/html/libxml-pattern.html index 35ce4b7e..9d0303b6 100644 --- a/doc/html/libxml-pattern.html +++ b/doc/html/libxml-pattern.html @@ -19,11 +19,15 @@ The content of this structure is not made public by the API.
void	xmlFreePattern			(xmlPatternPtr comp)
void	xmlFreePatternList		(xmlPatternPtr comp)
void	xmlFreeStreamCtxt		(xmlStreamCtxtPtr stream)
+
int	xmlPatternFromRoot		(xmlPatternPtr comp)
xmlStreamCtxtPtr	xmlPatternGetStreamCtxt	(xmlPatternPtr comp)
int	xmlPatternMatch			(xmlPatternPtr comp, 
xmlNodePtr node)
+
int	xmlPatternMaxDepth		(xmlPatternPtr comp)
+
int	xmlPatternStreamable		(xmlPatternPtr comp)
xmlPatternPtr	xmlPatterncompile	(const xmlChar * pattern, 
xmlDict * dict,
int flags,
const xmlChar ** namespaces)
int	xmlStreamPop			(xmlStreamCtxtPtr stream)
int	xmlStreamPush			(xmlStreamCtxtPtr stream, 
const xmlChar * name,
const xmlChar * ns)
+
int	xmlStreamPushAttr		(xmlStreamCtxtPtr stream, 
const xmlChar * name,
const xmlChar * ns)

Description

Structure xmlPattern

Structure xmlPattern
struct _xmlPattern { The content of this structure is not made public by the API. @@ -35,14 +39,22 @@ The content of this structure is not made public by the API.

Free up the memory allocated by all the elements of @comp

comp:an XSLT comp list

Function: xmlFreeStreamCtxt

void	xmlFreeStreamCtxt		(xmlStreamCtxtPtr stream)

Free the stream context

-
stream:the stream context

Function: xmlPatternGetStreamCtxt

xmlStreamCtxtPtr	xmlPatternGetStreamCtxt	(xmlPatternPtr comp)
-

Get a streaming context for that pattern Use xmlFreeStreamCtxt to free the context.

-
comp:the precompiled pattern
Returns:a pointer to the context or NULL in case of failure

Function: xmlPatternMatch

int	xmlPatternMatch			(xmlPatternPtr comp, 
xmlNodePtr node)
-

Test wether the node matches the pattern

-
comp:the precompiled pattern
node:a node
Returns:1 if it matches, 0 if it doesn't and -1 in case of failure

Function: xmlPatterncompile

xmlPatternPtr	xmlPatterncompile	(const xmlChar * pattern, 
xmlDict * dict,
int flags,
const xmlChar ** namespaces)
-

Compile a pattern.

-
pattern:the pattern to compile
dict:an optional dictionnary for interned strings
flags:compilation flags, undefined yet
namespaces:the prefix definitions, array of [URI, prefix] or NULL
Returns:the compiled for of the pattern or NULL in case of error

Function: xmlStreamPop

int	xmlStreamPop			(xmlStreamCtxtPtr stream)
-

push one level from the stream.

-
stream:the stream context
Returns:-1 in case of error, 0 otherwise.

Function: xmlStreamPush

int	xmlStreamPush			(xmlStreamCtxtPtr stream, 
const xmlChar * name,
const xmlChar * ns)
-

push new data onto the stream. NOTE: if the call xmlPatterncompile() indicated a dictionnary, then strings for name and ns will be expected to come from the dictionary. Both @name and @ns being NULL means the / i.e. the root of the document. This can also act as a reset.

-
stream:the stream context
name:the current name
ns:the namespace name
Returns:-1 in case of error, 1 if the current state in the stream is a match and 0 otherwise.

Daniel Veillard

+
stream:the stream context

Function: xmlPatternFromRoot

int	xmlPatternFromRoot		(xmlPatternPtr comp)
+

+
comp:
Returns:

Function: xmlPatternGetStreamCtxt

xmlStreamCtxtPtr	xmlPatternGetStreamCtxt	(xmlPatternPtr comp)
+

+
comp:
Returns:

Function: xmlPatternMatch

int	xmlPatternMatch			(xmlPatternPtr comp, 
xmlNodePtr node)
+

+
comp:
node:
Returns:

Function: xmlPatternMaxDepth

int	xmlPatternMaxDepth		(xmlPatternPtr comp)
+

+
comp:
Returns:

Function: xmlPatternStreamable

int	xmlPatternStreamable		(xmlPatternPtr comp)
+

+
comp:
Returns:

Function: xmlPatterncompile

xmlPatternPtr	xmlPatterncompile	(const xmlChar * pattern, 
xmlDict * dict,
int flags,
const xmlChar ** namespaces)
+

+
pattern:
dict:
flags:
namespaces:
Returns:

Function: xmlStreamPop

int	xmlStreamPop			(xmlStreamCtxtPtr stream)
+

+
stream:
Returns:

Function: xmlStreamPush

int	xmlStreamPush			(xmlStreamCtxtPtr stream, 
const xmlChar * name,
const xmlChar * ns)
+

+
stream:
name:
ns:
Returns:

Function: xmlStreamPushAttr

int	xmlStreamPushAttr		(xmlStreamCtxtPtr stream, 
const xmlChar * name,
const xmlChar * ns)
+

+
stream:
name:
ns:
Returns:

Daniel Veillard

diff --git a/doc/html/libxml-xmlerror.html b/doc/html/libxml-xmlerror.html index 49df9d10..425bcfc4 100644 --- a/doc/html/libxml-xmlerror.html +++ b/doc/html/libxml-xmlerror.html @@ -648,6 +648,7 @@ void xmlStructuredErrorFunc (void * userD XML_SCHEMAV_CVC_TYPE_1 = 1875 : 1875 XML_SCHEMAV_CVC_TYPE_2 = 1876 : 1876 XML_SCHEMAV_CVC_IDC = 1877 : 1877 + XML_SCHEMAV_CVC_WILDCARD = 1878 : 1878 XML_XPTR_UNKNOWN_SCHEME = 1900 XML_XPTR_CHILDSEQ_START = 1901 : 1901 XML_XPTR_EVAL_FAILED = 1902 : 1902 diff --git a/doc/html/libxml-xmlmemory.html b/doc/html/libxml-xmlmemory.html index 1c03185d..b02572a9 100644 --- a/doc/html/libxml-xmlmemory.html +++ b/doc/html/libxml-xmlmemory.html @@ -74,14 +74,14 @@ void * xmlMallocFunc (size_t size)
Returns:an int representing the number of blocks

Function: xmlMemDisplay

void	xmlMemDisplay			(FILE * fp)

show in-extenso the memory blocks allocated

fp:a FILE descriptor used as the output file, if NULL, the result is written to the file .memorylist

Function: xmlMemFree

void	xmlMemFree			(void * ptr)
-

-
ptr:

Function: xmlMemGet

int	xmlMemGet			(xmlFreeFunc * freeFunc, 
xmlMallocFunc * mallocFunc,
xmlReallocFunc * reallocFunc,
xmlStrdupFunc * strdupFunc)
+

a free() equivalent, with error checking.

+
ptr:the memory block pointer

Function: xmlMemGet

int	xmlMemGet			(xmlFreeFunc * freeFunc, 
xmlMallocFunc * mallocFunc,
xmlReallocFunc * reallocFunc,
xmlStrdupFunc * strdupFunc)

Provides the memory access functions set currently in use

freeFunc:place to save the free() function in use
mallocFunc:place to save the malloc() function in use
reallocFunc:place to save the realloc() function in use
strdupFunc:place to save the strdup() function in use
Returns:0 on success

Function: xmlMemMalloc

void *	xmlMemMalloc			(size_t size)
-

-
size:
Returns:

Function: xmlMemRealloc

void *	xmlMemRealloc			(void * ptr, 
size_t size)
-

-
ptr:
size:
Returns:

Function: xmlMemSetup

int	xmlMemSetup			(xmlFreeFunc freeFunc, 
xmlMallocFunc mallocFunc,
xmlReallocFunc reallocFunc,
xmlStrdupFunc strdupFunc)
+

a malloc() equivalent, with logging of the allocation info.

+
size:an int specifying the size in byte to allocate.
Returns:a pointer to the allocated area or NULL in case of lack of memory.

Function: xmlMemRealloc

void *	xmlMemRealloc			(void * ptr, 
size_t size)
+

a realloc() equivalent, with logging of the allocation info.

+
ptr:the initial memory block pointer
size:an int specifying the size in byte to allocate.
Returns:a pointer to the allocated area or NULL in case of lack of memory.

Function: xmlMemSetup

int	xmlMemSetup			(xmlFreeFunc freeFunc, 
xmlMallocFunc mallocFunc,
xmlReallocFunc reallocFunc,
xmlStrdupFunc strdupFunc)

Override the default memory access functions with a new set This has to be called before any other libxml routines ! Should this be blocked if there was already some allocations done ?

freeFunc:the free() function to use
mallocFunc:the malloc() function to use
reallocFunc:the realloc() function to use
strdupFunc:the strdup() function to use
Returns:0 on success

Function: xmlMemShow

void	xmlMemShow			(FILE * fp, 
int nr)

show a show display of the memory allocated, and dump the @nr last allocated areas which were not freed

@@ -92,8 +92,8 @@ void * xmlMallocFunc (size_t size)
Returns:an int representing the amount of memory allocated.

Function: xmlMemoryDump

void	xmlMemoryDump			(void)

Dump in-extenso the memory blocks allocated to the file .memorylist

Function: xmlMemoryStrdup

char *	xmlMemoryStrdup			(const char * str)
-

-
str:
Returns:

Function type: xmlReallocFunc

Function type: xmlReallocFunc
+

a strdup() equivalent, with logging of the allocation info.

+
str:the initial string pointer
Returns:a pointer to the new string or NULL if allocation error occurred.

Function type: xmlReallocFunc

Function type: xmlReallocFunc
 void *	xmlReallocFunc			(void * mem, 
size_t size)

Signature for a realloc() implementation.

mem:an already allocated block of memory
size:the new size requested in bytes
Returns:a pointer to the newly reallocated block or NULL in case of error.

Function: xmlReallocLoc

void *	xmlReallocLoc			(void * ptr, 
size_t size,
const char * file,
int line)
diff --git a/doc/html/libxml-xmlreader.html b/doc/html/libxml-xmlreader.html index f8709ff8..2a68322c 100644 --- a/doc/html/libxml-xmlreader.html +++ b/doc/html/libxml-xmlreader.html @@ -35,6 +35,7 @@ The content of this structure is not made public by the API.
xmlTextReaderPtr	xmlReaderWalker	(xmlDocPtr doc)
int	xmlTextReaderAttributeCount	(xmlTextReaderPtr reader)
xmlChar *	xmlTextReaderBaseUri	(xmlTextReaderPtr reader)
+
long	xmlTextReaderByteConsumed	(xmlTextReaderPtr reader)
int	xmlTextReaderClose		(xmlTextReaderPtr reader)
const xmlChar *	xmlTextReaderConstBaseUri	(xmlTextReaderPtr reader)
const xmlChar *	xmlTextReaderConstEncoding	(xmlTextReaderPtr reader)
@@ -178,7 +179,9 @@ The content of this structure is not made public by the API.

Provides the number of attributes of the current node

reader:the xmlTextReaderPtr used
Returns:0 i no attributes, -1 in case of error or the attribute count

Function: xmlTextReaderBaseUri

xmlChar *	xmlTextReaderBaseUri	(xmlTextReaderPtr reader)

The base URI of the node.

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

Function: xmlTextReaderClose

int	xmlTextReaderClose		(xmlTextReaderPtr reader)
+
reader:the xmlTextReaderPtr used
Returns:the base URI or NULL if not available

Function: xmlTextReaderByteConsumed

long	xmlTextReaderByteConsumed	(xmlTextReaderPtr reader)
+

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

+
reader:an XML reader
Returns:the index in bytes from the beginning of the entity or -1 in case the index could not be computed.

Function: xmlTextReaderClose

int	xmlTextReaderClose		(xmlTextReaderPtr reader)

This method releases any resources allocated by the current instance changes the state to Closed and close any underlying input.

reader:the xmlTextReaderPtr used
Returns:0 or -1 in case of error

Function: xmlTextReaderConstBaseUri

const xmlChar *	xmlTextReaderConstBaseUri	(xmlTextReaderPtr reader)

The base URI of the node.

diff --git a/doc/html/libxml-xmlschemastypes.html b/doc/html/libxml-xmlschemastypes.html index 3241a2be..13569184 100644 --- a/doc/html/libxml-xmlschemastypes.html +++ b/doc/html/libxml-xmlschemastypes.html @@ -10,19 +10,24 @@ A:link, A:visited, A:active { text-decoration: underline } Module xmlschemastypes from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Module xmlschemastypes from libxml2

API Menu
API Indexes
Related links

module providing the XML Schema Datatypes implementation both definition and validity checking

Table of Contents

int	xmlSchemaCheckFacet		(xmlSchemaFacetPtr facet, 
xmlSchemaTypePtr typeDecl,
xmlSchemaParserCtxtPtr ctxt,
const xmlChar * name)
+ Module xmlschemastypes from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Module xmlschemastypes from libxml2

API Menu
API Indexes
Related links

module providing the XML Schema Datatypes implementation both definition and validity checking

Table of Contents

Enum xmlSchemaWhitespaceValueType
+
int	xmlSchemaCheckFacet		(xmlSchemaFacetPtr facet, 
xmlSchemaTypePtr typeDecl,
xmlSchemaParserCtxtPtr ctxt,
const xmlChar * name)
void	xmlSchemaCleanupTypes		(void)
xmlChar *	xmlSchemaCollapseString	(const xmlChar * value)
int	xmlSchemaCompareValues		(xmlSchemaValPtr x, 
xmlSchemaValPtr y)
+
int	xmlSchemaCompareValuesWhtsp	(xmlSchemaValPtr x, 
xmlSchemaWhitespaceValueType xws,
xmlSchemaValPtr y,
xmlSchemaWhitespaceValueType yws)
void	xmlSchemaFreeFacet		(xmlSchemaFacetPtr facet)
void	xmlSchemaFreeValue		(xmlSchemaValPtr value)
xmlSchemaTypePtr	xmlSchemaGetBuiltInListSimpleTypeItemType	(xmlSchemaTypePtr type)
xmlSchemaTypePtr	xmlSchemaGetBuiltInType	(xmlSchemaValType type)
+
int	xmlSchemaGetCanonValue		(xmlSchemaValPtr val, 
const xmlChar ** retValue)
unsigned long	xmlSchemaGetFacetValueAsULong	(xmlSchemaFacetPtr facet)
xmlSchemaTypePtr	xmlSchemaGetPredefinedType	(const xmlChar * name, 
const xmlChar * ns)
void	xmlSchemaInitTypes		(void)
int	xmlSchemaIsBuiltInTypeFacet	(xmlSchemaTypePtr type, 
int facetType)
xmlSchemaFacetPtr	xmlSchemaNewFacet	(void)
+
xmlSchemaValPtr	xmlSchemaNewNOTATIONValue	(const xmlChar * name, 
const xmlChar * ns)
+
xmlSchemaValPtr	xmlSchemaNewStringValue	(xmlSchemaValType type, 
const xmlChar * value)
int	xmlSchemaValPredefTypeNode	(xmlSchemaTypePtr type, 
const xmlChar * value,
xmlSchemaValPtr * val,
xmlNodePtr node)
int	xmlSchemaValPredefTypeNodeNoNorm	(xmlSchemaTypePtr type, 
const xmlChar * value,
xmlSchemaValPtr * val,
xmlNodePtr node)
int	xmlSchemaValidateFacet		(xmlSchemaTypePtr base, 
xmlSchemaFacetPtr facet,
const xmlChar * value,
xmlSchemaValPtr val)
@@ -31,7 +36,13 @@ A:link, A:visited, A:active { text-decoration: underline }
int	xmlSchemaValidatePredefinedType	(xmlSchemaTypePtr type, 
const xmlChar * value,
xmlSchemaValPtr * val)
xmlChar *	xmlSchemaWhiteSpaceReplace	(const xmlChar * value)

Description

-

Function: xmlSchemaCheckFacet

int	xmlSchemaCheckFacet		(xmlSchemaFacetPtr facet, 
xmlSchemaTypePtr typeDecl,
xmlSchemaParserCtxtPtr ctxt,
const xmlChar * name)
+

Enum xmlSchemaWhitespaceValueType

Enum xmlSchemaWhitespaceValueType {
+    XML_SCHEMA_WHITESPACE_UNKNOWN = 0
+    XML_SCHEMA_WHITESPACE_PRESERVE = 1
+    XML_SCHEMA_WHITESPACE_REPLACE = 2
+    XML_SCHEMA_WHITESPACE_COLLAPSE = 3
+}
+

Function: xmlSchemaCheckFacet

int	xmlSchemaCheckFacet		(xmlSchemaFacetPtr facet, 
xmlSchemaTypePtr typeDecl,
xmlSchemaParserCtxtPtr ctxt,
const xmlChar * name)

Checks the default values types, especially for facets

facet:the facet
typeDecl:the schema type definition
ctxt:the schema parser context or NULL
name:name of the type
Returns:0 if okay or -1 in cae of error

Function: xmlSchemaCleanupTypes

void	xmlSchemaCleanupTypes		(void)

Cleanup the default XML Schemas type library

@@ -39,7 +50,9 @@ A:link, A:visited, A:active { text-decoration: underline }

Removes and normalize white spaces in the string

value:a value
Returns:the new string or NULL if no change was required.

Function: xmlSchemaCompareValues

int	xmlSchemaCompareValues		(xmlSchemaValPtr x, 
xmlSchemaValPtr y)

Compare 2 values

-
x:a first value
y:a second value
Returns:-1 if x < y, 0 if x == y, 1 if x > y, 2 if x <> y, and -2 in case of error

Function: xmlSchemaFreeFacet

void	xmlSchemaFreeFacet		(xmlSchemaFacetPtr facet)
+
x:a first value
y:a second value
Returns:-1 if x < y, 0 if x == y, 1 if x > y, 2 if x <> y, and -2 in case of error

Function: xmlSchemaCompareValuesWhtsp

int	xmlSchemaCompareValuesWhtsp	(xmlSchemaValPtr x, 
xmlSchemaWhitespaceValueType xws,
xmlSchemaValPtr y,
xmlSchemaWhitespaceValueType yws)
+

Compare 2 values

+
x:a first value
xws:the whitespace value of x
y:a second value
yws:the whitespace value of y
Returns:-1 if x < y, 0 if x == y, 1 if x > y, 2 if x <> y, and -2 in case of error

Function: xmlSchemaFreeFacet

void	xmlSchemaFreeFacet		(xmlSchemaFacetPtr facet)

Deallocate a Schema Facet structure.

facet:a schema facet structure

Function: xmlSchemaFreeValue

void	xmlSchemaFreeValue		(xmlSchemaValPtr value)

Cleanup the default XML Schemas type library

@@ -47,7 +60,9 @@ A:link, A:visited, A:active { text-decoration: underline }

Lookup function

type:the built-in simple type.
Returns:the item type of @type as defined by the built-in datatype hierarchy of XML Schema Part 2: Datatypes, or NULL in case of an error.

Function: xmlSchemaGetBuiltInType

xmlSchemaTypePtr	xmlSchemaGetBuiltInType	(xmlSchemaValType type)

Gives you the type struct for a built-in type by its type id.

-
type:the type of the built in type
Returns:the type if found, NULL otherwise.

Function: xmlSchemaGetFacetValueAsULong

unsigned long	xmlSchemaGetFacetValueAsULong	(xmlSchemaFacetPtr facet)
+
type:the type of the built in type
Returns:the type if found, NULL otherwise.

Function: xmlSchemaGetCanonValue

int	xmlSchemaGetCanonValue		(xmlSchemaValPtr val, 
const xmlChar ** retValue)
+

Get a the cononical representation of the value. The caller has to free the returned retValue.

+
val:the precomputed value
retValue:the returned value
Returns:0 if the value could be built and -1 in case of API errors or if the value type is not supported yet.

Function: xmlSchemaGetFacetValueAsULong

unsigned long	xmlSchemaGetFacetValueAsULong	(xmlSchemaFacetPtr facet)

Extract the value of a facet

facet:an schemas type facet
Returns:the value as a long

Function: xmlSchemaGetPredefinedType

xmlSchemaTypePtr	xmlSchemaGetPredefinedType	(const xmlChar * name, 
const xmlChar * ns)

Lookup a type in the default XML Schemas type library

@@ -57,7 +72,11 @@ A:link, A:visited, A:active { text-decoration: underline }

Evaluates if a specific facet can be used in conjunction with a type.

type:the built-in type
facetType:the facet type
Returns:1 if the facet can be used with the given built-in type, 0 otherwise and -1 in case the type is not a built-in type.

Function: xmlSchemaNewFacet

xmlSchemaFacetPtr	xmlSchemaNewFacet	(void)

Allocate a new Facet structure.

-
Returns:the newly allocated structure or NULL in case or error

Function: xmlSchemaValPredefTypeNode

int	xmlSchemaValPredefTypeNode	(xmlSchemaTypePtr type, 
const xmlChar * value,
xmlSchemaValPtr * val,
xmlNodePtr node)
+
Returns:the newly allocated structure or NULL in case or error

Function: xmlSchemaNewNOTATIONValue

xmlSchemaValPtr	xmlSchemaNewNOTATIONValue	(const xmlChar * name, 
const xmlChar * ns)
+

Allocate a new NOTATION value.

+
name:the notation name
ns:the notation namespace name or NULL
Returns:a pointer to the new value or NULL in case of error

Function: xmlSchemaNewStringValue

xmlSchemaValPtr	xmlSchemaNewStringValue	(xmlSchemaValType type, 
const xmlChar * value)
+

Allocate a new simple type value. The type can be of XML_SCHEMAS_STRING.

+
type:the value type
value:the value
Returns:a pointer to the new value or NULL in case of error

Function: xmlSchemaValPredefTypeNode

int	xmlSchemaValPredefTypeNode	(xmlSchemaTypePtr type, 
const xmlChar * value,
xmlSchemaValPtr * val,
xmlNodePtr node)

Check that a value conforms to the lexical space of the predefined type. if true a value is computed and returned in @val.

type:the predefined type
value:the value to check
val:the return computed value
node:the node containing the value
Returns:0 if this validates, a positive error code number otherwise and -1 in case of internal or API error.

Function: xmlSchemaValPredefTypeNodeNoNorm

int	xmlSchemaValPredefTypeNodeNoNorm	(xmlSchemaTypePtr type, 
const xmlChar * value,
xmlSchemaValPtr * val,
xmlNodePtr node)

Check that a value conforms to the lexical space of the predefined type. if true a value is computed and returned in @val. This one does apply any normalization to the value.

diff --git a/doc/html/libxml-xmlversion.html b/doc/html/libxml-xmlversion.html index 885cfb35..a52577a1 100644 --- a/doc/html/libxml-xmlversion.html +++ b/doc/html/libxml-xmlversion.html @@ -28,7 +28,7 @@ A:link, A:visited, A:active { text-decoration: underline }

Macro: LIBXML_ISO8859X_ENABLED

#define LIBXML_ISO8859X_ENABLED

Whether ISO-8859-* support is made available in case iconv is not

Macro: LIBXML_LEGACY_ENABLED

#define LIBXML_LEGACY_ENABLED

Whether the deprecated APIs are compiled in for compatibility

Macro: LIBXML_MODULES_ENABLED

#define LIBXML_MODULES_ENABLED

Whether the module interfaces are compiled in

-

Macro: LIBXML_MODULE_EXTENSION

#define LIBXML_MODULE_EXTENSION

The file extension for the modules

+

Macro: LIBXML_MODULE_EXTENSION

#define LIBXML_MODULE_EXTENSION

Macro: LIBXML_OUTPUT_ENABLED

#define LIBXML_OUTPUT_ENABLED

Whether the serialization/saving support is configured in

Macro: LIBXML_PATTERN_ENABLED

#define LIBXML_PATTERN_ENABLED

Whether the xmlPattern node selection interface is configured in

Macro: LIBXML_PUSH_ENABLED

#define LIBXML_PUSH_ENABLED

Whether the push parsing interfaces are configured in

diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 0dde5097..43cf99a0 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -956,13 +956,17 @@ - + + + + - + + implementation of the Relax-NG validation @@ -2091,6 +2095,7 @@ + @@ -2732,6 +2737,7 @@ + @@ -2853,25 +2859,34 @@ implementation of XML Schema Datatypes module providing the XML Schema Datatypes implementation both definition and validity checking Daniel Veillard - + + + + + - - + - - - - - + + - + + + + + + + + + + + - + - - + @@ -3691,7 +3706,6 @@ Whether the module interfaces are compiled in - The file extension for the modules Whether the serialization/saving support is configured in @@ -5202,6 +5216,7 @@ + @@ -5271,6 +5286,10 @@ + + + + @@ -6175,6 +6194,7 @@ actually an xmlCharEncoding'/> + @@ -6398,7 +6418,7 @@ actually an xmlCharEncoding'/> defined(LIBXML_OUTPUT_ENABLED) Take a block of UTF-8 chars in and try to convert it to an ISO Latin 1 block of chars out. - + @@ -7307,7 +7327,7 @@ actually an xmlCharEncoding'/> Take a block of ISO Latin 1 chars in and try to convert it to an UTF-8 block of chars out. - + @@ -10072,9 +10092,9 @@ actually an xmlCharEncoding'/> - + a free() equivalent, with error checking. - + Provides the memory access functions set currently in use @@ -10085,15 +10105,15 @@ actually an xmlCharEncoding'/> - - - + a malloc() equivalent, with logging of the allocation info. + + - - - - + a realloc() equivalent, with logging of the allocation info. + + + Override the default memory access functions with a new set This has to be called before any other libxml routines ! Should this be blocked if there was already some allocations done ? @@ -10125,9 +10145,9 @@ actually an xmlCharEncoding'/> - - - + a strdup() equivalent, with logging of the allocation info. + + defined(LIBXML_MODULES_ENABLED) @@ -11558,27 +11578,45 @@ actually an xmlCharEncoding'/> + + defined(LIBXML_PATTERN_ENABLED) + + + + defined(LIBXML_PATTERN_ENABLED) - Get a streaming context for that pattern Use xmlFreeStreamCtxt to free the context. - - + + + defined(LIBXML_PATTERN_ENABLED) - Test wether the node matches the pattern - - - + + + + + + + defined(LIBXML_PATTERN_ENABLED) + + + + + + defined(LIBXML_PATTERN_ENABLED) + + + defined(LIBXML_PATTERN_ENABLED) - Compile a pattern. - - - - - + + + + + + Set and return the previous value for enabling pedantic warnings. @@ -12621,6 +12659,15 @@ actually an xmlCharEncoding'/> + + defined(LIBXML_SCHEMAS_ENABLED) + Compare 2 values + + + + + + defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) Dump a Schema structure. @@ -12682,6 +12729,13 @@ actually an xmlCharEncoding'/> + + defined(LIBXML_SCHEMAS_ENABLED) + Get a the cononical representation of the value. The caller has to free the returned retValue. + + + + defined(LIBXML_SCHEMAS_ENABLED) Extract the value of a facet @@ -12743,12 +12797,26 @@ actually an xmlCharEncoding'/> + + defined(LIBXML_SCHEMAS_ENABLED) + Allocate a new NOTATION value. + + + + defined(LIBXML_SCHEMAS_ENABLED) Create an XML Schemas parse context for that file/resource expected to contain an XML Schemas file. + + defined(LIBXML_SCHEMAS_ENABLED) + Allocate a new simple type value. The type can be of XML_SCHEMAS_STRING. + + + + defined(LIBXML_SCHEMAS_ENABLED) Create an XML Schemas validation context based on the given schema @@ -13246,17 +13314,25 @@ actually an xmlCharEncoding'/> defined(LIBXML_PATTERN_ENABLED) - push one level from the stream. - - + + + defined(LIBXML_PATTERN_ENABLED) - push new data onto the stream. NOTE: if the call xmlPatterncompile() indicated a dictionnary, then strings for name and ns will be expected to come from the dictionary. Both @name and @ns being NULL means the / i.e. the root of the document. This can also act as a reset. - - - - + + + + + + + + defined(LIBXML_PATTERN_ENABLED) + + + + + The current char value, if using UTF-8 this may actually span multiple bytes in the input buffer. @@ -13406,6 +13482,12 @@ actually an xmlCharEncoding'/> + + defined(LIBXML_READER_ENABLED) + This function provides the current index of the parser used by the reader, relative to the start of the current entity. This function actually just wraps a call to xmlBytesConsumed() for the parser context associated with the reader. See xmlBytesConsumed() for more information. + + + defined(LIBXML_READER_ENABLED) This method releases any resources allocated by the current instance changes the state to Closed and close any underlying input. diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index f69a5bac..1b64e312 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -1120,6 +1120,7 @@ + @@ -1187,6 +1188,10 @@ + + + + @@ -2318,9 +2323,12 @@ + + + @@ -2509,6 +2517,7 @@ + @@ -2526,6 +2535,7 @@ + @@ -2535,7 +2545,9 @@ + + @@ -2571,6 +2583,7 @@ + @@ -2631,6 +2644,7 @@ + @@ -2659,6 +2673,7 @@ + @@ -4416,6 +4431,7 @@ + @@ -4483,6 +4499,10 @@ + + + + @@ -5650,9 +5670,12 @@ + + + @@ -5841,6 +5864,7 @@ + @@ -5858,6 +5882,7 @@ + @@ -5867,7 +5892,9 @@ + + @@ -5903,6 +5930,7 @@ + @@ -5963,6 +5991,7 @@ + @@ -5991,6 +6020,7 @@ + @@ -6706,6 +6736,7 @@ + @@ -7234,6 +7265,10 @@ + + + + @@ -7682,6 +7717,8 @@ + + @@ -7708,6 +7745,7 @@ + @@ -7839,6 +7877,7 @@ + @@ -9277,8 +9316,11 @@ + + + @@ -9433,7 +9475,9 @@ + + @@ -9444,6 +9488,7 @@ + @@ -9471,6 +9516,9 @@ + + + @@ -9502,6 +9550,7 @@ + @@ -9529,6 +9578,7 @@ + @@ -10736,14 +10786,18 @@ + + + + @@ -12216,6 +12270,7 @@ + @@ -12418,6 +12473,7 @@ + @@ -12577,19 +12633,27 @@ + + + + + + + + @@ -12597,6 +12661,7 @@ + @@ -13253,6 +13318,7 @@ + @@ -13345,6 +13411,8 @@ + + @@ -13555,7 +13623,6 @@ - @@ -13905,11 +13972,11 @@ + - @@ -15415,6 +15482,7 @@ + @@ -15440,7 +15508,6 @@ - @@ -16430,6 +16497,7 @@ + @@ -16748,9 +16816,6 @@ - - - @@ -16977,7 +17042,6 @@ - @@ -17270,6 +17334,9 @@ + + + @@ -17469,9 +17536,6 @@ - - - @@ -17513,6 +17577,7 @@ + @@ -17666,6 +17731,8 @@ + + @@ -17676,7 +17743,10 @@ + + + @@ -17774,7 +17844,6 @@ - @@ -17972,6 +18041,8 @@ + + @@ -18176,6 +18247,7 @@ + @@ -18389,6 +18461,7 @@ + @@ -18434,7 +18507,7 @@ - + @@ -18675,6 +18748,7 @@ + @@ -18847,9 +18921,6 @@ - - - @@ -18956,13 +19027,9 @@ - - - - @@ -18991,7 +19058,6 @@ - @@ -19112,6 +19178,7 @@ + @@ -19190,6 +19257,9 @@ + + + @@ -19463,6 +19533,8 @@ + + @@ -19781,7 +19853,6 @@ - @@ -20005,7 +20076,6 @@ - @@ -20019,8 +20089,6 @@ - - @@ -20225,7 +20293,6 @@ - @@ -20636,7 +20703,11 @@ + + + + @@ -20662,6 +20733,7 @@ + @@ -20828,7 +20900,6 @@ - @@ -20878,7 +20949,6 @@ - @@ -20976,8 +21046,6 @@ - - @@ -21164,7 +21232,6 @@ - @@ -22089,6 +22156,7 @@ + @@ -22109,7 +22177,6 @@ - @@ -22164,7 +22231,10 @@ + + + @@ -22193,6 +22263,7 @@ + @@ -22247,7 +22318,9 @@ + + @@ -22422,7 +22495,6 @@ - @@ -22547,6 +22619,7 @@ + @@ -22621,6 +22694,8 @@ + + @@ -22734,7 +22809,6 @@ - @@ -22958,7 +23032,10 @@ + + + @@ -23059,6 +23136,7 @@ + @@ -23141,7 +23219,6 @@ - @@ -23187,7 +23264,6 @@ - @@ -23365,9 +23441,6 @@ - - - @@ -23379,6 +23452,7 @@ + @@ -23878,6 +23952,7 @@ + @@ -23985,7 +24060,6 @@ - @@ -24091,7 +24165,6 @@ - @@ -24376,9 +24449,6 @@ - - - @@ -24593,8 +24663,6 @@ - - @@ -24602,6 +24670,7 @@ + @@ -24924,6 +24993,7 @@ + @@ -24965,8 +25035,6 @@ - - @@ -25124,6 +25192,7 @@ + @@ -25402,6 +25471,7 @@ + @@ -25545,6 +25615,7 @@ + @@ -25614,7 +25685,6 @@ - @@ -25695,6 +25765,9 @@ + + + @@ -25782,7 +25855,6 @@ - @@ -26236,6 +26308,7 @@ + @@ -26449,6 +26522,8 @@ + + @@ -26502,6 +26577,7 @@ + @@ -26664,11 +26740,30 @@ + - - + + + + + + + + + + + + + + + + + + + + @@ -26697,11 +26792,9 @@ - - @@ -26946,6 +27039,7 @@ + @@ -27542,9 +27636,6 @@ - - - @@ -27979,7 +28070,6 @@ - @@ -28023,6 +28113,7 @@ + @@ -28149,6 +28240,9 @@ + + + @@ -28355,6 +28449,9 @@ + + + @@ -28501,9 +28598,6 @@ - - - @@ -28805,9 +28899,6 @@ - - - @@ -29160,9 +29251,9 @@ - + diff --git a/elfgcchack.h b/elfgcchack.h index ca392ecc..2807befe 100644 --- a/elfgcchack.h +++ b/elfgcchack.h @@ -3281,6 +3281,12 @@ extern __typeof (xmlParserWarning) xmlParserWarning__internal_alias __attribute( extern __typeof (xmlParserWarning) xmlParserWarning __attribute((alias("xmlParserWarning__internal_alias"))); #define xmlParserWarning xmlParserWarning__internal_alias +#if defined(LIBXML_PATTERN_ENABLED) +extern __typeof (xmlPatternFromRoot) xmlPatternFromRoot__internal_alias __attribute((visibility("hidden"))); +extern __typeof (xmlPatternFromRoot) xmlPatternFromRoot __attribute((alias("xmlPatternFromRoot__internal_alias"))); +#define xmlPatternFromRoot xmlPatternFromRoot__internal_alias +#endif + #if defined(LIBXML_PATTERN_ENABLED) extern __typeof (xmlPatternGetStreamCtxt) xmlPatternGetStreamCtxt__internal_alias __attribute((visibility("hidden"))); extern __typeof (xmlPatternGetStreamCtxt) xmlPatternGetStreamCtxt __attribute((alias("xmlPatternGetStreamCtxt__internal_alias"))); @@ -3293,6 +3299,18 @@ extern __typeof (xmlPatternMatch) xmlPatternMatch __attribute((alias("xmlPattern #define xmlPatternMatch xmlPatternMatch__internal_alias #endif +#if defined(LIBXML_PATTERN_ENABLED) +extern __typeof (xmlPatternMaxDepth) xmlPatternMaxDepth__internal_alias __attribute((visibility("hidden"))); +extern __typeof (xmlPatternMaxDepth) xmlPatternMaxDepth __attribute((alias("xmlPatternMaxDepth__internal_alias"))); +#define xmlPatternMaxDepth xmlPatternMaxDepth__internal_alias +#endif + +#if defined(LIBXML_PATTERN_ENABLED) +extern __typeof (xmlPatternStreamable) xmlPatternStreamable__internal_alias __attribute((visibility("hidden"))); +extern __typeof (xmlPatternStreamable) xmlPatternStreamable __attribute((alias("xmlPatternStreamable__internal_alias"))); +#define xmlPatternStreamable xmlPatternStreamable__internal_alias +#endif + #if defined(LIBXML_PATTERN_ENABLED) extern __typeof (xmlPatterncompile) xmlPatterncompile__internal_alias __attribute((visibility("hidden"))); extern __typeof (xmlPatterncompile) xmlPatterncompile __attribute((alias("xmlPatterncompile__internal_alias"))); @@ -4035,6 +4053,12 @@ extern __typeof (xmlSchemaCompareValues) xmlSchemaCompareValues __attribute((ali #define xmlSchemaCompareValues xmlSchemaCompareValues__internal_alias #endif +#if defined(LIBXML_SCHEMAS_ENABLED) +extern __typeof (xmlSchemaCompareValuesWhtsp) xmlSchemaCompareValuesWhtsp__internal_alias __attribute((visibility("hidden"))); +extern __typeof (xmlSchemaCompareValuesWhtsp) xmlSchemaCompareValuesWhtsp __attribute((alias("xmlSchemaCompareValuesWhtsp__internal_alias"))); +#define xmlSchemaCompareValuesWhtsp xmlSchemaCompareValuesWhtsp__internal_alias +#endif + #if defined(LIBXML_SCHEMAS_ENABLED) && defined(LIBXML_OUTPUT_ENABLED) extern __typeof (xmlSchemaDump) xmlSchemaDump__internal_alias __attribute((visibility("hidden"))); extern __typeof (xmlSchemaDump) xmlSchemaDump __attribute((alias("xmlSchemaDump__internal_alias"))); @@ -4095,6 +4119,12 @@ extern __typeof (xmlSchemaGetBuiltInType) xmlSchemaGetBuiltInType __attribute((a #define xmlSchemaGetBuiltInType xmlSchemaGetBuiltInType__internal_alias #endif +#if defined(LIBXML_SCHEMAS_ENABLED) +extern __typeof (xmlSchemaGetCanonValue) xmlSchemaGetCanonValue__internal_alias __attribute((visibility("hidden"))); +extern __typeof (xmlSchemaGetCanonValue) xmlSchemaGetCanonValue __attribute((alias("xmlSchemaGetCanonValue__internal_alias"))); +#define xmlSchemaGetCanonValue xmlSchemaGetCanonValue__internal_alias +#endif + #if defined(LIBXML_SCHEMAS_ENABLED) extern __typeof (xmlSchemaGetFacetValueAsULong) xmlSchemaGetFacetValueAsULong__internal_alias __attribute((visibility("hidden"))); extern __typeof (xmlSchemaGetFacetValueAsULong) xmlSchemaGetFacetValueAsULong __attribute((alias("xmlSchemaGetFacetValueAsULong__internal_alias"))); @@ -4149,12 +4179,24 @@ extern __typeof (xmlSchemaNewMemParserCtxt) xmlSchemaNewMemParserCtxt __attribut #define xmlSchemaNewMemParserCtxt xmlSchemaNewMemParserCtxt__internal_alias #endif +#if defined(LIBXML_SCHEMAS_ENABLED) +extern __typeof (xmlSchemaNewNOTATIONValue) xmlSchemaNewNOTATIONValue__internal_alias __attribute((visibility("hidden"))); +extern __typeof (xmlSchemaNewNOTATIONValue) xmlSchemaNewNOTATIONValue __attribute((alias("xmlSchemaNewNOTATIONValue__internal_alias"))); +#define xmlSchemaNewNOTATIONValue xmlSchemaNewNOTATIONValue__internal_alias +#endif + #if defined(LIBXML_SCHEMAS_ENABLED) extern __typeof (xmlSchemaNewParserCtxt) xmlSchemaNewParserCtxt__internal_alias __attribute((visibility("hidden"))); extern __typeof (xmlSchemaNewParserCtxt) xmlSchemaNewParserCtxt __attribute((alias("xmlSchemaNewParserCtxt__internal_alias"))); #define xmlSchemaNewParserCtxt xmlSchemaNewParserCtxt__internal_alias #endif +#if defined(LIBXML_SCHEMAS_ENABLED) +extern __typeof (xmlSchemaNewStringValue) xmlSchemaNewStringValue__internal_alias __attribute((visibility("hidden"))); +extern __typeof (xmlSchemaNewStringValue) xmlSchemaNewStringValue __attribute((alias("xmlSchemaNewStringValue__internal_alias"))); +#define xmlSchemaNewStringValue xmlSchemaNewStringValue__internal_alias +#endif + #if defined(LIBXML_SCHEMAS_ENABLED) extern __typeof (xmlSchemaNewValidCtxt) xmlSchemaNewValidCtxt__internal_alias __attribute((visibility("hidden"))); extern __typeof (xmlSchemaNewValidCtxt) xmlSchemaNewValidCtxt __attribute((alias("xmlSchemaNewValidCtxt__internal_alias"))); @@ -4493,6 +4535,12 @@ extern __typeof (xmlStreamPush) xmlStreamPush __attribute((alias("xmlStreamPush_ #define xmlStreamPush xmlStreamPush__internal_alias #endif +#if defined(LIBXML_PATTERN_ENABLED) +extern __typeof (xmlStreamPushAttr) xmlStreamPushAttr__internal_alias __attribute((visibility("hidden"))); +extern __typeof (xmlStreamPushAttr) xmlStreamPushAttr __attribute((alias("xmlStreamPushAttr__internal_alias"))); +#define xmlStreamPushAttr xmlStreamPushAttr__internal_alias +#endif + extern __typeof (xmlStringCurrentChar) xmlStringCurrentChar__internal_alias __attribute((visibility("hidden"))); extern __typeof (xmlStringCurrentChar) xmlStringCurrentChar __attribute((alias("xmlStringCurrentChar__internal_alias"))); #define xmlStringCurrentChar xmlStringCurrentChar__internal_alias @@ -4581,6 +4629,12 @@ extern __typeof (xmlTextReaderBaseUri) xmlTextReaderBaseUri __attribute((alias(" #define xmlTextReaderBaseUri xmlTextReaderBaseUri__internal_alias #endif +#if defined(LIBXML_READER_ENABLED) +extern __typeof (xmlTextReaderByteConsumed) xmlTextReaderByteConsumed__internal_alias __attribute((visibility("hidden"))); +extern __typeof (xmlTextReaderByteConsumed) xmlTextReaderByteConsumed __attribute((alias("xmlTextReaderByteConsumed__internal_alias"))); +#define xmlTextReaderByteConsumed xmlTextReaderByteConsumed__internal_alias +#endif + #if defined(LIBXML_READER_ENABLED) extern __typeof (xmlTextReaderClose) xmlTextReaderClose__internal_alias __attribute((visibility("hidden"))); extern __typeof (xmlTextReaderClose) xmlTextReaderClose __attribute((alias("xmlTextReaderClose__internal_alias"))); diff --git a/python/libxml2class.txt b/python/libxml2class.txt index c8e12ba0..f8146897 100644 --- a/python/libxml2class.txt +++ b/python/libxml2class.txt @@ -1012,6 +1012,7 @@ Class xmlTextReader(xmlTextReaderCore) # functions from module xmlreader AttributeCount() BaseUri() + ByteConsumed() Close() CurrentDoc() CurrentNode() diff --git a/testapi.c b/testapi.c index c10d50ec..35a16c1c 100644 --- a/testapi.c +++ b/testapi.c @@ -1066,6 +1066,21 @@ static void des_xmlSchemaValType(int no ATTRIBUTE_UNUSED, xmlSchemaValType val A #endif +#ifdef LIBXML_SCHEMAS_ENABLED +#define gen_nb_xmlSchemaWhitespaceValueType 4 +static xmlSchemaWhitespaceValueType gen_xmlSchemaWhitespaceValueType(int no, int nr ATTRIBUTE_UNUSED) { + if (no == 1) return(XML_SCHEMA_WHITESPACE_COLLAPSE); + if (no == 2) return(XML_SCHEMA_WHITESPACE_PRESERVE); + if (no == 3) return(XML_SCHEMA_WHITESPACE_REPLACE); + if (no == 4) return(XML_SCHEMA_WHITESPACE_UNKNOWN); + return(0); +} + +static void des_xmlSchemaWhitespaceValueType(int no ATTRIBUTE_UNUSED, xmlSchemaWhitespaceValueType val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { +} + +#endif + #include #include #include @@ -16556,6 +16571,40 @@ test_parserInternals(void) { return(test_ret); } +static int +test_xmlPatternFromRoot(void) { + int test_ret = 0; + +#if defined(LIBXML_PATTERN_ENABLED) + int mem_base; + int ret_val; + xmlPatternPtr comp; /* */ + int n_comp; + + for (n_comp = 0;n_comp < gen_nb_xmlPatternPtr;n_comp++) { + mem_base = xmlMemBlocks(); + comp = gen_xmlPatternPtr(n_comp, 0); + + ret_val = xmlPatternFromRoot(comp); + desret_int(ret_val); + call_tests++; + des_xmlPatternPtr(n_comp, comp, 0); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlPatternFromRoot", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_comp); + printf("\n"); + } + } + function_tests++; +#endif + + return(test_ret); +} + + static int test_xmlPatternGetStreamCtxt(void) { int test_ret = 0; @@ -16573,9 +16622,9 @@ test_xmlPatternMatch(void) { #if defined(LIBXML_PATTERN_ENABLED) int mem_base; int ret_val; - xmlPatternPtr comp; /* the precompiled pattern */ + xmlPatternPtr comp; /* */ int n_comp; - xmlNodePtr node; /* a node */ + xmlNodePtr node; /* */ int n_node; for (n_comp = 0;n_comp < gen_nb_xmlPatternPtr;n_comp++) { @@ -16607,6 +16656,74 @@ test_xmlPatternMatch(void) { } +static int +test_xmlPatternMaxDepth(void) { + int test_ret = 0; + +#if defined(LIBXML_PATTERN_ENABLED) + int mem_base; + int ret_val; + xmlPatternPtr comp; /* */ + int n_comp; + + for (n_comp = 0;n_comp < gen_nb_xmlPatternPtr;n_comp++) { + mem_base = xmlMemBlocks(); + comp = gen_xmlPatternPtr(n_comp, 0); + + ret_val = xmlPatternMaxDepth(comp); + desret_int(ret_val); + call_tests++; + des_xmlPatternPtr(n_comp, comp, 0); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlPatternMaxDepth", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_comp); + printf("\n"); + } + } + function_tests++; +#endif + + return(test_ret); +} + + +static int +test_xmlPatternStreamable(void) { + int test_ret = 0; + +#if defined(LIBXML_PATTERN_ENABLED) + int mem_base; + int ret_val; + xmlPatternPtr comp; /* */ + int n_comp; + + for (n_comp = 0;n_comp < gen_nb_xmlPatternPtr;n_comp++) { + mem_base = xmlMemBlocks(); + comp = gen_xmlPatternPtr(n_comp, 0); + + ret_val = xmlPatternStreamable(comp); + desret_int(ret_val); + call_tests++; + des_xmlPatternPtr(n_comp, comp, 0); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlPatternStreamable", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_comp); + printf("\n"); + } + } + function_tests++; +#endif + + return(test_ret); +} + + static int test_xmlPatterncompile(void) { int test_ret = 0; @@ -16631,7 +16748,7 @@ test_xmlStreamPop(void) { #if defined(LIBXML_PATTERN_ENABLED) int mem_base; int ret_val; - xmlStreamCtxtPtr stream; /* the stream context */ + xmlStreamCtxtPtr stream; /* */ int n_stream; for (n_stream = 0;n_stream < gen_nb_xmlStreamCtxtPtr;n_stream++) { @@ -16665,11 +16782,11 @@ test_xmlStreamPush(void) { #if defined(LIBXML_PATTERN_ENABLED) int mem_base; int ret_val; - xmlStreamCtxtPtr stream; /* the stream context */ + xmlStreamCtxtPtr stream; /* */ int n_stream; - xmlChar * name; /* the current name */ + xmlChar * name; /* */ int n_name; - xmlChar * ns; /* the namespace name */ + xmlChar * ns; /* */ int n_ns; for (n_stream = 0;n_stream < gen_nb_xmlStreamCtxtPtr;n_stream++) { @@ -16705,16 +16822,68 @@ test_xmlStreamPush(void) { return(test_ret); } + +static int +test_xmlStreamPushAttr(void) { + int test_ret = 0; + +#if defined(LIBXML_PATTERN_ENABLED) + int mem_base; + int ret_val; + xmlStreamCtxtPtr stream; /* */ + int n_stream; + xmlChar * name; /* */ + int n_name; + xmlChar * ns; /* */ + int n_ns; + + for (n_stream = 0;n_stream < gen_nb_xmlStreamCtxtPtr;n_stream++) { + for (n_name = 0;n_name < gen_nb_const_xmlChar_ptr;n_name++) { + for (n_ns = 0;n_ns < gen_nb_const_xmlChar_ptr;n_ns++) { + mem_base = xmlMemBlocks(); + stream = gen_xmlStreamCtxtPtr(n_stream, 0); + name = gen_const_xmlChar_ptr(n_name, 1); + ns = gen_const_xmlChar_ptr(n_ns, 2); + + ret_val = xmlStreamPushAttr(stream, (const xmlChar *)name, (const xmlChar *)ns); + desret_int(ret_val); + call_tests++; + des_xmlStreamCtxtPtr(n_stream, stream, 0); + des_const_xmlChar_ptr(n_name, (const xmlChar *)name, 1); + des_const_xmlChar_ptr(n_ns, (const xmlChar *)ns, 2); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlStreamPushAttr", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_stream); + printf(" %d", n_name); + printf(" %d", n_ns); + printf("\n"); + } + } + } + } + function_tests++; +#endif + + return(test_ret); +} + static int test_pattern(void) { int test_ret = 0; - if (quiet == 0) printf("Testing pattern : 3 of 8 functions ...\n"); + if (quiet == 0) printf("Testing pattern : 7 of 12 functions ...\n"); + test_ret += test_xmlPatternFromRoot(); test_ret += test_xmlPatternGetStreamCtxt(); test_ret += test_xmlPatternMatch(); + test_ret += test_xmlPatternMaxDepth(); + test_ret += test_xmlPatternStreamable(); test_ret += test_xmlPatterncompile(); test_ret += test_xmlStreamPop(); test_ret += test_xmlStreamPush(); + test_ret += test_xmlStreamPushAttr(); if (test_ret != 0) printf("Module pattern: %d errors\n", test_ret); @@ -28981,6 +29150,40 @@ test_xmlTextReaderBaseUri(void) { } +static int +test_xmlTextReaderByteConsumed(void) { + int test_ret = 0; + +#if defined(LIBXML_READER_ENABLED) + int mem_base; + long ret_val; + xmlTextReaderPtr reader; /* an XML reader */ + int n_reader; + + for (n_reader = 0;n_reader < gen_nb_xmlTextReaderPtr;n_reader++) { + mem_base = xmlMemBlocks(); + reader = gen_xmlTextReaderPtr(n_reader, 0); + + ret_val = xmlTextReaderByteConsumed(reader); + desret_long(ret_val); + call_tests++; + des_xmlTextReaderPtr(n_reader, reader, 0); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlTextReaderByteConsumed", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_reader); + printf("\n"); + } + } + function_tests++; +#endif + + return(test_ret); +} + + static int test_xmlTextReaderClose(void) { int test_ret = 0; @@ -31129,7 +31332,7 @@ static int test_xmlreader(void) { int test_ret = 0; - if (quiet == 0) printf("Testing xmlreader : 70 of 80 functions ...\n"); + if (quiet == 0) printf("Testing xmlreader : 71 of 81 functions ...\n"); test_ret += test_xmlNewTextReader(); test_ret += test_xmlNewTextReaderFilename(); test_ret += test_xmlReaderForDoc(); @@ -31142,6 +31345,7 @@ test_xmlreader(void) { test_ret += test_xmlReaderWalker(); test_ret += test_xmlTextReaderAttributeCount(); test_ret += test_xmlTextReaderBaseUri(); + test_ret += test_xmlTextReaderByteConsumed(); test_ret += test_xmlTextReaderClose(); test_ret += test_xmlTextReaderConstBaseUri(); test_ret += test_xmlTextReaderConstEncoding(); @@ -32610,6 +32814,61 @@ test_xmlSchemaCompareValues(void) { } +static int +test_xmlSchemaCompareValuesWhtsp(void) { + int test_ret = 0; + +#if defined(LIBXML_SCHEMAS_ENABLED) + int mem_base; + int ret_val; + xmlSchemaValPtr x; /* a first value */ + int n_x; + xmlSchemaWhitespaceValueType xws; /* the whitespace value of x */ + int n_xws; + xmlSchemaValPtr y; /* a second value */ + int n_y; + xmlSchemaWhitespaceValueType yws; /* the whitespace value of y */ + int n_yws; + + for (n_x = 0;n_x < gen_nb_xmlSchemaValPtr;n_x++) { + for (n_xws = 0;n_xws < gen_nb_xmlSchemaWhitespaceValueType;n_xws++) { + for (n_y = 0;n_y < gen_nb_xmlSchemaValPtr;n_y++) { + for (n_yws = 0;n_yws < gen_nb_xmlSchemaWhitespaceValueType;n_yws++) { + mem_base = xmlMemBlocks(); + x = gen_xmlSchemaValPtr(n_x, 0); + xws = gen_xmlSchemaWhitespaceValueType(n_xws, 1); + y = gen_xmlSchemaValPtr(n_y, 2); + yws = gen_xmlSchemaWhitespaceValueType(n_yws, 3); + + ret_val = xmlSchemaCompareValuesWhtsp(x, xws, y, yws); + desret_int(ret_val); + call_tests++; + des_xmlSchemaValPtr(n_x, x, 0); + des_xmlSchemaWhitespaceValueType(n_xws, xws, 1); + des_xmlSchemaValPtr(n_y, y, 2); + des_xmlSchemaWhitespaceValueType(n_yws, yws, 3); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlSchemaCompareValuesWhtsp", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_x); + printf(" %d", n_xws); + printf(" %d", n_y); + printf(" %d", n_yws); + printf("\n"); + } + } + } + } + } + function_tests++; +#endif + + return(test_ret); +} + + static int test_xmlSchemaGetBuiltInListSimpleTypeItemType(void) { int test_ret = 0; @@ -32669,6 +32928,47 @@ test_xmlSchemaGetBuiltInType(void) { } +static int +test_xmlSchemaGetCanonValue(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; + + 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++) { + mem_base = xmlMemBlocks(); + val = gen_xmlSchemaValPtr(n_val, 0); + retValue = gen_const_xmlChar_ptr_ptr(n_retValue, 1); + + ret_val = xmlSchemaGetCanonValue(val, (const xmlChar **)retValue); + desret_int(ret_val); + call_tests++; + des_xmlSchemaValPtr(n_val, val, 0); + des_const_xmlChar_ptr_ptr(n_retValue, (const xmlChar **)retValue, 1); + xmlResetLastError(); + if (mem_base != xmlMemBlocks()) { + printf("Leak of %d blocks found in xmlSchemaGetCanonValue", + xmlMemBlocks() - mem_base); + test_ret++; + printf(" %d", n_val); + printf(" %d", n_retValue); + printf("\n"); + } + } + } + function_tests++; +#endif + + return(test_ret); +} + + static int test_xmlSchemaGetFacetValueAsULong(void) { int test_ret = 0; @@ -32811,6 +33111,26 @@ test_xmlSchemaNewFacet(void) { return(test_ret); } + +static int +test_xmlSchemaNewNOTATIONValue(void) { + int test_ret = 0; + + + /* missing type support */ + return(test_ret); +} + + +static int +test_xmlSchemaNewStringValue(void) { + int test_ret = 0; + + + /* missing type support */ + return(test_ret); +} + #ifdef LIBXML_SCHEMAS_ENABLED #define gen_nb_xmlSchemaValPtr_ptr 1 @@ -33189,18 +33509,22 @@ static int test_xmlschemastypes(void) { int test_ret = 0; - if (quiet == 0) printf("Testing xmlschemastypes : 17 of 20 functions ...\n"); + if (quiet == 0) printf("Testing xmlschemastypes : 19 of 24 functions ...\n"); test_ret += test_xmlSchemaCheckFacet(); test_ret += test_xmlSchemaCleanupTypes(); test_ret += test_xmlSchemaCollapseString(); test_ret += test_xmlSchemaCompareValues(); + test_ret += test_xmlSchemaCompareValuesWhtsp(); test_ret += test_xmlSchemaGetBuiltInListSimpleTypeItemType(); test_ret += test_xmlSchemaGetBuiltInType(); + test_ret += test_xmlSchemaGetCanonValue(); test_ret += test_xmlSchemaGetFacetValueAsULong(); test_ret += test_xmlSchemaGetPredefinedType(); test_ret += test_xmlSchemaInitTypes(); test_ret += test_xmlSchemaIsBuiltInTypeFacet(); test_ret += test_xmlSchemaNewFacet(); + test_ret += test_xmlSchemaNewNOTATIONValue(); + test_ret += test_xmlSchemaNewStringValue(); test_ret += test_xmlSchemaValPredefTypeNode(); test_ret += test_xmlSchemaValPredefTypeNodeNoNorm(); test_ret += test_xmlSchemaValidateFacet(); diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src index 64173080..5e2c8fbc 100644 --- a/win32/libxml2.def.src +++ b/win32/libxml2.def.src @@ -1297,8 +1297,11 @@ xmlParserPrintFileInfo xmlParserValidityError xmlParserValidityWarning xmlParserWarning +xmlPatternFromRoot xmlPatternGetStreamCtxt xmlPatternMatch +xmlPatternMaxDepth +xmlPatternStreamable xmlPatterncompile xmlPedanticParserDefault xmlPopInput @@ -1519,6 +1522,9 @@ xmlSchemaCollapseString xmlSchemaCompareValues #endif #ifdef LIBXML_SCHEMAS_ENABLED +xmlSchemaCompareValuesWhtsp +#endif +#ifdef LIBXML_SCHEMAS_ENABLED xmlSchemaDump #endif #ifdef LIBXML_SCHEMAS_ENABLED @@ -1545,6 +1551,9 @@ xmlSchemaGetBuiltInListSimpleTypeItemType xmlSchemaGetBuiltInType #endif #ifdef LIBXML_SCHEMAS_ENABLED +xmlSchemaGetCanonValue +#endif +#ifdef LIBXML_SCHEMAS_ENABLED xmlSchemaGetFacetValueAsULong #endif #ifdef LIBXML_SCHEMAS_ENABLED @@ -1572,9 +1581,15 @@ xmlSchemaNewFacet xmlSchemaNewMemParserCtxt #endif #ifdef LIBXML_SCHEMAS_ENABLED +xmlSchemaNewNOTATIONValue +#endif +#ifdef LIBXML_SCHEMAS_ENABLED xmlSchemaNewParserCtxt #endif #ifdef LIBXML_SCHEMAS_ENABLED +xmlSchemaNewStringValue +#endif +#ifdef LIBXML_SCHEMAS_ENABLED xmlSchemaNewValidCtxt #endif #ifdef LIBXML_SCHEMAS_ENABLED @@ -1699,6 +1714,7 @@ xmlStrcmp xmlStrdup xmlStreamPop xmlStreamPush +xmlStreamPushAttr xmlStringCurrentChar xmlStringDecodeEntities xmlStringGetNodeList @@ -1720,6 +1736,7 @@ xmlTextConcat xmlTextMerge xmlTextReaderAttributeCount xmlTextReaderBaseUri +xmlTextReaderByteConsumed xmlTextReaderClose xmlTextReaderConstBaseUri xmlTextReaderConstEncoding diff --git a/xmlschemastypes.c b/xmlschemastypes.c index 01eb497e..13cc095c 100644 --- a/xmlschemastypes.c +++ b/xmlschemastypes.c @@ -684,6 +684,7 @@ xmlSchemaNewValue(xmlSchemaValType type) { /** * xmlSchemaNewStringValue: * @type: the value type + * @value: the value * * Allocate a new simple type value. The type can be * of XML_SCHEMAS_STRING. @@ -710,7 +711,8 @@ xmlSchemaNewStringValue(xmlSchemaValType type, /** * xmlSchemaNewNOTATIONValue: - * @type: the value type + * @name: the notation name + * @ns: the notation namespace name or NULL * * Allocate a new NOTATION value. * @@ -4629,17 +4631,16 @@ xmlSchemaValidateFacet(xmlSchemaTypePtr base ATTRIBUTE_UNUSED, * @val: the precomputed value * @retValue: the returned value * - * Returns a the cononical representation of the value. - * The called has to free the returned retValue. + * Get a the cononical representation of the value. + * The caller has to free the returned retValue. * * Returns 0 if the value could be built and -1 in case of * API errors or if the value type is not supported yet. */ int -xmlSchemaGetCanonValue(xmlSchemaValPtr val, - const xmlChar **retValue) +xmlSchemaGetCanonValue(xmlSchemaValPtr val, const xmlChar **retValue) { - if (retValue == NULL) + if ((retValue == NULL) || (val == NULL)) return (-1); *retValue = NULL; switch (val->type) {