diff --git a/ChangeLog b/ChangeLog index 076a29aa..74958b90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon May 12 14:56:06 CEST 2008 Daniel Veillard + + * xmlschemas.c runtest.c testapi.c include/libxml/xmlreader.h + python/types.c python/libxml_wrap.h python/libxml.c: fx compilation + when configured without the reader should fix #513110 + * doc/*: regenerated + Sat May 3 14:33:29 CEST 2008 Rob Richards * dict.c: check for stdint.h and define types when using MSVC diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html index bedf9433..eacab4be 100644 --- a/doc/APIchunk1.html +++ b/doc/APIchunk1.html @@ -39,6 +39,7 @@ A:link, A:visited, A:active { text-decoration: underline } y-z

Letter C:

C14N
xmlC14NDocSaveTo
xmlC14NExecute
+xmlC14NIsVisibleCallback
CATALOG
xmlLoadACatalog
xmlLoadCatalog
xmlLoadSGMLSuperCatalog
@@ -108,6 +109,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlOutputOpenCallback
xmlOutputWriteCallback
xmlParserInputDeallocate
+xmlRegExecCallbacks
xmlSAX2ExternalSubset
xmlSAX2InternalSubset
xmlValidityErrorFunc
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html index cbcc86b3..460e822f 100644 --- a/doc/APIchunk10.html +++ b/doc/APIchunk10.html @@ -88,6 +88,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlMemSetup
xmlNewMutex
xmlNewRMutex
+xmlSchemaValidCtxtGetParserCtxt
accessed
xmlTextReaderCurrentDoc
xmlTextReaderCurrentNode
accesses
xmlCreateURLParserCtxt
@@ -315,6 +316,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlKeepBlanksDefault
xmlNewDocNode
xmlNewDocNodeEatName
+xmlSchemaValidCtxtGetParserCtxt
xmlSearchNs
xmlShell
xmlValidateNCName
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html index bcb58cf5..1c61e5b2 100644 --- a/doc/APIchunk11.html +++ b/doc/APIchunk11.html @@ -58,6 +58,10 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewStringInputStream
xmlRelaxNGNewValidCtxt
xmlSchemaNewStringValue
+xmlSchemaNewValidCtxt
+xmlSchemaSAXPlug
+xmlSchemaSAXUnplug
+xmlSchemaValidateStream
xmlSchematronNewValidCtxt
xmlSetCompressMode
xmlSetDocCompressMode
@@ -192,6 +196,7 @@ A:link, A:visited, A:active { text-decoration: underline }
bracket
xmlParseCharData
branch
xmlDOMWrapCloneNode
xmlDOMWrapRemoveNode
+xmlSchemaValidateOneElement
break
_xmlError
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html index 769619b4..ddcfe386 100644 --- a/doc/APIchunk12.html +++ b/doc/APIchunk12.html @@ -55,6 +55,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathSubValues
xmlXPathValueFlipSign
calls
xlinkNodeDetectFunc
+xmlSchemaSAXPlug
xmlXPathAxisFunc
came
xmlPopInput
cannot
xmlParseAttribute
@@ -769,6 +770,8 @@ A:link, A:visited, A:active { text-decoration: underline }
corresponding
xmlGetDocEntity
xmlGetDtdEntity
xmlGetParameterEntity
+xmlOutputBufferCreateFilenameFunc
+xmlParserInputBufferCreateFilenameFunc
xmlSetProp
xmlXPathTranslateFunction
cost
xmlByteConsumed
@@ -849,12 +852,14 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidityErrorFunc
xmlValidityWarningFunc
cur
xmlXPathAxisFunc
+
curent
xmlC14NIsVisibleCallback
currently
XML_SCHEMAS_INCLUDING_CONVERT_NS
xmlGcMemGet
xmlMemBlocks
xmlMemGet
xmlMemUsed
xmlOutputBufferCreateFilename
+xmlSchemaValidateFile
xmlXPathContextSetCache
custom
xmlDOMWrapAdoptNode
xmlDOMWrapCloneNode
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html index c86ff168..6adf2063 100644 --- a/doc/APIchunk13.html +++ b/doc/APIchunk13.html @@ -248,6 +248,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlPatternMinDepth
xmlTextReaderDepth
deregistration
xmlDeregisterNodeDefault
+xmlDeregisterNodeFunc
derivation
XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION
XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION
xmlExpExpDerive
@@ -356,6 +357,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSAX2EndElementNs
xmlSAX2Reference
xmlSAX2StartElementNs
+xmlSchemaIsValid
detection
docbCreatePushParserCtxt
xlinkExtendedLinkFunk
xlinkExtendedLinkSetFunk
@@ -462,6 +464,7 @@ A:link, A:visited, A:active { text-decoration: underline } XML_SCHEMAS_ELEM_BLOCK_RESTRICTION
XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION
discard
xmlParserInputRead
+
discarded
xmlDeregisterNodeFunc
discarding
xmlParseAttValue
xmlValidCtxtNormalizeAttributeValue
xmlValidNormalizeAttributeValue
@@ -526,6 +529,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPathNodeTrailingSorted
xmlXPathTrailing
xmlXPathTrailingSorted
+
doing
xmlOutputBufferCreateFilenameFunc
+xmlParserInputBufferCreateFilenameFunc
+xmlRegExecCallbacks
don
XML_SCHEMAS_ANY_LAX
xlinkIsLink
xmlCreatePushParserCtxt
@@ -597,7 +603,9 @@ A:link, A:visited, A:active { text-decoration: underline }
duplicates
xmlSchemaCopyValue
duration
xmlSchemaGetCanonValue
during
xmlSAXDefaultVersion
+xmlSchemaIsValid
xmlSchemaNewDocParserCtxt
+xmlSchemaSetValidOptions
xmlSchematronNewDocParserCtxt
dynamic
LIBXML_MODULE_EXTENSION

A-B diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html index 61e35fc8..f02b8e79 100644 --- a/doc/APIchunk14.html +++ b/doc/APIchunk14.html @@ -321,7 +321,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseBalancedChunkMemoryRecover
xmlTextWriterFullEndElement
xmlXPathRoundFunction
+
event
xmlSchemaSAXPlug
+xmlSchemaSAXUnplug
+xmlSchemaValidateStream
events
htmlSAXParseDoc
+xmlSchemaValidateStream
ever
xmlExpCtxtNbCons
everywhere
xmlSAXParseFileWithData
xmlSAXParseMemoryWithData
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index 03616a54..a3b138a3 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -105,6 +105,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSAXParseMemoryWithData
far
_xmlParserCtxt
fatalErrorSAXFunc
+xmlSchemaIsValid
fashion
xmlNewRMutex
fast
htmlInitAutoClose
faster
htmlNodeStatus
@@ -231,6 +232,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStringLenGetNodeList
floor
xmlXPathFloorFunction
flow
xmlScanName
+xmlSchemaSAXPlug
+xmlSchemaSAXUnplug
+xmlSchemaValidateStream
flushed
xmlTextWriterEndDocument
flushes
xmlOutputBufferClose
xmlOutputBufferFlush
@@ -316,6 +320,7 @@ A:link, A:visited, A:active { text-decoration: underline } htmlSAXParseFile
xmlParseCtxtExternalEntity
xmlParseExternalEntity
+
forward
xmlSchemaValidateStream
fptr
XML_CAST_FPTR
fragment
_xmlURI
xmlNewDocFragment
@@ -392,8 +397,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGSetParserStructuredErrors
xmlRelaxNGSetValidErrors
xmlRelaxNGSetValidStructuredErrors
+xmlSchemaGetValidErrors
xmlSchemaSetParserErrors
xmlSchemaSetParserStructuredErrors
+xmlSchemaSetValidErrors
+xmlSchemaSetValidStructuredErrors
xmlSchematronSetValidStructuredErrors
xmlShellCmd
xmlSwitchEncoding
@@ -407,6 +415,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidNormalizeAttributeValue
xmlXIncludeSetFlags
future
_xmlDOMWrapCtxt
+xmlSchemaValidateFile

A-B C-C D-E diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html index 548d945d..b0b80aaa 100644 --- a/doc/APIchunk17.html +++ b/doc/APIchunk17.html @@ -144,6 +144,7 @@ A:link, A:visited, A:active { text-decoration: underline }
included
xmlC14NDocDumpMemory
xmlC14NDocSave
xmlC14NDocSaveTo
+xmlC14NIsVisibleCallback
xmlDocDumpMemory
xmlFreeDoc
xmlNanoHTTPContentLength
@@ -236,6 +237,7 @@ A:link, A:visited, A:active { text-decoration: underline }
indicating
xmlParseCharData
xmlParserFindNodeInfoIndex
xmlShellCmd
+xmlTextReaderErrorFunc
xmlTextReaderNormalization
xmlXPathAxisFunc
indication
xmlNanoFTPRead
@@ -293,6 +295,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewTextReader
xmlRelaxNGGetParserErrors
xmlSchemaGetParserErrors
+xmlSchemaValidateStream
xmlTextReaderByteConsumed
xmlXPathOrderDocElems
informations
_xmlAttr
@@ -317,6 +320,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxParserSetFlag
xmlSAX2EndElementNs
xmlSAX2StartElementNs
+xmlSchemaGetValidErrors
+xmlSchemaSetValidErrors
xmlShellDir
xmlXIncludeProcessNode
informative
_xmlError
@@ -472,6 +477,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGNewDocParserCtxt
xmlRemoveID
xmlRemoveRef
+xmlSchemaValidateFile
xmlXPathContextSetCache
interned
xmlPatterncompile
xmlTextReaderConstString
diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html index fcdce05d..fff07ece 100644 --- a/doc/APIchunk18.html +++ b/doc/APIchunk18.html @@ -136,6 +136,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRootNode
xmlSaveFileTo
xmlSaveFormatFileTo
+xmlSchemaSAXPlug
+xmlSchemaSAXUnplug
leading
xmlParseAttValue
xmlParseElementChildrenContentDecl
xmlParseElementMixedContentDecl
@@ -348,6 +350,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCanonicPath
xmlPathToURI
xmlSAX2SetDocumentLocator
+xmlTextReaderErrorFunc
xmlTextReaderLocatorBaseURI
xmlTextReaderLocatorLineNumber
locators
xlinkExtendedLinkFunk
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index a5db8097..53ea1297 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -51,6 +51,7 @@ A:link, A:visited, A:active { text-decoration: underline }
main
xmlIsMainThread
maintained
xmlRemoveID
xmlRemoveRef
+xmlSchemaSAXPlug
major
xmlDecodeEntities
make
xmlCreateEntitiesTable
xmlNewNode
@@ -192,20 +193,6 @@ A:link, A:visited, A:active { text-decoration: underline } xmlAddNextSibling
xmlAddPrevSibling
xmlAddSibling
-
message
_xmlError
-errorSAXFunc
-fatalErrorSAXFunc
-warningSAXFunc
-xmlGenericErrorFunc
-xmlParserError
-xmlParserValidityError
-xmlParserValidityWarning
-xmlParserWarning
-xmlStrPrintf
-xmlStrVPrintf
-xmlValidityErrorFunc
-xmlValidityWarningFunc
-xmlXPatherror
messages
errorSAXFunc
fatalErrorSAXFunc
warningSAXFunc
@@ -220,6 +207,8 @@ A:link, A:visited, A:active { text-decoration: underline } _xmlBuffer
xmlNanoHTTPMethod
xmlNanoHTTPMethodRedir
+xmlOutputBufferCreateFilenameFunc
+xmlParserInputBufferCreateFilenameFunc
xmlRegisterHTTPPostCallbacks
xmlSetBufferAllocationScheme
xmlTextReaderClose
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html index 1f00aa3c..08e43ca3 100644 --- a/doc/APIchunk20.html +++ b/doc/APIchunk20.html @@ -124,6 +124,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseElementChildrenContentDecl
xmlParseElementMixedContentDecl
xmlReconciliateNs
+xmlSchemaSAXPlug
xmlSetBufferAllocationScheme
xmlShellPwd
xmlStrncat
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html index 05eab1d7..cff8e697 100644 --- a/doc/APIchunk21.html +++ b/doc/APIchunk21.html @@ -67,6 +67,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlHashCreateDict
xmlListRemoveFirst
xmlListRemoveLast
+xmlTextReaderErrorFunc
occurences
xmlAutomataNewCountTrans
xmlAutomataNewCountTrans2
xmlAutomataNewOnceTrans
@@ -233,6 +234,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDOMWrapCloneNode
xmlDOMWrapReconcileNamespaces
xmlGetLineNo
+xmlSchemaValidCtxtGetOptions
options
htmlCtxtUseOptions
xmlCtxtUseOptions
xmlDOMWrapRemoveNode
@@ -241,6 +243,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSaveToFd
xmlSaveToFilename
xmlSaveToIO
+xmlSchemaSetValidOptions
+xmlSchemaValidCtxtGetOptions
+xmlSchemaValidateFile
xmlTextReaderSchemaValidateCtxt
xmlTextReaderSetup
xmlXPathContextSetCache
@@ -272,6 +277,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlListMerge
xmlParseEntityValue
xmlParseURIRaw
+xmlSchemaSAXPlug
+xmlSchemaSAXUnplug
xmlShellSave
xmlStrcat
xmlStrncat
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html index 1fcc6c91..584a8bde 100644 --- a/doc/APIchunk22.html +++ b/doc/APIchunk22.html @@ -184,6 +184,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlReconciliateNs
xmlRegExecErrInfo
xmlRegExecNextValues
+xmlSchemaSAXPlug
+xmlSchemaSAXUnplug
xmlValidGetValidElements
points
_xmlChRangeGroup
pop
xmlPopInput
@@ -202,35 +204,6 @@ A:link, A:visited, A:active { text-decoration: underline }
positioned
xmlTextReaderReadString
positionned
xmlTextReaderReadAttributeValue
positions
xmlUTF8Strsub
-
positive
UTF8ToHtml
-UTF8Toisolat1
-docbEncodeEntities
-htmlEncodeEntities
-isolat1ToUTF8
-xmlBufferAdd
-xmlBufferAddHead
-xmlBufferCCat
-xmlBufferCat
-xmlCharEncodingInputFunc
-xmlCharEncodingOutputFunc
-xmlRelaxNGValidateDoc
-xmlSchemaCheckFacet
-xmlSchemaValPredefTypeNode
-xmlSchemaValPredefTypeNodeNoNorm
-xmlSchemaValidateFacet
-xmlSchemaValidateFacetWhtsp
-xmlSchemaValidateLengthFacet
-xmlSchemaValidateLengthFacetWhtsp
-xmlSchemaValidateListSimpleTypeFacet
-xmlSchemaValidatePredefinedType
-xmlTextReaderPreservePattern
-xmlValidateNCName
-xmlValidateNMToken
-xmlValidateName
-xmlValidateQName
-xmlXPathBooleanFunction
-xmlXPathFloorFunction
-xmlXPathStringFunction
possible
xmlCopyNodeList
xmlCreateEntityParserCtxt
xmlParseDefaultDecl
@@ -281,6 +254,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlPatternStreamable
xmlRegNewExecCtxt
xmlRelaxNGNewValidCtxt
+xmlSchemaNewValidCtxt
xmlSchematronNewValidCtxt
xmlTextReaderRelaxNGSetSchema
xmlTextReaderSetSchema
@@ -521,6 +495,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlOutputMatchCallback
xmlSaveFormatFile
xmlSaveFormatFileEnc
+xmlSchemaValidateStream
xmlUTF8Strloc
xmlUTF8Strpos
provides
endElementNsSAX2Func
diff --git a/doc/APIchunk23.html b/doc/APIchunk23.html index 4d76cc65..9bee735c 100644 --- a/doc/APIchunk23.html +++ b/doc/APIchunk23.html @@ -118,7 +118,8 @@ A:link, A:visited, A:active { text-decoration: underline }
read-only
xmlDictCreateSub
readable
xmlStrEqual
reader-
xmlTextReaderGetRemainder
-
reading
xmlShell
+
reading
xmlSchemaValidateStream
+xmlShell
ready
INPUT_CHUNK
xmlAutomataCompile
realloc
_xmlBuffer
@@ -305,7 +306,9 @@ A:link, A:visited, A:active { text-decoration: underline } xmlOutputBufferCreateFilenameDefault
xmlParserInputBufferCreateFilenameDefault
xmlRegisterNodeDefault
+xmlRegisterNodeFunc
regular
LIBXML_REGEXP_ENABLED
+xmlRegExecCallbacks
xmlRegFreeExecCtxt
xmlRegNewExecCtxt
xmlRegexpCompile
@@ -406,6 +409,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlHashUpdateEntry2
xmlHashUpdateEntry3
xmlNewTextChild
+xmlSchemaSAXPlug
xmlXPathTranslateFunction
replacement
xmlACatalogAdd
xmlCatalogAdd
@@ -453,6 +457,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlHasFeature
xmlIsID
xmlMallocFunc
+xmlParserInputBufferCreateFilenameFunc
xmlReallocFunc
requests
xmlRegisterHTTPPostCallbacks
required
XML_SCHEMAS_ATTR_USE_REQUIRED
@@ -514,6 +519,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGFreeParserCtxt
xmlRelaxNGFreeValidCtxt
xmlSchemaFreeParserCtxt
+xmlSchemaFreeValidCtxt
xmlSchematronFreeParserCtxt
xmlSchematronFreeValidCtxt
xmlTextReaderClose
@@ -528,7 +534,8 @@ A:link, A:visited, A:active { text-decoration: underline }
responsible
xmlC14NDocDumpMemory
xmlCanonicPath
xmlPathToURI
-
restored
xmlTextReaderSetErrorHandler
+
restored
xmlSchemaSAXUnplug
+xmlTextReaderSetErrorHandler
xmlTextReaderSetStructuredErrorHandler
restrict
xmlParseExternalID
restriction
XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html index 0a798e6a..83f51111 100644 --- a/doc/APIchunk24.html +++ b/doc/APIchunk24.html @@ -128,8 +128,11 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaGetFacetValueAsULong
xmlSchemaGetValType
xmlSchemaNewMemParserCtxt
+xmlSchemaValidateDoc
xmlSchemaValidateFacet
xmlSchemaValidateFacetWhtsp
+xmlSchemaValidateFile
+xmlSchemaValidateStream
xmlSchematronNewMemParserCtxt
xmlTextReaderSchemaValidate
xmlTextReaderSchemaValidateCtxt
@@ -266,6 +269,7 @@ A:link, A:visited, A:active { text-decoration: underline }
setting
xmlSetGenericErrorFunc
xmlXPathContextSetCache
setups
xmlParseEncodingDecl
+
severity
xmlTextReaderErrorFunc
sgmlsource
getSystemId
xmlSAX2GetSystemId
shadowed
xmlDOMWrapAdoptNode
@@ -448,6 +452,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCopyError
xmlCtxtReadIO
xmlNewTextReader
+xmlParserInputBufferCreateFilenameFunc
xmlReadIO
xmlReaderForIO
xmlReaderNewIO
@@ -584,6 +589,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewCharRef
xmlNewTextWriterTree
xmlSaveTree
+xmlSchemaValidateOneElement
xmlXPathOrderDocElems
xmlXPathSubstringFunction
xmlXPtrNewCollapsedRange
@@ -674,6 +680,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStrdup
xmlStrdupFunc
streamable
xmlPatternStreamable
+xmlSchemaValidateFile
streaming
xmlPatternGetStreamCtxt
xmlStreamWantsAnyNode
streams
_xmlParserCtxt
@@ -721,6 +728,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaNewStringValue
structured
xmlRelaxNGSetValidStructuredErrors
xmlSchemaSetParserStructuredErrors
+xmlSchemaSetValidStructuredErrors
xmlSchematronSetValidStructuredErrors
xmlSetStructuredErrorFunc
structures
xmlFreeDoc
@@ -793,6 +801,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlReconciliateNs
xmlRelaxNGValidateFullElement
xmlSaveTree
+xmlSchemaValidateOneElement
xmlShellDu
xmlShellWrite
xmlTextReaderExpand
@@ -861,6 +870,8 @@ A:link, A:visited, A:active { text-decoration: underline }
suffix
LIBXML_MODULE_EXTENSION
suggested
_htmlElemDesc
suitable
xmlNewIOInputStream
+xmlOutputBufferCreateFilenameFunc
+xmlParserInputBufferCreateFilenameFunc
xmlRegexpCompile
sum
xmlXPathSubstringFunction
xmlXPathSumFunction
diff --git a/doc/APIchunk25.html b/doc/APIchunk25.html index aa590d29..e808b6b6 100644 --- a/doc/APIchunk25.html +++ b/doc/APIchunk25.html @@ -216,6 +216,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlMutexLock
xmlMutexUnlock
xmlNewMutex
+xmlRegExecCallbacks
xmlRegExecPushString
xmlRegExecPushString2
token_r
xmlNewRMutex
diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html index ed2a00dd..beaf7e3c 100644 --- a/doc/APIchunk26.html +++ b/doc/APIchunk26.html @@ -121,6 +121,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlParseEntityRef
xmlParserHandleReference
xmlSAX2UnparsedEntityDecl
+
unplug
xmlSchemaSAXPlug
unpredictable
UTF8ToHtml
UTF8Toisolat1
docbEncodeEntities
@@ -155,6 +156,7 @@ A:link, A:visited, A:active { text-decoration: underline } _xmlXPathContext
xmlDOMWrapReconcileNamespaces
xmlDOMWrapRemoveNode
+xmlSchemaValidateFile
xmlShellBase
xmlShellCat
xmlShellDir
@@ -275,6 +277,7 @@ A:link, A:visited, A:active { text-decoration: underline }
view
xmlShell
violated
XML_CAST_FPTR
visible
xmlC14NExecute
+xmlC14NIsVisibleCallback
void
XML_CAST_FPTR
xmlSAXParseFileWithData
xmlSAXParseMemoryWithData
diff --git a/doc/APIchunk27.html b/doc/APIchunk27.html index d2272eb0..d9fe3239 100644 --- a/doc/APIchunk27.html +++ b/doc/APIchunk27.html @@ -62,9 +62,14 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGGetValidErrors
xmlRelaxNGSetParserErrors
xmlRelaxNGSetValidErrors
+xmlRelaxNGValidityWarningFunc
xmlSAX2InitDefaultSAXHandler
xmlSchemaGetParserErrors
+xmlSchemaGetValidErrors
xmlSchemaSetParserErrors
+xmlSchemaSetValidErrors
+xmlSchemaValidityWarningFunc
+xmlSchematronValidityWarningFunc
xmlSearchNs
xmlTextReaderSetErrorHandler
xmlTextReaderSetStructuredErrorHandler
@@ -115,6 +120,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlCheckLanguageID
xmlKeepBlanksDefault
xmlMemShow
+xmlSchemaIsValid
xmlXIncludeProcess
xmlXIncludeProcessFlags
xmlXIncludeProcessFlagsData
@@ -143,6 +149,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlNewNs
xmlParseMarkupDecl
xmlParseSDDecl
+xmlTextReaderErrorFunc
while
xmlInitCharEncodingHandlers
xmlParseAttributeType
xmlParseEnumeratedType
@@ -268,6 +275,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlIOFTPRead
xmlIOHTTPRead
xmlNewCharEncodingHandler
+xmlOutputBufferCreateFilenameFunc
xmlOutputBufferCreateIO
xmlOutputWriteCallback
xmlSaveToIO
diff --git a/doc/APIchunk28.html b/doc/APIchunk28.html index bc198ee0..1888ead9 100644 --- a/doc/APIchunk28.html +++ b/doc/APIchunk28.html @@ -312,6 +312,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlOutputBufferClose
xmlSaveFileTo
xmlSaveFormatFileTo
xmlOutputBufferPtr
xmlNewTextWriter
+xmlOutputBufferCreateFilenameFunc
xmlOutputCloseCallback
xmlRegisterOutputCallbacks
xmlOutputMatchCallback
xmlRegisterOutputCallbacks
xmlOutputOpenCallback
xmlRegisterOutputCallbacks
@@ -336,6 +337,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlParserFindNodeInfoIndex
xmlParserFindNodeInfoIndex
xmlParserHandleReference
xmlScanName
xmlParserInputBufferPtr
xmlNewTextReader
+xmlParserInputBufferCreateFilenameFunc
xmlTextReaderGetRemainder
xmlTextReaderSetup
xmlParserInputPtr
resolveEntity
@@ -401,12 +403,15 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlSAX2StartDocument
startDocument
xmlSAX2StartElement
startElement
xmlSAX2UnparsedEntityDecl
unparsedEntityDecl
+
xmlSAXHandlerPtr
xmlSchemaSAXPlug
xmlSAXVersion
xmlSAXDefaultVersion
xmlSaveOptions
xmlSaveToBuffer
xmlSaveToFd
xmlSaveToFilename
xmlSaveToIO
+
xmlSchemaSAXPlug
xmlSchemaSAXUnplug
xmlSchemaValType
xmlSchemaGetValType
+
xmlSchemaValidOption
xmlSchemaSetValidOptions
xmlSchematronValidOptions
xmlSchematronNewValidCtxt
xmlSetExternalEntityLoader
resolveEntity
resolveEntitySAXFunc
diff --git a/doc/APIchunk5.html b/doc/APIchunk5.html index 72067ed7..0c4f5102 100644 --- a/doc/APIchunk5.html +++ b/doc/APIchunk5.html @@ -153,6 +153,7 @@ A:link, A:visited, A:active { text-decoration: underline }
People
xmlEncodeEntities
PhoneticExtensions
xmlUCSIsPhoneticExtensions
Please
xmlNormalizeWindowsPath
+
Plug
xmlSchemaSAXPlug
Pointer
xmlCheckUTF8
Points
xmlXPtrNewRangePoints
Pop
xmlRelaxNGValidatePopElement
diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html index 6e4a169d..c9364499 100644 --- a/doc/APIchunk6.html +++ b/doc/APIchunk6.html @@ -176,6 +176,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlRelaxNGSetValidErrors
xmlRelaxNGSetValidStructuredErrors
xmlRelaxNGValidateDoc
+xmlRelaxNGValidityErrorFunc
+xmlRelaxNGValidityWarningFunc
RelaxNG
_xmlSchemaElement
xmlRelaxNGCleanupTypes
xmlRelaxNGDump
diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html index df878bfb..4df9492d 100644 --- a/doc/APIchunk7.html +++ b/doc/APIchunk7.html @@ -50,6 +50,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSAX2InitDocbDefaultSAXHandler
xmlSAX2InitHtmlDefaultSAXHandler
xmlSAX2StartElementNs
+xmlSchemaValidateStream
SAX::substituteEntities
xmlSubstituteEntitiesDefault
SDDecl
xmlParseSDDecl
SDDecl?
xmlParseXMLDecl
@@ -119,10 +120,13 @@ A:link, A:visited, A:active { text-decoration: underline } xmlSchemaNewDocParserCtxt
xmlSchemaNewMemParserCtxt
xmlSchemaNewParserCtxt
+xmlSchemaNewValidCtxt
Schematron
LIBXML_SCHEMATRON_ENABLED
xmlSchematronFree
xmlSchematronParse
xmlSchematronSetValidStructuredErrors
+xmlSchematronValidityErrorFunc
+xmlSchematronValidityWarningFunc
Schematrons
xmlSchematronNewDocParserCtxt
xmlSchematronNewMemParserCtxt
xmlSchematronNewParserCtxt
@@ -170,6 +174,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlExpDump
Sets
htmlSetMetaEncoding
xmlBufferSetAllocationScheme
+xmlSchemaSetValidOptions
xmlXPathDifference
xmlXPathDistinct
xmlXPathDistinctSorted
@@ -205,12 +210,24 @@ A:link, A:visited, A:active { text-decoration: underline } xmlStringGetNodeList
xmlStringLenGetNodeList
Show
xmlShellPwd
-
Signature
xmlFreeFunc
+
Signature
xmlC14NIsVisibleCallback
+xmlDeregisterNodeFunc
+xmlFreeFunc
xmlGenericErrorFunc
xmlMallocFunc
+xmlOutputBufferCreateFilenameFunc
+xmlParserInputBufferCreateFilenameFunc
xmlReallocFunc
+xmlRegisterNodeFunc
+xmlRelaxNGValidityErrorFunc
+xmlRelaxNGValidityWarningFunc
+xmlSchemaValidityErrorFunc
+xmlSchemaValidityWarningFunc
+xmlSchematronValidityErrorFunc
+xmlSchematronValidityWarningFunc
xmlStrdupFunc
xmlStructuredErrorFunc
+xmlTextReaderErrorFunc
Similarly
xmlParseEntityRef
Simply
xmlCreateURI
Since
xmlStrcat
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html index 316f827f..2d733000 100644 --- a/doc/APIchunk8.html +++ b/doc/APIchunk8.html @@ -222,6 +222,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlReplaceNode
xmlUnlinkNode
Unlinks
xmlDOMWrapRemoveNode
+
Unplug
xmlSchemaSAXUnplug
Unregisters
xmlCleanupEncodingAliases
xmlDelEncodingAlias
Update
xmlNanoFTPUpdateURL
diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html index cf7f9d93..475d52f4 100644 --- a/doc/APIchunk9.html +++ b/doc/APIchunk9.html @@ -41,6 +41,9 @@ A:link, A:visited, A:active { text-decoration: underline }
Validate
XML_SCHEMAS_ANY_LAX
xmlRelaxNGValidateDoc
xmlRelaxNGValidateFullElement
+xmlSchemaValidateDoc
+xmlSchemaValidateOneElement
+xmlSchemaValidateStream
xmlSchematronValidateDoc
xmlShellValidate
xmlValidateAttributeValue
@@ -154,6 +157,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlValidateOneElement
xmlValidateOneNamespace
xmlValidateRoot
+
XML-Schema
xmlSchemaGetValidErrors
XMLDecl
xmlParseXMLDecl
XMLDecl?
xmlParseDocument
XMLSchema
xmlSchemaGetPredefinedType
@@ -206,6 +210,8 @@ A:link, A:visited, A:active { text-decoration: underline } xmlXPtrNewContext
xmlXPtrRangeToFunction
XSD
xmlAutomataNewNegTrans
+xmlSchemaValidityErrorFunc
+xmlSchemaValidityWarningFunc
xmlTextReaderSchemaValidate
xmlTextReaderSchemaValidateCtxt
xmlTextReaderSetSchema
diff --git a/doc/html/libxml-c14n.html b/doc/html/libxml-c14n.html index f4b3ecdb..dfcb9c5a 100644 --- a/doc/html/libxml-c14n.html +++ b/doc/html/libxml-c14n.html @@ -28,5 +28,5 @@ int xmlC14NIsVisibleCallback (void * use

Dumps the canonized image of given XML document into the provided buffer. For details see "Canonical XML" (http://www.w3.org/TR/xml-c14n) or "Exclusive XML Canonicalization" (http://www.w3.org/TR/xml-exc-c14n)

doc:the XML document for canonization
is_visible_callback:the function to use to determine is node visible or not
user_data:the first parameter for @is_visible_callback function (in most cases, it is nodes set)
exclusive:the exclusive flag (0 - non-exclusive canonicalization; otherwise - exclusive canonicalization)
inclusive_ns_prefixes:the list of inclusive namespace prefixes ended with a NULL or NULL if there is no inclusive namespaces (only for exclusive canonicalization, ignored otherwise)
with_comments:include comments in the result (!=0) or not (==0)
buf:the output buffer to store canonical XML; this buffer MUST have encoder==NULL because C14N requires UTF-8 output
Returns:non-negative value on success or a negative value on fail

Function type: xmlC14NIsVisibleCallback

Function type: xmlC14NIsVisibleCallback
 int	xmlC14NIsVisibleCallback	(void * user_data, 
					 xmlNodePtr node, 
					 xmlNodePtr parent)
-

user_data:
node:
parent:
Returns:

+

Signature for a C14N callback on visible nodes

user_data:user data
node:the curent node
parent:the parent node
Returns:1 if the node should be included

Daniel Veillard

diff --git a/doc/html/libxml-globals.html b/doc/html/libxml-globals.html index fd9a06cb..148d6a1c 100644 --- a/doc/html/libxml-globals.html +++ b/doc/html/libxml-globals.html @@ -90,7 +90,7 @@ void xmlRegisterNodeFunc (
func:function pointer to the new DeregisterNodeFunc
Returns:the previous value of the deregistration function

Function type: xmlDeregisterNodeFunc

Function type: xmlDeregisterNodeFunc
 void	xmlDeregisterNodeFunc		(xmlNodePtr node)
-

node:

+

Signature for the deregistration callback of a discarded node

node:the current node

Function: xmlInitGlobals

void	xmlInitGlobals			(void)

Additional initialisation for multi-threading

Function: xmlInitializeGlobalState

void	xmlInitializeGlobalState	(xmlGlobalStatePtr gs)

@@ -99,17 +99,17 @@ void	xmlDeregisterNodeFunc		(xmlNodePtr
Registers a callback for URI output file handling

 
func:function pointer to the new OutputBufferCreateFilenameFunc
Returns:the old value of the registration function
Function type: xmlOutputBufferCreateFilenameFunc
Function type: xmlOutputBufferCreateFilenameFunc
 xmlOutputBufferPtr	xmlOutputBufferCreateFilenameFunc	(const char * URI, 
							 xmlCharEncodingHandlerPtr encoder, 
							 int compression)
-
URI:
encoder:
compression:
Returns:


+

Signature for the function doing the lookup for a suitable output method corresponding to an URI.

URI:the URI to write to
encoder:
compression:
Returns:the new xmlOutputBufferPtr in case of success or NULL if no method was found.

Function: xmlParserInputBufferCreateFilenameDefault

xmlParserInputBufferCreateFilenameFunc	xmlParserInputBufferCreateFilenameDefault	(xmlParserInputBufferCreateFilenameFunc func)

Registers a callback for URI input file handling

func:function pointer to the new ParserInputBufferCreateFilenameFunc
Returns:the old value of the registration function

Function type: xmlParserInputBufferCreateFilenameFunc

Function type: xmlParserInputBufferCreateFilenameFunc
 xmlParserInputBufferPtr	xmlParserInputBufferCreateFilenameFunc	(const char * URI, 
							 xmlCharEncoding enc)
-

URI:
enc:
Returns:

+

Signature for the function doing the lookup for a suitable input method corresponding to an URI.

URI:the URI to read from
enc:the requested source encoding
Returns:the new xmlParserInputBufferPtr in case of success or NULL if no method was found.

Function: xmlRegisterNodeDefault

xmlRegisterNodeFunc	xmlRegisterNodeDefault	(xmlRegisterNodeFunc func)

Registers a callback for node creation

func:function pointer to the new RegisterNodeFunc
Returns:the old value of the registration function

Function type: xmlRegisterNodeFunc

Function type: xmlRegisterNodeFunc
 void	xmlRegisterNodeFunc		(xmlNodePtr node)
-

node:

+

Signature for the registration callback of a created node

node:the current node

Function: xmlThrDefBufferAllocScheme

xmlBufferAllocationScheme	xmlThrDefBufferAllocScheme	(xmlBufferAllocationScheme v)

v:
Returns:

Function: xmlThrDefDefaultBufferSize

int	xmlThrDefDefaultBufferSize	(int v)

diff --git a/doc/html/libxml-relaxng.html b/doc/html/libxml-relaxng.html
index 650d058b..b631a1af 100644
--- a/doc/html/libxml-relaxng.html
+++ b/doc/html/libxml-relaxng.html
@@ -153,10 +153,10 @@ The content of this structure is not made public by the API.

Push a new element start on the RelaxNG validation stack.

ctxt:the validation context
doc:a document instance
elem:an element instance
Returns:1 if no validation problem was found or 0 if validating the element requires a full node, and -1 in case of error.

Function type: xmlRelaxNGValidityErrorFunc

Function type: xmlRelaxNGValidityErrorFunc
 void	xmlRelaxNGValidityErrorFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)
-

ctx:
msg:
...:

+

Signature of an error callback from a Relax-NG validation

ctx:the validation context
msg:the message
...:extra arguments

Function type: xmlRelaxNGValidityWarningFunc

Function type: xmlRelaxNGValidityWarningFunc
 void	xmlRelaxNGValidityWarningFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)
-

ctx:
msg:
...:

+

Signature of a warning callback from a Relax-NG validation

ctx:the validation context
msg:the message
...:extra arguments

Function: xmlRelaxParserSetFlag

int	xmlRelaxParserSetFlag		(xmlRelaxNGParserCtxtPtr ctxt, 
					 int flags)

Semi private function used to pass informations to a parser context which are a combination of xmlRelaxNGParserFlag .

ctxt:a RelaxNG parser context
flags:a set of flags values
Returns:0 if success and -1 in case of error

Daniel Veillard

diff --git a/doc/html/libxml-schematron.html b/doc/html/libxml-schematron.html index 5ec67e56..1dcd73aa 100644 --- a/doc/html/libxml-schematron.html +++ b/doc/html/libxml-schematron.html @@ -74,8 +74,8 @@ The content of this structure is not made public by the API.

Validate a tree instance against the schematron

ctxt:the schema validation context
instance:the document instace tree
Returns:0 in case of success, -1 in case of internal error and an error count otherwise.

Function type: xmlSchematronValidityErrorFunc

Function type: xmlSchematronValidityErrorFunc
 void	xmlSchematronValidityErrorFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)
-

ctx:
msg:
...:

+

Signature of an error callback from a Schematron validation

ctx:the validation context
msg:the message
...:extra arguments

Function type: xmlSchematronValidityWarningFunc

Function type: xmlSchematronValidityWarningFunc
 void	xmlSchematronValidityWarningFunc	(void * ctx, 
						 const char * msg, 
						 ... ...)
-

ctx:
msg:
...:

+

Signature of a warning callback from a Schematron validation

ctx:the validation context
msg:the message
...:extra arguments

Daniel Veillard

diff --git a/doc/html/libxml-xmlreader.html b/doc/html/libxml-xmlreader.html index b4c1cbcc..f02707a4 100644 --- a/doc/html/libxml-xmlreader.html +++ b/doc/html/libxml-xmlreader.html @@ -217,7 +217,7 @@ The content of this structure is not made public by the API.

The depth of the node in the tree.

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

Function type: xmlTextReaderErrorFunc

Function type: xmlTextReaderErrorFunc
 void	xmlTextReaderErrorFunc		(void * arg, 
					 const char * msg, 
					 xmlParserSeverities severity, 
					 xmlTextReaderLocatorPtr locator)
-

arg:
msg:
severity:
locator:

+

Signature of an error callback from a reader parser

arg:the user argument
msg:the message
severity:the severity of the error
locator:a locator indicating where the error occured

Function: xmlTextReaderExpand

xmlNodePtr	xmlTextReaderExpand	(xmlTextReaderPtr reader)

Reads the contents of the current node and the full subtree. It then makes the subtree available until the next xmlTextReaderRead() call

reader:the xmlTextReaderPtr used
Returns:a node pointer valid until the next xmlTextReaderRead() call or NULL in case of error.

Function: xmlTextReaderGetAttribute

xmlChar *	xmlTextReaderGetAttribute	(xmlTextReaderPtr reader, 
						 const xmlChar * name)

diff --git a/doc/html/libxml-xmlregexp.html b/doc/html/libxml-xmlregexp.html
index 642e930b..15de2f4a 100644
--- a/doc/html/libxml-xmlregexp.html
+++ b/doc/html/libxml-xmlregexp.html
@@ -117,7 +117,7 @@ The content of this structure is not made public by the API.

Check whether @exp accepts all the languages accexpted by @sub the input being a subexpression.

ctxt:the expressions context
exp:the englobing expression
sub:the subexpression
Returns:1 if true 0 if false and -1 in case of failure.

Function type: xmlRegExecCallbacks

Function type: xmlRegExecCallbacks
 void	xmlRegExecCallbacks		(xmlRegExecCtxtPtr exec, 
					 const xmlChar * token, 
					 void * transdata, 
					 void * inputdata)
-

exec:
token:
transdata:
inputdata:

+

Callback function when doing a transition in the automata

exec:the regular expression context
token:the current token string
transdata:transition data
inputdata:input data

Function: xmlRegExecErrInfo

int	xmlRegExecErrInfo		(xmlRegExecCtxtPtr exec, 
					 const xmlChar ** string, 
					 int * nbval, 
					 int * nbneg, 
					 xmlChar ** values, 
					 int * terminal)

Extract error informations from the regexp execution, the parameter @string will be updated with the value pushed and not accepted, the parameter @values must point to an array of @nbval string pointers on return nbval will contain the number of possible strings in that state and the @values array will be updated with them. The string values

exec:a regexp execution context generating an error
string:return value for the error string
nbval:pointer to the number of accepted values IN/OUT
nbneg:return number of negative transitions
values:pointer to the array of acceptable values
terminal:return value if this was a terminal state
Returns:will be freed with the @exec context and don't need to be deallocated. Returns: 0 in case of success or -1 in case of error.

Function: xmlRegExecNextValues

int	xmlRegExecNextValues		(xmlRegExecCtxtPtr exec, 
					 int * nbval, 
					 int * nbneg, 
					 xmlChar ** values, 
					 int * terminal)

diff --git a/doc/html/libxml-xmlschemas.html b/doc/html/libxml-xmlschemas.html
index 1943f205..aa4b76fd 100644
--- a/doc/html/libxml-xmlschemas.html
+++ b/doc/html/libxml-xmlschemas.html
@@ -44,7 +44,7 @@ The content of this structure is not made public by the API.
 
void	xmlSchemaSetValidStructuredErrors	(xmlSchemaValidCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx)

 
int	xmlSchemaValidCtxtGetOptions	(xmlSchemaValidCtxtPtr ctxt)

 
xmlParserCtxtPtr	xmlSchemaValidCtxtGetParserCtxt	(xmlSchemaValidCtxtPtr ctxt)

-
int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr instance)

