diff --git a/ChangeLog b/ChangeLog index 6156030d..231fcc65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Aug 22 15:16:53 CEST 2004 Daniel Veillard + + * xmllint.c xpath.c include/libxml/xpath.h + include/libxml/xpathInternals.h python/libxml.c + python/libxml_wrap.h: trying to remove some warning when compiling + on Fedora Core 3 and 64bits + Sat Aug 21 0:035:10 CET 2004 Kasimier Buchcik * xmlschemas.c: modified parsing of , , , diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h index 8a2e210b..20426e7b 100644 --- a/include/libxml/xpath.h +++ b/include/libxml/xpath.h @@ -197,6 +197,52 @@ struct _xmlXPathAxis { xmlXPathAxisFunc func; /* the search function */ }; +/** + * xmlXPathFunction: + * @ctxt: the XPath interprestation context + * @nargs: the number of arguments + * + * An XPath function. + * The arguments (if any) are popped out from the context stack + * and the result is pushed on the stack. + */ + +typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs); + +/* + * Function and Variable Lookup. + */ + +/** + * xmlXPathVariableLookupFunc: + * @ctxt: an XPath context + * @name: name of the variable + * @ns_uri: the namespace name hosting this variable + * + * Prototype for callbacks used to plug variable lookup in the XPath + * engine. + * + * Returns the XPath object value or NULL if not found. + */ +typedef xmlXPathObjectPtr (*xmlXPathVariableLookupFunc) (void *ctxt, + const xmlChar *name, + const xmlChar *ns_uri); + +/** + * xmlXPathFuncLookupFunc: + * @ctxt: an XPath context + * @name: name of the function + * @ns_uri: the namespace name hosting this function + * + * Prototype for callbacks used to plug function lookup in the XPath + * engine. + * + * Returns the XPath function or NULL if not found. + */ +typedef xmlXPathFunction (*xmlXPathFuncLookupFunc) (void *ctxt, + const xmlChar *name, + const xmlChar *ns_uri); + /** * xmlXPathContext: * @@ -247,7 +293,7 @@ struct _xmlXPathContext { /* the set of namespace declarations in scope for the expression */ xmlHashTablePtr nsHash; /* The namespaces hash table */ - void *varLookupFunc; /* variable lookup func */ + xmlXPathVariableLookupFunc varLookupFunc;/* variable lookup func */ void *varLookupData; /* variable lookup data */ /* Possibility to link in an extra item */ @@ -258,7 +304,7 @@ struct _xmlXPathContext { const xmlChar *functionURI; /* function lookup function and data */ - void *funcLookupFunc; /* function lookup func */ + xmlXPathFuncLookupFunc funcLookupFunc;/* function lookup func */ void *funcLookupData; /* function lookup data */ /* temporary namespace lists kept for walking the namespace axis */ @@ -305,18 +351,6 @@ struct _xmlXPathParserContext { xmlNodePtr ancestor; /* used for walking preceding axis */ }; -/** - * xmlXPathFunction: - * @ctxt: the XPath interprestation context - * @nargs: the number of arguments - * - * An XPath function. - * The arguments (if any) are popped out from the context stack - * and the result is pushed on the stack. - */ - -typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs); - /************************************************************************ * * * Public API * diff --git a/include/libxml/xpathInternals.h b/include/libxml/xpathInternals.h index 4ee19656..88ee27c6 100644 --- a/include/libxml/xpathInternals.h +++ b/include/libxml/xpathInternals.h @@ -327,20 +327,6 @@ XMLPUBFUN void * XMLCALL /* * Variable Lookup forwarding. */ -/** - * xmlXPathVariableLookupFunc: - * @ctxt: an XPath context - * @name: name of the variable - * @ns_uri: the namespace name hosting this variable - * - * Prototype for callbacks used to plug variable lookup in the XPath - * engine. - * - * Returns the XPath object value or NULL if not found. - */ -typedef xmlXPathObjectPtr (*xmlXPathVariableLookupFunc) (void *ctxt, - const xmlChar *name, - const xmlChar *ns_uri); XMLPUBFUN void XMLCALL xmlXPathRegisterVariableLookup (xmlXPathContextPtr ctxt, @@ -350,20 +336,6 @@ XMLPUBFUN void XMLCALL /* * Function Lookup forwarding. */ -/** - * xmlXPathFuncLookupFunc: - * @ctxt: an XPath context - * @name: name of the function - * @ns_uri: the namespace name hosting this function - * - * Prototype for callbacks used to plug function lookup in the XPath - * engine. - * - * Returns the XPath function or NULL if not found. - */ -typedef xmlXPathFunction (*xmlXPathFuncLookupFunc) (void *ctxt, - const xmlChar *name, - const xmlChar *ns_uri); XMLPUBFUN void XMLCALL xmlXPathRegisterFuncLookup (xmlXPathContextPtr ctxt, diff --git a/python/libxml.c b/python/libxml.c index 1c65e72c..07cb0695 100644 --- a/python/libxml.c +++ b/python/libxml.c @@ -3030,7 +3030,7 @@ libxml_xmlSchemaValidityWarningFunc(void *ctx, const char *msg, ...) va_end(ap); } -static PyObject * +PyObject * libxml_xmlSchemaSetValidErrors(ATTRIBUTE_UNUSED PyObject * self, PyObject * args) { PyObject *py_retval; @@ -3086,7 +3086,7 @@ libxml_xmlSchemaSetValidErrors(ATTRIBUTE_UNUSED PyObject * self, PyObject * args return(py_retval); } -static PyObject * +PyObject * libxml_xmlSchemaFreeValidCtxt(ATTRIBUTE_UNUSED PyObject * self, PyObject * args) { xmlSchemaValidCtxtPtr ctxt; diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h index ad62be23..e8210753 100644 --- a/python/libxml_wrap.h +++ b/python/libxml_wrap.h @@ -233,3 +233,4 @@ PyObject * libxml_xmlSchemaParserCtxtPtrWrap(xmlSchemaParserCtxtPtr ctxt); PyObject * libxml_xmlSchemaValidCtxtPtrWrap(xmlSchemaValidCtxtPtr valid); #endif /* LIBXML_SCHEMAS_ENABLED */ PyObject * libxml_xmlErrorPtrWrap(xmlErrorPtr error); +PyObject * libxml_xmlSchemaSetValidErrors(PyObject * self, PyObject * args); diff --git a/xmllint.c b/xmllint.c index 6225df9d..b0dada35 100644 --- a/xmllint.c +++ b/xmllint.c @@ -92,6 +92,9 @@ #ifdef LIBXML_PATTERN_ENABLED #include #endif +#ifdef LIBXML_C14N_ENABLED +#include +#endif #ifndef XML_XML_DEFAULT_CATALOG #define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" diff --git a/xpath.c b/xpath.c index fd9c6949..3d21e72f 100644 --- a/xpath.c +++ b/xpath.c @@ -2811,7 +2811,7 @@ xmlXPathRegisterFuncLookup (xmlXPathContextPtr ctxt, void *funcCtxt) { if (ctxt == NULL) return; - ctxt->funcLookupFunc = (void *) f; + ctxt->funcLookupFunc = f; ctxt->funcLookupData = funcCtxt; } @@ -2834,7 +2834,7 @@ xmlXPathFunctionLookup(xmlXPathContextPtr ctxt, const xmlChar *name) { xmlXPathFunction ret; xmlXPathFuncLookupFunc f; - f = (xmlXPathFuncLookupFunc) ctxt->funcLookupFunc; + f = ctxt->funcLookupFunc; ret = f(ctxt->funcLookupData, name, NULL); if (ret != NULL) return(ret); @@ -2865,7 +2865,7 @@ xmlXPathFunctionLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name, xmlXPathFunction ret; xmlXPathFuncLookupFunc f; - f = (xmlXPathFuncLookupFunc) ctxt->funcLookupFunc; + f = ctxt->funcLookupFunc; ret = f(ctxt->funcLookupData, name, ns_uri); if (ret != NULL) return(ret); @@ -2961,7 +2961,7 @@ xmlXPathRegisterVariableLookup(xmlXPathContextPtr ctxt, xmlXPathVariableLookupFunc f, void *data) { if (ctxt == NULL) return; - ctxt->varLookupFunc = (void *) f; + ctxt->varLookupFunc = f; ctxt->varLookupData = data; }