diff --git a/ChangeLog b/ChangeLog index a19dfaf1..d9ab9d75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Jan 4 22:47:22 CET 2005 Daniel Veillard + + * parser.c: fixed namespace bug in push mode reported by + Rob Richards + * test/ns6 result//ns6*: added it to the regression tests + * xmlmodule.c testModule.c include/libxml/xmlmodule.h: + added an extra option argument to module opening and defined + a couple of flags to the API. + Tue Jan 4 21:16:05 CET 2005 Daniel Veillard * xmlmodule.c include/libxml/xmlmodule.h: applied patch from diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html index d398332b..3867ad28 100644 --- a/doc/APIchunk15.html +++ b/doc/APIchunk15.html @@ -76,6 +76,7 @@ A:link, A:visited, A:active { text-decoration: underline } HTML_PI_NODE
HTML_PRESERVE_NODE
HTML_TEXT_NODE
+xmlModuleOpen
xmlSaveDoc
xmlSaveTree
xmlTextReaderNextSibling
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html index 96ca3b79..9c15d8fd 100644 --- a/doc/APIchunk19.html +++ b/doc/APIchunk19.html @@ -234,6 +234,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlURIUnescapeString
options
htmlCtxtUseOptions
xmlCtxtUseOptions
+xmlModuleOpen
xmlSaveToFd
xmlSaveToFilename
xmlSaveToIO
diff --git a/doc/APIchunk26.html b/doc/APIchunk26.html index f69ace83..eb0df980 100644 --- a/doc/APIchunk26.html +++ b/doc/APIchunk26.html @@ -237,6 +237,7 @@ A:link, A:visited, A:active { text-decoration: underline }
xmlLocationSetPtr
xmlXPtrFreeLocationSet
xmlXPtrLocationSetCreate
xmlLockLibrary
xmlLockLibrary
+
xmlModuleOption
xmlModuleOpen
xmlMutexLock
xmlMutexLock
xmlMutexUnlock
xmlMutexUnlock
xmlNanoFTPGet
ftpDataCallback
diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html index 64be9fd6..423610aa 100644 --- a/doc/APIchunk7.html +++ b/doc/APIchunk7.html @@ -55,6 +55,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlDecodeEntities
xmlEncodeEntities
xmlLoadExternalEntity
+xmlModuleOpen
xmlNamespaceParseNCName
xmlNamespaceParseNSDef
xmlNamespaceParseQName
diff --git a/doc/APIfiles.html b/doc/APIfiles.html index bb0af87f..b35dfe11 100644 --- a/doc/APIfiles.html +++ b/doc/APIfiles.html @@ -2433,10 +2433,13 @@ A:link, A:visited, A:active { text-decoration: underline } xmlReallocFunc
xmlReallocLoc
xmlStrdupFunc
-

Module xmlmodule:

xmlModule
+

Module xmlmodule:

XML_MODULE_LAZY
+XML_MODULE_LOCAL
+xmlModule
xmlModuleClose
xmlModuleFree
xmlModuleOpen
+xmlModuleOption
xmlModulePtr
xmlModuleSymbol

Module xmlreader:

XML_PARSER_DEFAULTATTRS
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html index 98aa0912..9c6f1687 100644 --- a/doc/APIsymbols.html +++ b/doc/APIsymbols.html @@ -498,6 +498,8 @@ A:link, A:visited, A:active { text-decoration: underline } XML_LOCAL_NAMESPACE
XML_MAX_NAMELEN
XML_MODULE_CLOSE
+XML_MODULE_LAZY
+XML_MODULE_LOCAL
XML_MODULE_OPEN
XML_NAMESPACE_DECL
XML_NOTATION_NODE
@@ -2050,6 +2052,7 @@ A:link, A:visited, A:active { text-decoration: underline } xmlModuleClose
xmlModuleFree
xmlModuleOpen
+xmlModuleOption
xmlModulePtr
xmlModuleSymbol
xmlMutex
diff --git a/doc/html/libxml-xmlmodule.html b/doc/html/libxml-xmlmodule.html index 1cb06714..b159489b 100644 --- a/doc/html/libxml-xmlmodule.html +++ b/doc/html/libxml-xmlmodule.html @@ -12,20 +12,25 @@ A:link, A:visited, A:active { text-decoration: underline } pre.programlisting {border-style: double;background: #EECFA1} Module xmlmodule from libxml2
Action against software patentsGnome2 LogoW3C LogoRed Hat Logo
Made with Libxml2 Logo

Module xmlmodule from libxml2

API Menu
API Indexes
Related links
PrevxmlmemoryUpAPI documentationHomeThe XML C parser and toolkit of GnomexmlreaderNext

basic API for dynamic module loading, used by libexslt added in 2.6.17

Table of Contents

Structure xmlModule
struct _xmlModule
 The content of this structure is not made public by the API.
+
Enum xmlModuleOption
 
Typedef xmlModule * xmlModulePtr
 
int	xmlModuleClose			(xmlModulePtr module)
int	xmlModuleFree			(xmlModulePtr module)
-
xmlModulePtr	xmlModuleOpen		(const char * name)
+
xmlModulePtr	xmlModuleOpen		(const char * name, 
					 int options)
int	xmlModuleSymbol			(xmlModulePtr module, 
					 const char * name, 
					 void ** symbol)

Description

Structure xmlModule

Structure xmlModule
struct _xmlModule {
 The content of this structure is not made public by the API.
-}

Function: xmlModuleClose

int	xmlModuleClose			(xmlModulePtr module)

+}