+
int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr doc)

 
int	xmlSchemaValidateFile		(xmlSchemaValidCtxtPtr ctxt, 
					 const char * filename, 
					 int options)

 
int	xmlSchemaValidateOneElement	(xmlSchemaValidCtxtPtr ctxt, 
					 xmlNodePtr elem)

 
int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 xmlSAXHandlerPtr sax, 
					 void * user_data)

@@ -121,53 +121,53 @@ The content of this structure is not made public by the API.
 
schema:a schema structure
Function: xmlSchemaFreeParserCtxt
void	xmlSchemaFreeParserCtxt		(xmlSchemaParserCtxtPtr ctxt)

 
Free the resources associated to the schema parser context

 
ctxt:the schema parser context
Function: xmlSchemaFreeValidCtxt
void	xmlSchemaFreeValidCtxt		(xmlSchemaValidCtxtPtr ctxt)

-

-
ctxt:
Function: xmlSchemaGetParserErrors
int	xmlSchemaGetParserErrors	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc * err, 
					 xmlSchemaValidityWarningFunc * warn, 
					 void ** ctx)

+
Free the resources associated to the schema validation context

+
ctxt:the schema validation context
Function: xmlSchemaGetParserErrors
int	xmlSchemaGetParserErrors	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc * err, 
					 xmlSchemaValidityWarningFunc * warn, 
					 void ** ctx)

 
