Commit 647e39ac authored by Daniel Veillard's avatar Daniel Veillard
Browse files

moved some definitions to globals.h to avoid some troubles pointed out by

* include/libxml/globals.h include/libxml/xmlIO.h
  doc/libxml2-api.xml doc/libxml2-refs.xml: moved some definitions
  to globals.h to avoid some troubles pointed out by Rob Richards
Daniel
parent b7cbbaee
Tue Jun 29 14:52:18 CEST 2004 Daniel Veillard <daniel@veillard.com>
* include/libxml/globals.h include/libxml/xmlIO.h
doc/libxml2-api.xml doc/libxml2-refs.xml: moved some definitions
to globals.h to avoid some troubles pointed out by Rob Richards
Mon Jun 28 11:25:31 CEST 2004 Daniel Veillard <daniel@veillard.com>
 
* libxml.m4: applied changes suggested by Mike Hommey, remove
......
......@@ -494,15 +494,18 @@
<exports symbol='xmlPedanticParserDefaultValue' type='variable'/>
<exports symbol='oldXMLWDcompatibility' type='variable'/>
<exports symbol='xmlThrDefSetStructuredErrorFunc' type='function'/>
<exports symbol='xmlCleanupGlobals' type='function'/>
<exports symbol='xmlThrDefParserInputBufferCreateFilenameDefault' type='function'/>
<exports symbol='xmlThrDefRegisterNodeDefault' type='function'/>
<exports symbol='xmlDeregisterNodeDefault' type='function'/>
<exports symbol='xmlThrDefDeregisterNodeDefault' type='function'/>
<exports symbol='xmlThrDefPedanticParserDefaultValue' type='function'/>
<exports symbol='xmlInitializeGlobalState' type='function'/>
<exports symbol='xmlThrDefBufferAllocScheme' type='function'/>
<exports symbol='xmlThrDefSetGenericErrorFunc' type='function'/>
<exports symbol='xmlParserInputBufferCreateFilenameDefault' type='function'/>
<exports symbol='xmlThrDefDoValidityCheckingDefaultValue' type='function'/>
<exports symbol='xmlThrDefPedanticParserDefaultValue' type='function'/>
<exports symbol='xmlCleanupGlobals' type='function'/>
<exports symbol='xmlRegisterNodeDefault' type='function'/>
<exports symbol='xmlParserInputBufferCreateFilenameFunc' type='function'/>
<exports symbol='xmlThrDefGetWarningsDefaultValue' type='function'/>
<exports symbol='xmlThrDefOutputBufferCreateFilenameDefault' type='function'/>
<exports symbol='xmlThrDefSubstituteEntitiesDefaultValue' type='function'/>
......@@ -510,8 +513,8 @@
<exports symbol='xmlThrDefSaveNoEmptyTags' type='function'/>
<exports symbol='xmlThrDefIndentTreeOutput' type='function'/>
<exports symbol='xmlThrDefDefaultBufferSize' type='function'/>
<exports symbol='xmlThrDefDeregisterNodeDefault' type='function'/>
<exports symbol='xmlDeregisterNodeDefault' type='function'/>
<exports symbol='xmlOutputBufferCreateFilenameFunc' type='function'/>
<exports symbol='xmlOutputBufferCreateFilenameDefault' type='function'/>
<exports symbol='xmlInitGlobals' type='function'/>
<exports symbol='xmlThrDefLoadExtDtdDefaultValue' type='function'/>
<exports symbol='xmlThrDefLineNumbersDefaultValue' type='function'/>
......@@ -519,6 +522,7 @@
<exports symbol='xmlDeregisterNodeFunc' type='function'/>
<exports symbol='xmlThrDefParserDebugEntities' type='function'/>
<exports symbol='xmlThrDefTreeIndentString' type='function'/>
<exports symbol='xmlThrDefRegisterNodeDefault' type='function'/>
</file>
<file name='hash'>
<summary>chained hash tables</summary>
......@@ -1609,7 +1613,6 @@
<exports symbol='xmlInputMatchCallback' type='function'/>
<exports symbol='xmlRegisterDefaultOutputCallbacks' type='function'/>
<exports symbol='xmlFileClose' type='function'/>
<exports symbol='xmlAllocParserInputBuffer' type='function'/>
<exports symbol='xmlOutputMatchCallback' type='function'/>
<exports symbol='xmlParserInputBufferPush' type='function'/>
<exports symbol='xmlIOFTPRead' type='function'/>
......@@ -1617,10 +1620,8 @@
<exports symbol='xmlIOFTPOpen' type='function'/>
<exports symbol='xmlIOFTPClose' type='function'/>
<exports symbol='xmlFileOpen' type='function'/>
<exports symbol='xmlParserInputBufferCreateFilenameFunc' type='function'/>
<exports symbol='xmlOutputBufferCreateFile' type='function'/>
<exports symbol='xmlCheckFilename' type='function'/>
<exports symbol='xmlOutputBufferCreateFilenameDefault' type='function'/>
<exports symbol='xmlOutputOpenCallback' type='function'/>
<exports symbol='xmlParserInputBufferCreateFilename' type='function'/>
<exports symbol='xmlOutputBufferClose' type='function'/>
......@@ -1646,7 +1647,6 @@
<exports symbol='xmlNormalizeWindowsPath' type='function'/>
<exports symbol='xmlInputReadCallback' type='function'/>
<exports symbol='xmlParserInputBufferCreateStatic' type='function'/>
<exports symbol='xmlParserInputBufferCreateFilenameDefault' type='function'/>
<exports symbol='xmlIOHTTPClose' type='function'/>
<exports symbol='xmlOutputBufferWriteEscape' type='function'/>
<exports symbol='xmlOutputBufferCreateFilename' type='function'/>
......@@ -1663,7 +1663,7 @@
<exports symbol='xmlCleanupInputCallbacks' type='function'/>
<exports symbol='xmlInputCloseCallback' type='function'/>
<exports symbol='xmlIOHTTPOpenW' type='function'/>
<exports symbol='xmlOutputBufferCreateFilenameFunc' type='function'/>
<exports symbol='xmlAllocParserInputBuffer' type='function'/>
</file>
<file name='xmlautomata'>
<summary>API to build regexp automata</summary>
......@@ -9218,9 +9218,9 @@ actually an xmlCharEncoding'/>
<arg name='fp' type='FILE *' info='a FILE descriptor used as the output file, if NULL, the result is written to the file .memorylist'/>
</function>
<function name='xmlMemFree' file='xmlmemory'>
<info>a free() equivalent, with error checking.</info>
<info></info>
<return type='void'/>
<arg name='ptr' type='void *' info='the memory block pointer'/>
<arg name='ptr' type='void *' info=''/>
</function>
<function name='xmlMemGet' file='xmlmemory'>
<info>Provides the memory access functions set currently in use</info>
......@@ -9231,15 +9231,15 @@ actually an xmlCharEncoding'/>
<arg name='strdupFunc' type='xmlStrdupFunc *' info='place to save the strdup() function in use'/>
</function>
<function name='xmlMemMalloc' file='xmlmemory'>
<info>a malloc() equivalent, with logging of the allocation info.</info>
<return type='void *' info='a pointer to the allocated area or NULL in case of lack of memory.'/>
<arg name='size' type='size_t' info='an int specifying the size in byte to allocate.'/>
<info></info>
<return type='void *' info=''/>
<arg name='size' type='size_t' info=''/>
</function>
<function name='xmlMemRealloc' file='xmlmemory'>
<info>a realloc() equivalent, with logging of the allocation info.</info>
<return type='void *' info='a pointer to the allocated area or NULL in case of lack of memory.'/>
<arg name='ptr' type='void *' info='the initial memory block pointer'/>
<arg name='size' type='size_t' info='an int specifying the size in byte to allocate.'/>
<info></info>
<return type='void *' info=''/>
<arg name='ptr' type='void *' info=''/>
<arg name='size' type='size_t' info=''/>
</function>
<function name='xmlMemSetup' file='xmlmemory'>
<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 ?</info>
......@@ -9271,9 +9271,9 @@ actually an xmlCharEncoding'/>
<return type='void'/>
</function>
<function name='xmlMemoryStrdup' file='xmlmemory'>
<info>a strdup() equivalent, with logging of the allocation info.</info>
<return type='char *' info='a pointer to the new string or NULL if allocation error occurred.'/>
<arg name='str' type='const char *' info='the initial string pointer'/>
<info></info>
<return type='char *' info=''/>
<arg name='str' type='const char *' info=''/>
</function>
<function name='xmlMutexLock' file='threads'>
<info>xmlMutexLock() is used to lock a libxml2 token.</info>
......@@ -10035,12 +10035,12 @@ actually an xmlCharEncoding'/>
<arg name='encoder' type='xmlCharEncodingHandlerPtr' info='the encoding converter or NULL'/>
<arg name='compression' type='int' info='the compression ration (0 none, 9 max).'/>
</function>
<function name='xmlOutputBufferCreateFilenameDefault' file='xmlIO'>
<function name='xmlOutputBufferCreateFilenameDefault' file='globals'>
<info>Registers a callback for URI output file handling</info>
<return type='xmlOutputBufferCreateFilenameFunc' info='the old value of the registration function'/>
<arg name='func' type='xmlOutputBufferCreateFilenameFunc' info='function pointer to the new OutputBufferCreateFilenameFunc'/>
</function>
<functype name='xmlOutputBufferCreateFilenameFunc' file='xmlIO'>
<functype name='xmlOutputBufferCreateFilenameFunc' file='globals'>
<info></info>
<return type='xmlOutputBufferPtr' info=''/>
<arg name='URI' type='const char *' info=''/>
......@@ -10521,12 +10521,12 @@ actually an xmlCharEncoding'/>
<arg name='URI' type='const char *' info='a C string containing the URI or filename'/>
<arg name='enc' type='xmlCharEncoding' info='the charset encoding if known'/>
</function>
<function name='xmlParserInputBufferCreateFilenameDefault' file='xmlIO'>
<function name='xmlParserInputBufferCreateFilenameDefault' file='globals'>
<info>Registers a callback for URI input file handling</info>
<return type='xmlParserInputBufferCreateFilenameFunc' info='the old value of the registration function'/>
<arg name='func' type='xmlParserInputBufferCreateFilenameFunc' info='function pointer to the new ParserInputBufferCreateFilenameFunc'/>
</function>
<functype name='xmlParserInputBufferCreateFilenameFunc' file='xmlIO'>
<functype name='xmlParserInputBufferCreateFilenameFunc' file='globals'>
<info></info>
<return type='xmlParserInputBufferPtr' info=''/>
<arg name='URI' type='const char *' info=''/>
......@@ -1890,8 +1890,8 @@
<reference name='xmlOutputBufferCreateFd' href='html/libxml-xmlIO.html#xmlOutputBufferCreateFd'/>
<reference name='xmlOutputBufferCreateFile' href='html/libxml-xmlIO.html#xmlOutputBufferCreateFile'/>
<reference name='xmlOutputBufferCreateFilename' href='html/libxml-xmlIO.html#xmlOutputBufferCreateFilename'/>
<reference name='xmlOutputBufferCreateFilenameDefault' href='html/libxml-xmlIO.html#xmlOutputBufferCreateFilenameDefault'/>
<reference name='xmlOutputBufferCreateFilenameFunc' href='html/libxml-xmlIO.html#xmlOutputBufferCreateFilenameFunc'/>
<reference name='xmlOutputBufferCreateFilenameDefault' href='html/libxml-globals.html#xmlOutputBufferCreateFilenameDefault'/>
<reference name='xmlOutputBufferCreateFilenameFunc' href='html/libxml-globals.html#xmlOutputBufferCreateFilenameFunc'/>
<reference name='xmlOutputBufferCreateFilenameValue' href='html/libxml-globals.html#xmlOutputBufferCreateFilenameValue'/>
<reference name='xmlOutputBufferCreateIO' href='html/libxml-xmlIO.html#xmlOutputBufferCreateIO'/>
<reference name='xmlOutputBufferFlush' href='html/libxml-xmlIO.html#xmlOutputBufferFlush'/>
......@@ -1981,8 +1981,8 @@
<reference name='xmlParserInputBufferCreateFd' href='html/libxml-xmlIO.html#xmlParserInputBufferCreateFd'/>
<reference name='xmlParserInputBufferCreateFile' href='html/libxml-xmlIO.html#xmlParserInputBufferCreateFile'/>
<reference name='xmlParserInputBufferCreateFilename' href='html/libxml-xmlIO.html#xmlParserInputBufferCreateFilename'/>
<reference name='xmlParserInputBufferCreateFilenameDefault' href='html/libxml-xmlIO.html#xmlParserInputBufferCreateFilenameDefault'/>
<reference name='xmlParserInputBufferCreateFilenameFunc' href='html/libxml-xmlIO.html#xmlParserInputBufferCreateFilenameFunc'/>
<reference name='xmlParserInputBufferCreateFilenameDefault' href='html/libxml-globals.html#xmlParserInputBufferCreateFilenameDefault'/>
<reference name='xmlParserInputBufferCreateFilenameFunc' href='html/libxml-globals.html#xmlParserInputBufferCreateFilenameFunc'/>
<reference name='xmlParserInputBufferCreateFilenameValue' href='html/libxml-globals.html#xmlParserInputBufferCreateFilenameValue'/>
<reference name='xmlParserInputBufferCreateIO' href='html/libxml-xmlIO.html#xmlParserInputBufferCreateIO'/>
<reference name='xmlParserInputBufferCreateMem' href='html/libxml-xmlIO.html#xmlParserInputBufferCreateMem'/>
......@@ -9488,8 +9488,12 @@
<ref name='xmlMalloc'/>
<ref name='xmlMallocAtomic'/>
<ref name='xmlMemStrdup'/>
<ref name='xmlOutputBufferCreateFilenameDefault'/>
<ref name='xmlOutputBufferCreateFilenameFunc'/>
<ref name='xmlOutputBufferCreateFilenameValue'/>
<ref name='xmlParserDebugEntities'/>
<ref name='xmlParserInputBufferCreateFilenameDefault'/>
<ref name='xmlParserInputBufferCreateFilenameFunc'/>
<ref name='xmlParserInputBufferCreateFilenameValue'/>
<ref name='xmlParserVersion'/>
<ref name='xmlPedanticParserDefaultValue'/>
......@@ -10589,8 +10593,6 @@
<ref name='xmlOutputBufferCreateFd'/>
<ref name='xmlOutputBufferCreateFile'/>
<ref name='xmlOutputBufferCreateFilename'/>
<ref name='xmlOutputBufferCreateFilenameDefault'/>
<ref name='xmlOutputBufferCreateFilenameFunc'/>
<ref name='xmlOutputBufferCreateIO'/>
<ref name='xmlOutputBufferFlush'/>
<ref name='xmlOutputBufferWrite'/>
......@@ -10604,8 +10606,6 @@
<ref name='xmlParserInputBufferCreateFd'/>
<ref name='xmlParserInputBufferCreateFile'/>
<ref name='xmlParserInputBufferCreateFilename'/>
<ref name='xmlParserInputBufferCreateFilenameDefault'/>
<ref name='xmlParserInputBufferCreateFilenameFunc'/>
<ref name='xmlParserInputBufferCreateIO'/>
<ref name='xmlParserInputBufferCreateMem'/>
<ref name='xmlParserInputBufferCreateStatic'/>
......@@ -16403,8 +16403,6 @@
<ref name='xmlBuildQName'/>
<ref name='xmlMallocAtomicLoc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemMalloc'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlNewMutex'/>
<ref name='xmlNewRMutex'/>
<ref name='xmlReallocLoc'/>
......@@ -16415,10 +16413,7 @@
<ref name='xmlGetBufferAllocationScheme'/>
<ref name='xmlMallocAtomicLoc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemMalloc'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlMemStrdupLoc'/>
<ref name='xmlMemoryStrdup'/>
<ref name='xmlNormalizeURIPath'/>
<ref name='xmlReallocLoc'/>
<ref name='xmlSetBufferAllocationScheme'/>
......@@ -16702,8 +16697,6 @@
<ref name='xmlBufferCreateStatic'/>
<ref name='xmlMallocAtomicLoc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemMalloc'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlParserInputBufferCreateMem'/>
<ref name='xmlParserInputBufferCreateStatic'/>
<ref name='xmlReallocLoc'/>
......@@ -17458,7 +17451,6 @@
<ref name='xlinkIsLink'/>
<ref name='xmlBufferWriteQuotedString'/>
<ref name='xmlBuildURI'/>
<ref name='xmlMemFree'/>
<ref name='xmlUTF8Strlen'/>
</word>
<word name='checkings'>
......@@ -19310,11 +19302,7 @@
<word name='equivalent'>
<ref name='xmlMallocAtomicLoc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemFree'/>
<ref name='xmlMemMalloc'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlMemStrdupLoc'/>
<ref name='xmlMemoryStrdup'/>
<ref name='xmlNodeListGetRawString'/>
<ref name='xmlNodeListGetString'/>
<ref name='xmlReallocLoc'/>
......@@ -20783,10 +20771,7 @@
<ref name='xmlInitNodeInfoSeq'/>
<ref name='xmlMallocAtomicLoc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemMalloc'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlMemStrdupLoc'/>
<ref name='xmlMemoryStrdup'/>
<ref name='xmlNanoFTPList'/>
<ref name='xmlParserAddNodeInfo'/>
<ref name='xmlParserFindNodeInfo'/>
......@@ -20864,9 +20849,7 @@
<ref name='xmlAutomataGetInitState'/>
<ref name='xmlBufferCreateSize'/>
<ref name='xmlInitNodeInfoSeq'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlMemStrdupLoc'/>
<ref name='xmlMemoryStrdup'/>
<ref name='xmlReallocLoc'/>
<ref name='xmlShell'/>
<ref name='xmlXPathNodeSetAdd'/>
......@@ -20988,6 +20971,29 @@
<word name='insufficient'>
<ref name='xmlCanonicPath'/>
</word>
<word name='int'>
<ref name='_xmlParserCtxt'/>
<ref name='c'/>
<ref name='getColumnNumber'/>
<ref name='getLineNumber'/>
<ref name='htmlHandleOmittedElem'/>
<ref name='htmlParseCharRef'/>
<ref name='xmlIsLetter'/>
<ref name='xmlKeepBlanksDefault'/>
<ref name='xmlLineNumbersDefault'/>
<ref name='xmlMallocAtomicLoc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemUsed'/>
<ref name='xmlParseCharData'/>
<ref name='xmlParseCharRef'/>
<ref name='xmlPedanticParserDefault'/>
<ref name='xmlReallocLoc'/>
<ref name='xmlSAX2GetColumnNumber'/>
<ref name='xmlSAX2GetLineNumber'/>
<ref name='xmlShellCmd'/>
<ref name='xmlSplitQName3'/>
<ref name='xmlSubstituteEntitiesDefault'/>
</word>
<word name='integer'>
<ref name='xmlStrcasecmp'/>
<ref name='xmlStrcmp'/>
......@@ -21226,8 +21232,6 @@
<ref name='xmlCharEncodingOutputFunc'/>
<ref name='xmlMallocAtomicLoc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemMalloc'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlReallocLoc'/>
</word>
<word name='lang'>
......@@ -21552,10 +21556,7 @@
<word name='logging'>
<ref name='xmlMallocAtomicLoc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemMalloc'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlMemStrdupLoc'/>
<ref name='xmlMemoryStrdup'/>
<ref name='xmlReallocLoc'/>
</word>
<word name='long'>
......@@ -21654,7 +21655,6 @@
<ref name='xmlMallocFunc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemGet'/>
<ref name='xmlMemMalloc'/>
<ref name='xmlMemSetup'/>
</word>
<word name='mallocAtomicFunc'>
......@@ -22431,7 +22431,6 @@
</word>
<word name='occurred'>
<ref name='xmlMemStrdupLoc'/>
<ref name='xmlMemoryStrdup'/>
</word>
<word name='occurrence'>
<ref name='xmlStrcasestr'/>
......@@ -23655,7 +23654,6 @@
<ref name='xmlGcMemGet'/>
<ref name='xmlGcMemSetup'/>
<ref name='xmlMemGet'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlMemSetup'/>
<ref name='xmlReallocFunc'/>
<ref name='xmlReallocLoc'/>
......@@ -24948,8 +24946,6 @@
<word name='specifying'>
<ref name='xmlMallocAtomicLoc'/>
<ref name='xmlMallocLoc'/>
<ref name='xmlMemMalloc'/>
<ref name='xmlMemRealloc'/>
<ref name='xmlReallocLoc'/>
</word>
<word name='speed'>
......@@ -25159,7 +25155,6 @@
<ref name='xmlMemGet'/>
<ref name='xmlMemSetup'/>
<ref name='xmlMemStrdupLoc'/>
<ref name='xmlMemoryStrdup'/>
<ref name='xmlStrdup'/>
<ref name='xmlStrdupFunc'/>
</word>
......@@ -28,6 +28,13 @@ extern "C" {
XMLPUBFUN void XMLCALL xmlInitGlobals(void);
XMLPUBFUN void XMLCALL xmlCleanupGlobals(void);
typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI, xmlCharEncoding enc);
typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI, xmlCharEncodingHandlerPtr encoder, int compression);
XMLPUBFUN xmlParserInputBufferCreateFilenameFunc
XMLCALL xmlParserInputBufferCreateFilenameDefault (xmlParserInputBufferCreateFilenameFunc func);
XMLPUBFUN xmlOutputBufferCreateFilenameFunc
XMLCALL xmlOutputBufferCreateFilenameDefault (xmlOutputBufferCreateFilenameFunc func);
/*
* Externally global symbols which need to be protected for backwards
* compatibility support.
......
......@@ -62,9 +62,6 @@ typedef int (*xmlInputReadCallback) (void * context, char * buffer, int len);
*/
typedef int (*xmlInputCloseCallback) (void * context);
typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI, xmlCharEncoding enc);
typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI, xmlCharEncodingHandlerPtr encoder, int compression);
#ifdef LIBXML_OUTPUT_ENABLED
/*
* Those are the functions and datatypes for the library output
......@@ -210,11 +207,6 @@ XMLPUBFUN int XMLCALL
xmlInputReadCallback readFunc,
xmlInputCloseCallback closeFunc);
XMLPUBFUN xmlParserInputBufferCreateFilenameFunc XMLCALL
xmlParserInputBufferCreateFilenameDefault (xmlParserInputBufferCreateFilenameFunc func);
XMLPUBFUN xmlOutputBufferCreateFilenameFunc XMLCALL
xmlOutputBufferCreateFilenameDefault (xmlOutputBufferCreateFilenameFunc func);
xmlParserInputBufferPtr
__xmlParserInputBufferCreateFilename(const char *URI,
xmlCharEncoding enc);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment