libxslt update

third_party/libxslt/libexslt/strings.c

 #define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
 #include <win32config.h>
 #else
 #include "config.h"
 #endif
 
 #include <libxml/tree.h>
@@ skipping 571 matching lines @@
       ret = exsltStrReplaceInternal(str, searchStr, replaceStr);
     }
                 else {
       searchSet = xmlXPathPopNodeSet(ctxt);
       if (searchSet == NULL || xmlXPathCheckError(ctxt)) {
         xmlXPathSetTypeError(ctxt);
         goto fail;
       }
 
       str = xmlXPathPopString(ctxt);
-                        ret = xmlStrdup(str);
+      ret = xmlStrdup(str);
 
-                        for (i = 0; i < searchSet->nodeNr; i++) {
-
-                                searchStr = xmlXPathCastNodeToString(searchSet->nodeTab[i]);
+      for (i = 0; i < searchSet->nodeNr; i++) {
+        searchStr = xmlXPathCastNodeToString(searchSet->nodeTab[i]);
 
         if (replaceSet != NULL) {
           replaceStr = NULL;
-          if (i <= replaceSet->nodeNr) {
+          if (i < replaceSet->nodeNr) {
             replaceStr = xmlXPathCastNodeToString(replaceSet->nodeTab[i]);
           }
 
           retSwap = exsltStrReplaceInternal(ret, searchStr, replaceStr);
           
           if (replaceStr != NULL) {
             xmlFree(replaceStr);
             replaceStr = NULL;
           }
         }
@@ skipping 56 matching lines @@
     xsltRegisterExtModuleFunction ((const xmlChar *) "align",
                                    EXSLT_STRINGS_NAMESPACE,
                                    exsltStrAlignFunction);
     xsltRegisterExtModuleFunction ((const xmlChar *) "concat",
                                    EXSLT_STRINGS_NAMESPACE,
                                    exsltStrConcatFunction);
     xsltRegisterExtModuleFunction ((const xmlChar *) "replace",
                                    EXSLT_STRINGS_NAMESPACE,
                                    exsltStrReplaceFunction);
 }
+
+/**
+ * exsltStrXpathCtxtRegister:
+ *
+ * Registers the EXSLT - Strings module for use outside XSLT
+ */
+int
+exsltStrXpathCtxtRegister (xmlXPathContextPtr ctxt, const xmlChar *prefix)
+{
+    if (ctxt
+        && prefix
+        && !xmlXPathRegisterNs(ctxt,
+                               prefix,
+                               (const xmlChar *) EXSLT_STRINGS_NAMESPACE)
+        && !xmlXPathRegisterFuncNS(ctxt,
+                                   (const xmlChar *) "encode-uri",
+                                   (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
+                                   exsltStrEncodeUriFunction)
+        && !xmlXPathRegisterFuncNS(ctxt,
+                                   (const xmlChar *) "decode-uri",
+                                   (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
+                                   exsltStrDecodeUriFunction)
+        && !xmlXPathRegisterFuncNS(ctxt,
+                                   (const xmlChar *) "padding",
+                                   (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
+                                   exsltStrPaddingFunction)
+        && !xmlXPathRegisterFuncNS(ctxt,
+                                   (const xmlChar *) "align",
+                                   (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
+                                   exsltStrAlignFunction)
+        && !xmlXPathRegisterFuncNS(ctxt,
+                                   (const xmlChar *) "concat",
+                                   (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
+                                   exsltStrConcatFunction)
+        && !xmlXPathRegisterFuncNS(ctxt,
+                                   (const xmlChar *) "replace",
+                                   (const xmlChar *) EXSLT_STRINGS_NAMESPACE,
+                                   exsltStrReplaceFunction)) {
+        return 0;
+    }
+    return -1;
+}