Get the callback information used to handle errors for a parser context

 
ctxt:a XMl-Schema parser context
err:the error callback result
warn:the warning callback result
ctx:contextual data for the callbacks result
Returns:-1 in case of failure, 0 otherwise
Function: xmlSchemaGetValidErrors
int	xmlSchemaGetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc * err, 
					 xmlSchemaValidityWarningFunc * warn, 
					 void ** ctx)

-

-
ctxt:
err:
warn:
ctx:
Returns:
Function: xmlSchemaIsValid
int	xmlSchemaIsValid		(xmlSchemaValidCtxtPtr ctxt)

-

-
ctxt:
Returns:
Function: xmlSchemaNewDocParserCtxt
xmlSchemaParserCtxtPtr	xmlSchemaNewDocParserCtxt	(xmlDocPtr doc)

+
Get the error and warning callback informations

+
ctxt:a XML-Schema validation context
err:the error function result
warn:the warning function result
ctx:the functions context result
Returns:-1 in case of error and 0 otherwise
Function: xmlSchemaIsValid
int	xmlSchemaIsValid		(xmlSchemaValidCtxtPtr ctxt)

+
Check if any error was detected during validation.

+
ctxt:the schema validation context
Returns:1 if valid so far, 0 if errors were detected, and -1 in case of internal error.
Function: xmlSchemaNewDocParserCtxt
xmlSchemaParserCtxtPtr	xmlSchemaNewDocParserCtxt	(xmlDocPtr doc)

 
Create an XML Schemas parse context for that document. NB. The document may be modified during the parsing process.

 
doc:a preparsed document tree
Returns:the parser context or NULL in case of error
Function: xmlSchemaNewMemParserCtxt
xmlSchemaParserCtxtPtr	xmlSchemaNewMemParserCtxt	(const char * buffer, 
							 int size)

 