Enum xmlModuleOption

Enum xmlModuleOption {
+    XML_MODULE_LAZY = 1 : lazy binding
+    XML_MODULE_LOCAL = 2 : local binding
+}
+

Function: xmlModuleClose

int	xmlModuleClose			(xmlModulePtr module)

The close operations unload the associated module and free the data associated to the module.

module:the module handle
Returns:0 in case of success, -1 in case of argument error and -2 if the module could not be closed/unloaded.

Function: xmlModuleFree

int	xmlModuleFree			(xmlModulePtr module)

The free operations free the data associated to the module but does not unload the associated shared library which may still be in use.

-
module:the module handle
Returns:0 in case of success, -1 in case of argument error

Function: xmlModuleOpen

xmlModulePtr	xmlModuleOpen		(const char * name)

-

Opens a module/shared library given its name or path

-
name:the module name
Returns:a handle for the module or NULL in case of error

Function: xmlModuleSymbol

int	xmlModuleSymbol			(xmlModulePtr module, 
					 const char * name, 
					 void ** symbol)

+
module:the module handle
Returns:0 in case of success, -1 in case of argument error
Function: xmlModuleOpen
xmlModulePtr	xmlModuleOpen		(const char * name, 
					 int options)

+
Opens a module/shared library given its name or path TODO: options are not yet implemented.

+
name:the module name
options:a set of xmlModuleOption
Returns:a handle for the module or NULL in case of error
Function: xmlModuleSymbol
int	xmlModuleSymbol			(xmlModulePtr module, 
					 const char * name, 
					 void ** symbol)

 
Lookup for a symbol address in the given module

 
module:the module
name:the name of the symbol
symbol:the resulting symbol address
Returns:0 if the symbol was found, or -1 in case of error
Daniel Veillard
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 0128b286..1a88605f 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -2598,8 +2598,11 @@

