some more generated files to ignore utils.h not installed anymore changed

        * libexslt/.cvsignore: some more generated files to ignore
        * libexslt/Makefile.am: utils.h not installed anymore
        * libexslt/common.c libexslt/exslt.[ch] libexslt/functions.c
          libexslt/math.c libexslt/sets.c:
          changed function prefix from exsl* to exslt*
          {common.c,exslt.c} moved exsltLib{rary,exslt,xslt,xml}Version
          from common.c to exslt.c
          {common.c} removed exslNodeSetFunction, uses xsltFunctionNodeSet
          instead
        * libxslt/extra.c: fixed xsltFunctionNodeSet to accept
          XPATH_NODESET arguments in addition to XPATH_XSLT_TREE
        * xsltproc/xsltproc.c: updated to use the new function prefix

1 files changed, 8 insertions, 37 deletions

diff --git a/libexslt/common.c b/libexslt/common.c
index dc4c2674..365e474b 100644
--- a/libexslt/common.c
+++ b/libexslt/common.c
@@ -1,47 +1,18 @@
-#include <libxml/xmlversion.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-#include <libxslt/xsltconfig.h>
 #include <libxslt/xsltutils.h>
 #include <libxslt/xsltInternals.h>
 #include <libxslt/extensions.h>
 #include <libxslt/transform.h>
+#include <libxslt/extra.h>
 
-#include "exsltconfig.h"
 #include "exslt.h"
 #include "utils.h"
 
-const char *exsltLibraryVersion = LIBEXSLT_VERSION_STRING;
-const int exsltLibexsltVersion = LIBEXSLT_VERSION;
-const int exsltLibxsltVersion = LIBXSLT_VERSION;
-const int exsltLibxmlVersion = LIBXML_VERSION;
-
-/**
- * exslNodeSetFunction:
- * @ctxt:  an XPath parser context
- *
- * Implements the EXSLT - Common node-set function:
- *    node-set exsl:node-set (result-tree-fragment)
- * for use by the XPath processor.
- */
-static void
-exslNodeSetFunction(xmlXPathParserContextPtr ctxt, int nargs){
-    if (nargs != 1) {
-	xmlXPathSetArityError(ctxt);
-        return;
-    }
-    if (!xmlXPathStackIsNodeSet(ctxt)) {
-	xmlXPathSetTypeError(ctxt);
-        return;
-    }
-    ctxt->value->type = XPATH_NODESET;
-    ctxt->value->boolval = 1;
-}
-
 static void
-exslObjectTypeFunction (xmlXPathParserContextPtr ctxt, int nargs) {
+exsltObjectTypeFunction (xmlXPathParserContextPtr ctxt, int nargs) {
     xmlXPathObjectPtr obj, ret;
 
     if (nargs != 1) {
@@ -83,11 +54,11 @@ exslObjectTypeFunction (xmlXPathParserContextPtr ctxt, int nargs) {
 
 
 static void *
-exslCommonInit (xsltTransformContextPtr ctxt, const xmlChar *URI) {
+exsltCommonInit (xsltTransformContextPtr ctxt, const xmlChar *URI) {
     xsltRegisterExtFunction (ctxt, (const xmlChar *) "node-set",
-			     URI, exslNodeSetFunction);
+			     URI, xsltFunctionNodeSet);
     xsltRegisterExtFunction (ctxt, (const xmlChar *) "object-type",
-			     URI, exslObjectTypeFunction);
+			     URI, exsltObjectTypeFunction);
 
     xsltRegisterExtElement (ctxt, (const xmlChar *) "document",
 			    URI, xsltDocumentElem);
@@ -96,13 +67,13 @@ exslCommonInit (xsltTransformContextPtr ctxt, const xmlChar *URI) {
 }
 
 /**
- * exslCommonRegister:
+ * exsltCommonRegister:
  *
  * Registers the EXSLT - Common module
  */
 
 void
-exslCommonRegister (void) {
+exsltCommonRegister (void) {
     xsltRegisterExtModule (EXSLT_COMMON_NAMESPACE,
-			   exslCommonInit, NULL);
+			   exsltCommonInit, NULL);
 }