Create an XML Schemas parse context for that memory buffer expected to contain an XML Schemas file.

 
buffer:a pointer to a char array containing the schemas
size:the size of the array
Returns:the parser context or NULL in case of error
Function: xmlSchemaNewParserCtxt
xmlSchemaParserCtxtPtr	xmlSchemaNewParserCtxt	(const char * URL)

 
Create an XML Schemas parse context for that file/resource expected to contain an XML Schemas file.

 
URL:the location of the schema
Returns:the parser context or NULL in case of error
Function: xmlSchemaNewValidCtxt
xmlSchemaValidCtxtPtr	xmlSchemaNewValidCtxt	(xmlSchemaPtr schema)

-

-
schema:
Returns:
Function: xmlSchemaParse
xmlSchemaPtr	xmlSchemaParse		(xmlSchemaParserCtxtPtr ctxt)

+
Create an XML Schemas validation context based on the given schema.

+
schema:a precompiled XML Schemas
Returns:the validation context or NULL in case of error
Function: xmlSchemaParse
xmlSchemaPtr	xmlSchemaParse		(xmlSchemaParserCtxtPtr ctxt)

 
parse a schema definition resource and build an internal XML Shema struture which can be used to validate instances.

 
ctxt:a schema validation context
Returns:the internal XML Schema structure built from the resource or NULL in case of error
Function: xmlSchemaSAXPlug
xmlSchemaSAXPlugPtr	xmlSchemaSAXPlug	(xmlSchemaValidCtxtPtr ctxt, 
						 xmlSAXHandlerPtr * sax, 
						 void ** user_data)