dynamic module loading basic API for dynamic module loading, used by libexslt added in 2.6.17 Joel W. Reed + + + @@ -4616,6 +4619,8 @@ + + @@ -5662,6 +5667,7 @@ actually an xmlCharEncoding'/> + @@ -10070,9 +10076,10 @@ actually an xmlCharEncoding'/> defined(LIBXML_MODULES_ENABLED) - Opens a module/shared library given its name or path + Opens a module/shared library given its name or path TODO: options are not yet implemented. + defined(LIBXML_MODULES_ENABLED) diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index 7306aee0..6ae7024f 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -492,6 +492,8 @@ + + @@ -2044,6 +2046,7 @@ + @@ -3764,6 +3767,8 @@ + + @@ -5352,6 +5357,7 @@ + @@ -12261,10 +12267,13 @@ + + + @@ -16575,6 +16584,7 @@ + @@ -21776,6 +21786,7 @@ + @@ -23941,6 +23952,7 @@ + @@ -28437,6 +28449,9 @@ + + + @@ -28953,6 +28968,7 @@ + diff --git a/include/libxml/xmlmodule.h b/include/libxml/xmlmodule.h index b0e398f4..8f4a5603 100644 --- a/include/libxml/xmlmodule.h +++ b/include/libxml/xmlmodule.h @@ -27,21 +27,26 @@ extern "C" { typedef struct _xmlModule xmlModule; typedef xmlModule *xmlModulePtr; -#ifdef __cplusplus -} -#endif +/** + * xmlModuleOption: + * + * enumeration of options that can be passed down to xmlModuleOpen() + */ +typedef enum { + XML_MODULE_LAZY = 1, /* lazy binding */ + XML_MODULE_LOCAL= 2 /* local binding */ +} xmlModuleOption; -#ifdef __cplusplus -extern "C" { -#endif +XMLPUBFUN xmlModulePtr XMLCALL xmlModuleOpen (const char *filename, + int options); -XMLPUBFUN xmlModulePtr XMLCALL xmlModuleOpen (const char *filename); +XMLPUBFUN int XMLCALL xmlModuleSymbol (xmlModulePtr module, + const char* name, + void **result); -XMLPUBFUN int XMLCALL xmlModuleSymbol (xmlModulePtr module, const char* name, void **result); +XMLPUBFUN int XMLCALL xmlModuleClose (xmlModulePtr module); -XMLPUBFUN int XMLCALL xmlModuleClose (xmlModulePtr module); - -XMLPUBFUN int XMLCALL xmlModuleFree (xmlModulePtr module); +XMLPUBFUN int XMLCALL xmlModuleFree (xmlModulePtr module); #ifdef __cplusplus } diff --git a/parser.c b/parser.c index 6ee9159b..02ccdb1e 100644 --- a/parser.c +++ b/parser.c @@ -9256,6 +9256,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { (!ctxt->disableSAX)) ctxt->sax->endElementNs(ctxt->userData, name, prefix, URI); + if (ctxt->nsNr - nsNr > 0) + nsPop(ctxt, ctxt->nsNr - nsNr); #ifdef LIBXML_SAX1_ENABLED } else { if ((ctxt->sax != NULL) && diff --git a/result/noent/ns6 b/result/noent/ns6 new file mode 100644 index 00000000..c971252a --- /dev/null +++ b/result/noent/ns6 @@ -0,0 +1,5 @@ + + + + + diff --git a/result/ns6 b/result/ns6 new file mode 100644 index 00000000..c971252a --- /dev/null +++ b/result/ns6 @@ -0,0 +1,5 @@ + + + + + diff --git a/result/ns6.rde b/result/ns6.rde new file mode 100644 index 00000000..23a80ec8 --- /dev/null +++ b/result/ns6.rde @@ -0,0 +1,10 @@ +0 1 root 0 0 +1 14 #text 0 1 + +1 1 foo 1 0 +1 14 #text 0 1 + +1 1 bar 1 0 +1 14 #text 0 1 + +0 15 root 0 0 diff --git a/result/ns6.rdr b/result/ns6.rdr new file mode 100644 index 00000000..23a80ec8 --- /dev/null +++ b/result/ns6.rdr @@ -0,0 +1,10 @@ +0 1 root 0 0 +1 14 #text 0 1 + +1 1 foo 1 0 +1 14 #text 0 1 + +1 1 bar 1 0 +1 14 #text 0 1 + +0 15 root 0 0 diff --git a/result/ns6.sax b/result/ns6.sax new file mode 100644 index 00000000..a1405b13 --- /dev/null +++ b/result/ns6.sax @@ -0,0 +1,15 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.startElement(root) +SAX.characters( + , 3) +SAX.startElement(foo, xmlns='http://abc') +SAX.endElement(foo) +SAX.characters( + , 3) +SAX.startElement(bar) +SAX.endElement(bar) +SAX.characters( +, 1) +SAX.endElement(root) +SAX.endDocument() diff --git a/test/ns6 b/test/ns6 new file mode 100644 index 00000000..1f2a8b3b --- /dev/null +++ b/test/ns6 @@ -0,0 +1,4 @@ + + + + diff --git a/testModule.c b/testModule.c index a878e036..f245829b 100644 --- a/testModule.c +++ b/testModule.c @@ -27,7 +27,7 @@ #define MODULE_PATH ".libs" #endif -typedef int (*hello_world_t)(); +typedef int (*hello_world_t)(void); int main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { xmlChar filename[PATH_MAX]; @@ -35,11 +35,12 @@ int main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { hello_world_t hello_world = NULL; /* build the module filename, and confirm the module exists */ - xmlStrPrintf(filename, sizeof(filename), "%s/testdso%s", + xmlStrPrintf(filename, sizeof(filename), + (const xmlChar*) "%s/testdso%s", (const xmlChar*)MODULE_PATH, (const xmlChar*)LIBXML_MODULE_EXTENSION); - module = xmlModuleOpen((const char*)filename); + module = xmlModuleOpen((const char*)filename, 0); if (module) { if (xmlModuleSymbol(module, "hello_world", (void **) &hello_world)) { diff --git a/xmlmodule.c b/xmlmodule.c index e1c351a9..318497b5 100644 --- a/xmlmodule.c +++ b/xmlmodule.c @@ -58,13 +58,15 @@ xmlModuleErrMemory(xmlModulePtr module, const char *extra) /** * xmlModuleOpen: * @name: the module name + * @options: a set of xmlModuleOption * * Opens a module/shared library given its name or path + * TODO: options are not yet implemented. * * Returns a handle for the module or NULL in case of error */ xmlModulePtr -xmlModuleOpen(const char *name) +xmlModuleOpen(const char *name, int options ATTRIBUTE_UNUSED) { xmlModulePtr module;