-

-
ctxt:
sax:
user_data:
Returns:
Function: xmlSchemaSAXUnplug
int	xmlSchemaSAXUnplug		(xmlSchemaSAXPlugPtr plug)

-

-
plug:
Returns:
Function: xmlSchemaSetParserErrors
void	xmlSchemaSetParserErrors	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx)

+
Plug a SAX based validation layer in a SAX parsing event flow. The original @saxptr and @dataptr data are replaced by new pointers but the calls to the original will be maintained.

+
ctxt:a schema validation context
sax:a pointer to the original xmlSAXHandlerPtr
user_data:a pointer to the original SAX user data pointer
Returns:a pointer to a data structure needed to unplug the validation layer or NULL in case of errors.
Function: xmlSchemaSAXUnplug
int	xmlSchemaSAXUnplug		(xmlSchemaSAXPlugPtr plug)

+
Unplug a SAX based validation layer in a SAX parsing event flow. The original pointers used in the call are restored.

+
plug:a data structure returned by xmlSchemaSAXPlug
Returns:0 in case of success and -1 in case of failure.
Function: xmlSchemaSetParserErrors
void	xmlSchemaSetParserErrors	(xmlSchemaParserCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx)

 
Set the callback functions used to handle errors for a validation context

 
ctxt:a schema validation context
err:the error callback
warn:the warning callback
ctx:contextual data for the callbacks
Function: xmlSchemaSetParserStructuredErrors
void	xmlSchemaSetParserStructuredErrors	(xmlSchemaParserCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx)

 
Set the structured error callback

 
ctxt:a schema parser context
serror:the structured error function
ctx:the functions context
Function: xmlSchemaSetValidErrors
void	xmlSchemaSetValidErrors		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlSchemaValidityErrorFunc err, 
					 xmlSchemaValidityWarningFunc warn, 
					 void * ctx)

-

-
ctxt:
err:
warn:
ctx:
Function: xmlSchemaSetValidOptions
int	xmlSchemaSetValidOptions	(xmlSchemaValidCtxtPtr ctxt, 
					 int options)

-

-
ctxt:
options:
Returns:
Function: xmlSchemaSetValidStructuredErrors
void	xmlSchemaSetValidStructuredErrors	(xmlSchemaValidCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx)

-

-
ctxt:
serror:
ctx:
Function: xmlSchemaValidCtxtGetOptions
int	xmlSchemaValidCtxtGetOptions	(xmlSchemaValidCtxtPtr ctxt)

-

-
ctxt:
Returns:
Function: xmlSchemaValidCtxtGetParserCtxt
xmlParserCtxtPtr	xmlSchemaValidCtxtGetParserCtxt	(xmlSchemaValidCtxtPtr ctxt)

-

-
ctxt:
Returns:
Function: xmlSchemaValidateDoc
int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr instance)

-

-
ctxt:
instance:
Returns:
Function: xmlSchemaValidateFile
int	xmlSchemaValidateFile		(xmlSchemaValidCtxtPtr ctxt, 
					 const char * filename, 
					 int options)

-

-
ctxt:
filename:
options:
Returns:
Function: xmlSchemaValidateOneElement
int	xmlSchemaValidateOneElement	(xmlSchemaValidCtxtPtr ctxt, 
					 xmlNodePtr elem)

-

-
ctxt:
elem:
Returns:
Function: xmlSchemaValidateStream
int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 xmlSAXHandlerPtr sax, 
					 void * user_data)

-

-
ctxt:
input:
enc:
sax:
user_data:
Returns:
Function type: xmlSchemaValidityErrorFunc
Function type: xmlSchemaValidityErrorFunc
+
Set the error and warning callback informations

+
ctxt:a schema validation context
err:the error function
warn:the warning function
ctx:the functions context
Function: xmlSchemaSetValidOptions
int	xmlSchemaSetValidOptions	(xmlSchemaValidCtxtPtr ctxt, 
					 int options)

+
Sets the options to be used during the validation.

+
ctxt:a schema validation context
options:a combination of xmlSchemaValidOption
Returns:0 in case of success, -1 in case of an API error.
Function: xmlSchemaSetValidStructuredErrors
void	xmlSchemaSetValidStructuredErrors	(xmlSchemaValidCtxtPtr ctxt, 
						 xmlStructuredErrorFunc serror, 
						 void * ctx)

+
Set the structured error callback

+
ctxt:a schema validation context
serror:the structured error function
ctx:the functions context
Function: xmlSchemaValidCtxtGetOptions
int	xmlSchemaValidCtxtGetOptions	(xmlSchemaValidCtxtPtr ctxt)

+
Get the validation context options.

+
ctxt:a schema validation context
Returns:the option combination or -1 on error.
Function: xmlSchemaValidCtxtGetParserCtxt
xmlParserCtxtPtr	xmlSchemaValidCtxtGetParserCtxt	(xmlSchemaValidCtxtPtr ctxt)

+
allow access to the parser context of the schema validation context

+
ctxt:a schema validation context
Returns:the parser context of the schema validation context or NULL in case of error.
Function: xmlSchemaValidateDoc
int	xmlSchemaValidateDoc		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlDocPtr doc)

+
Validate a document tree in memory.

+
ctxt:a schema validation context
doc:a parsed document tree
Returns:0 if the document is schemas valid, a positive error code number otherwise and -1 in case of internal or API error.
Function: xmlSchemaValidateFile
int	xmlSchemaValidateFile		(xmlSchemaValidCtxtPtr ctxt, 
					 const char * filename, 
					 int options)

+
Do a schemas validation of the given resource, it will use the SAX streamable validation internally.

+
ctxt:a schema validation context
filename:the URI of the instance
options:a future set of options, currently unused
Returns:0 if the document is valid, a positive error code number otherwise and -1 in case of an internal or API error.
Function: xmlSchemaValidateOneElement
int	xmlSchemaValidateOneElement	(xmlSchemaValidCtxtPtr ctxt, 
					 xmlNodePtr elem)

+
Validate a branch of a tree, starting with the given @elem.

+
ctxt:a schema validation context
elem:an element node
Returns:0 if the element and its subtree is valid, a positive error code number otherwise and -1 in case of an internal or API error.
Function: xmlSchemaValidateStream
int	xmlSchemaValidateStream		(xmlSchemaValidCtxtPtr ctxt, 
					 xmlParserInputBufferPtr input, 
					 xmlCharEncoding enc, 
					 xmlSAXHandlerPtr sax, 
					 void * user_data)

+
Validate an input based on a flow of SAX event from the parser and forward the events to the @sax handler with the provided @user_data the user provided @sax handler must be a SAX2 one.

+
ctxt:a schema validation context
input:the input to use for reading the data
enc:an optional encoding information
sax:a SAX handler for the resulting events
user_data:the context to provide to the SAX handler.
Returns:0 if the document is schemas valid, a positive error code number otherwise and -1 in case of internal or API error.
Function type: xmlSchemaValidityErrorFunc
Function type: xmlSchemaValidityErrorFunc
 void	xmlSchemaValidityErrorFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)
-
ctx:
msg:
...:


+

Signature of an error callback from an XSD validation

ctx:the validation context
msg:the message
...:extra arguments

Function type: xmlSchemaValidityWarningFunc

Function type: xmlSchemaValidityWarningFunc
 void	xmlSchemaValidityWarningFunc	(void * ctx, 
					 const char * msg, 
					 ... ...)
-

ctx:
msg:
...:

+

Signature of a warning callback from an XSD validation

ctx:the validation context
msg:the message
...:extra arguments

Daniel Veillard

diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h index f45d377e..69644825 100644 --- a/include/libxml/xmlreader.h +++ b/include/libxml/xmlreader.h @@ -18,12 +18,25 @@ #include #endif -#ifdef LIBXML_READER_ENABLED - #ifdef __cplusplus extern "C" { #endif +/** + * xmlParserSeverities: + * + * How severe an error callback is when the per-reader error callback API + * is used. + */ +typedef enum { + XML_PARSER_SEVERITY_VALIDITY_WARNING = 1, + XML_PARSER_SEVERITY_VALIDITY_ERROR = 2, + XML_PARSER_SEVERITY_WARNING = 3, + XML_PARSER_SEVERITY_ERROR = 4 +} xmlParserSeverities; + +#ifdef LIBXML_READER_ENABLED + /** * xmlTextReaderMode: * @@ -52,19 +65,6 @@ typedef enum { XML_PARSER_SUBST_ENTITIES = 4 } xmlParserProperties; -/** - * xmlParserSeverities: - * - * How severe an error callback is when the per-reader error callback API - * is used. - */ -typedef enum { - XML_PARSER_SEVERITY_VALIDITY_WARNING = 1, - XML_PARSER_SEVERITY_VALIDITY_ERROR = 2, - XML_PARSER_SEVERITY_WARNING = 3, - XML_PARSER_SEVERITY_ERROR = 4 -} xmlParserSeverities; - /** * xmlReaderTypes: * @@ -414,11 +414,11 @@ XMLPUBFUN void XMLCALL xmlTextReaderErrorFunc *f, void **arg); +#endif /* LIBXML_READER_ENABLED */ + #ifdef __cplusplus } #endif -#endif /* LIBXML_READER_ENABLED */ - #endif /* __XML_XMLREADER_H__ */ diff --git a/python/libxml.c b/python/libxml.c index 747e44cf..95b3cb92 100644 --- a/python/libxml.c +++ b/python/libxml.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "libxml_wrap.h" #include "libxml2-py.h" @@ -1890,6 +1891,7 @@ libxml_xmlFreeValidCtxt(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return(Py_None); } +#ifdef LIBXML_READER_ENABLED /************************************************************************ * * * Per xmlTextReader error handler * @@ -2059,6 +2061,7 @@ libxml_xmlFreeTextReader(ATTRIBUTE_UNUSED PyObject *self, PyObject *args) { Py_INCREF(Py_None); return(Py_None); } +#endif /************************************************************************ * * @@ -3750,9 +3753,11 @@ static PyMethodDef libxmlMethods[] = { {(char *)"xmlParserCtxtSetErrorHandler", libxml_xmlParserCtxtSetErrorHandler, METH_VARARGS, NULL }, {(char *)"xmlParserCtxtGetErrorHandler", libxml_xmlParserCtxtGetErrorHandler, METH_VARARGS, NULL }, {(char *)"xmlFreeParserCtxt", libxml_xmlFreeParserCtxt, METH_VARARGS, NULL }, +#ifdef LIBXML_READER_ENABLED {(char *)"xmlTextReaderSetErrorHandler", libxml_xmlTextReaderSetErrorHandler, METH_VARARGS, NULL }, {(char *)"xmlTextReaderGetErrorHandler", libxml_xmlTextReaderGetErrorHandler, METH_VARARGS, NULL }, {(char *)"xmlFreeTextReader", libxml_xmlFreeTextReader, METH_VARARGS, NULL }, +#endif {(char *)"addLocalCatalog", libxml_addLocalCatalog, METH_VARARGS, NULL }, #ifdef LIBXML_SCHEMAS_ENABLED {(char *)"xmlRelaxNGSetValidErrors", libxml_xmlRelaxNGSetValidErrors, METH_VARARGS, NULL}, diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h index 2758e993..eaa5e969 100644 --- a/python/libxml_wrap.h +++ b/python/libxml_wrap.h @@ -99,6 +99,7 @@ typedef struct { } PyxmlReg_Object; #endif /* LIBXML_REGEXP_ENABLED */ +#ifdef LIBXML_READER_ENABLED #define PyxmlTextReader_Get(v) (((v) == Py_None) ? NULL : \ (((PyxmlTextReader_Object *)(v))->obj)) @@ -114,6 +115,7 @@ typedef struct { PyObject_HEAD xmlTextReaderLocatorPtr obj; } PyxmlTextReaderLocator_Object; +#endif #define PyURI_Get(v) (((v) == Py_None) ? NULL : \ (((PyURI_Object *)(v))->obj)) @@ -229,8 +231,10 @@ PyObject * libxml_xmlParserInputBufferPtrWrap(xmlParserInputBufferPtr buffer); #ifdef LIBXML_REGEXP_ENABLED PyObject * libxml_xmlRegexpPtrWrap(xmlRegexpPtr regexp); #endif /* LIBXML_REGEXP_ENABLED */ +#ifdef LIBXML_READER_ENABLED PyObject * libxml_xmlTextReaderPtrWrap(xmlTextReaderPtr reader); PyObject * libxml_xmlTextReaderLocatorPtrWrap(xmlTextReaderLocatorPtr locator); +#endif xmlXPathObjectPtr libxml_xmlXPathObjectPtrConvert(PyObject * obj); #ifdef LIBXML_SCHEMAS_ENABLED diff --git a/python/types.c b/python/types.c index 80e43041..54b50de2 100644 --- a/python/types.c +++ b/python/types.c @@ -720,6 +720,7 @@ libxml_xmlRegexpPtrWrap(xmlRegexpPtr regexp) } #endif /* LIBXML_REGEXP_ENABLED */ +#ifdef LIBXML_READER_ENABLED PyObject * libxml_xmlTextReaderPtrWrap(xmlTextReaderPtr reader) { @@ -755,6 +756,7 @@ libxml_xmlTextReaderLocatorPtrWrap(xmlTextReaderLocatorPtr locator) (char *) "xmlTextReaderLocatorPtr", NULL); return (ret); } +#endif /* LIBXML_READER_ENABLED */ #ifdef LIBXML_SCHEMAS_ENABLED PyObject * diff --git a/runtest.c b/runtest.c index b694d565..85fc2364 100644 --- a/runtest.c +++ b/runtest.c @@ -4183,19 +4183,23 @@ testDesc testDescriptions[] = { errParseTest, "./test/XInclude/docs/*", "result/XInclude/", "", NULL, /* Ignore errors at this point ".err", */ XML_PARSE_XINCLUDE }, +#ifdef LIBXML_READER_ENABLED { "XInclude xmlReader regression tests", streamParseTest, "./test/XInclude/docs/*", "result/XInclude/", ".rdr", /* Ignore errors at this point ".err", */ NULL, XML_PARSE_XINCLUDE }, +#endif { "XInclude regression tests stripping include nodes" , errParseTest, "./test/XInclude/docs/*", "result/XInclude/", "", NULL, /* Ignore errors at this point ".err", */ XML_PARSE_XINCLUDE | XML_PARSE_NOXINCNODE }, +#ifdef LIBXML_READER_ENABLED { "XInclude xmlReader regression tests stripping include nodes", streamParseTest, "./test/XInclude/docs/*", "result/XInclude/", ".rdr", /* Ignore errors at this point ".err", */ NULL, XML_PARSE_XINCLUDE | XML_PARSE_NOXINCNODE }, #endif +#endif #ifdef LIBXML_XPATH_ENABLED #ifdef LIBXML_DEBUG_ENABLED { "XPath expressions regression tests" , diff --git a/testapi.c b/testapi.c index 34705c99..44a3cd02 100644 --- a/testapi.c +++ b/testapi.c @@ -720,6 +720,23 @@ static void des_xmlExpNodePtr(int no ATTRIBUTE_UNUSED, xmlExpNodePtr val ATTRIBU #endif +#if defined(LIBXML_SCHEMAS_ENABLED) +#define gen_nb_xmlSchemaPtr 1 +static xmlSchemaPtr gen_xmlSchemaPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { + return(NULL); +} +static void des_xmlSchemaPtr(int no ATTRIBUTE_UNUSED, xmlSchemaPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { +} + +#define gen_nb_xmlSchemaValidCtxtPtr 1 +static xmlSchemaValidCtxtPtr gen_xmlSchemaValidCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { + return(NULL); +} +static void des_xmlSchemaValidCtxtPtr(int no ATTRIBUTE_UNUSED, xmlSchemaValidCtxtPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { +} + +#endif /* LIBXML_SCHEMAS_ENABLED */ + #define gen_nb_xmlHashDeallocator 2 static void test_xmlHashDeallocator(void *payload ATTRIBUTE_UNUSED, xmlChar *name ATTRIBUTE_UNUSED) { @@ -32068,16 +32085,6 @@ test_xmlTextReaderSchemaValidate(void) { return(test_ret); } -#ifdef LIBXML_READER_ENABLED - -#define gen_nb_xmlSchemaValidCtxtPtr 1 -static xmlSchemaValidCtxtPtr gen_xmlSchemaValidCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { - return(NULL); -} -static void des_xmlSchemaValidCtxtPtr(int no ATTRIBUTE_UNUSED, xmlSchemaValidCtxtPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { -} -#endif - static int test_xmlTextReaderSchemaValidateCtxt(void) { @@ -32184,16 +32191,6 @@ test_xmlTextReaderSetParserProp(void) { return(test_ret); } -#ifdef LIBXML_READER_ENABLED - -#define gen_nb_xmlSchemaPtr 1 -static xmlSchemaPtr gen_xmlSchemaPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { - return(NULL); -} -static void des_xmlSchemaPtr(int no ATTRIBUTE_UNUSED, xmlSchemaPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { -} -#endif - static int test_xmlTextReaderSetSchema(void) { @@ -33725,13 +33722,13 @@ test_xmlSchemaGetValidErrors(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; int ret_val; - xmlSchemaValidCtxtPtr ctxt; /* */ + xmlSchemaValidCtxtPtr ctxt; /* a XML-Schema validation context */ int n_ctxt; - xmlSchemaValidityErrorFunc * err; /* */ + xmlSchemaValidityErrorFunc * err; /* the error function result */ int n_err; - xmlSchemaValidityWarningFunc * warn; /* */ + xmlSchemaValidityWarningFunc * warn; /* the warning function result */ int n_warn; - void ** ctx; /* */ + void ** ctx; /* the functions context result */ int n_ctx; for (n_ctxt = 0;n_ctxt < gen_nb_xmlSchemaValidCtxtPtr;n_ctxt++) { @@ -33780,7 +33777,7 @@ test_xmlSchemaIsValid(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; int ret_val; - xmlSchemaValidCtxtPtr ctxt; /* */ + xmlSchemaValidCtxtPtr ctxt; /* the schema validation context */ int n_ctxt; for (n_ctxt = 0;n_ctxt < gen_nb_xmlSchemaValidCtxtPtr;n_ctxt++) { @@ -33973,7 +33970,7 @@ test_xmlSchemaSAXUnplug(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; int ret_val; - xmlSchemaSAXPlugPtr plug; /* */ + xmlSchemaSAXPlugPtr plug; /* a data structure returned by xmlSchemaSAXPlug */ int n_plug; for (n_plug = 0;n_plug < gen_nb_xmlSchemaSAXPlugPtr;n_plug++) { @@ -34037,9 +34034,9 @@ test_xmlSchemaSetValidOptions(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; int ret_val; - xmlSchemaValidCtxtPtr ctxt; /* */ + xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */ int n_ctxt; - int options; /* */ + int options; /* a combination of xmlSchemaValidOption */ int n_options; for (n_ctxt = 0;n_ctxt < gen_nb_xmlSchemaValidCtxtPtr;n_ctxt++) { @@ -34088,7 +34085,7 @@ test_xmlSchemaValidCtxtGetOptions(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; int ret_val; - xmlSchemaValidCtxtPtr ctxt; /* */ + xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */ int n_ctxt; for (n_ctxt = 0;n_ctxt < gen_nb_xmlSchemaValidCtxtPtr;n_ctxt++) { @@ -34122,7 +34119,7 @@ test_xmlSchemaValidCtxtGetParserCtxt(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; xmlParserCtxtPtr ret_val; - xmlSchemaValidCtxtPtr ctxt; /* */ + xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */ int n_ctxt; for (n_ctxt = 0;n_ctxt < gen_nb_xmlSchemaValidCtxtPtr;n_ctxt++) { @@ -34156,29 +34153,29 @@ test_xmlSchemaValidateDoc(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; int ret_val; - xmlSchemaValidCtxtPtr ctxt; /* */ + xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */ int n_ctxt; - xmlDocPtr instance; /* */ - int n_instance; + xmlDocPtr doc; /* a parsed document tree */ + int n_doc; for (n_ctxt = 0;n_ctxt < gen_nb_xmlSchemaValidCtxtPtr;n_ctxt++) { - for (n_instance = 0;n_instance < gen_nb_xmlDocPtr;n_instance++) { + for (n_doc = 0;n_doc < gen_nb_xmlDocPtr;n_doc++) { mem_base = xmlMemBlocks(); ctxt = gen_xmlSchemaValidCtxtPtr(n_ctxt, 0); - instance = gen_xmlDocPtr(n_instance, 1); + doc = gen_xmlDocPtr(n_doc, 1); - ret_val = xmlSchemaValidateDoc(ctxt, instance); + ret_val = xmlSchemaValidateDoc(ctxt, doc); desret_int(ret_val); call_tests++; des_xmlSchemaValidCtxtPtr(n_ctxt, ctxt, 0); - des_xmlDocPtr(n_instance, instance, 1); + des_xmlDocPtr(n_doc, doc, 1); xmlResetLastError(); if (mem_base != xmlMemBlocks()) { printf("Leak of %d blocks found in xmlSchemaValidateDoc", xmlMemBlocks() - mem_base); test_ret++; printf(" %d", n_ctxt); - printf(" %d", n_instance); + printf(" %d", n_doc); printf("\n"); } } @@ -34197,11 +34194,11 @@ test_xmlSchemaValidateFile(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; int ret_val; - xmlSchemaValidCtxtPtr ctxt; /* */ + xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */ int n_ctxt; - const char * filename; /* */ + const char * filename; /* the URI of the instance */ int n_filename; - int options; /* */ + int options; /* a future set of options, currently unused */ int n_options; for (n_ctxt = 0;n_ctxt < gen_nb_xmlSchemaValidCtxtPtr;n_ctxt++) { @@ -34245,9 +34242,9 @@ test_xmlSchemaValidateOneElement(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; int ret_val; - xmlSchemaValidCtxtPtr ctxt; /* */ + xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */ int n_ctxt; - xmlNodePtr elem; /* */ + xmlNodePtr elem; /* an element node */ int n_elem; for (n_ctxt = 0;n_ctxt < gen_nb_xmlSchemaValidCtxtPtr;n_ctxt++) { @@ -34286,15 +34283,15 @@ test_xmlSchemaValidateStream(void) { #if defined(LIBXML_SCHEMAS_ENABLED) int mem_base; int ret_val; - xmlSchemaValidCtxtPtr ctxt; /* */ + xmlSchemaValidCtxtPtr ctxt; /* a schema validation context */ int n_ctxt; - xmlParserInputBufferPtr input; /* */ + xmlParserInputBufferPtr input; /* the input to use for reading the data */ int n_input; - xmlCharEncoding enc; /* */ + xmlCharEncoding enc; /* an optional encoding information */ int n_enc; - xmlSAXHandlerPtr sax; /* */ + xmlSAXHandlerPtr sax; /* a SAX handler for the resulting events */ int n_sax; - void * user_data; /* */ + void * user_data; /* the context to provide to the SAX handler. */ int n_user_data; for (n_ctxt = 0;n_ctxt < gen_nb_xmlSchemaValidCtxtPtr;n_ctxt++) { diff --git a/xmlschemas.c b/xmlschemas.c index a0d0d727..f9ced40e 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -21731,7 +21731,7 @@ xmlSchemaLookupNamespace(xmlSchemaValidCtxtPtr vctxt, } } return (NULL); -#ifdef LIBXML_WRITER_ENABLED +#ifdef LIBXML_READER_ENABLED } else if (vctxt->reader != NULL) { xmlChar *nsName;