- libxslt/numbers.c: fix of a small bug

- libxslt/transform.c libxslt/variables.c libxslt/xslt.c: cleanups
  while bug-hunting
Daniel

diff --git a/ChangeLog b/ChangeLog
index 25390ef..40a2213 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 22 00:11:18 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+       * libxslt/numbers.c: fix of a small bug
+       * libxslt/transform.c libxslt/variables.c libxslt/xslt.c: cleanups
+         while bug-hunting
+
 Tue Jun 19 16:13:49 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
        * tests/docbook/Makefile.am: added XHTML and XSL FO to the

diff --git a/libxslt/numbers.c b/libxslt/numbers.c
index 9775884..6747434 100644 (file)
--- a/libxslt/numbers.c
+++ b/libxslt/numbers.c
@@ -165,7 +165,7 @@ xsltNumberFormatAlpha(xmlBufferPtr buffer,
     *(--pointer) = 0;
     alpha_list = (is_upper) ? alpha_upper_list : alpha_lower_list;
     
-    for (i = 1; i < (int)sizeof(buffer); i++) {
+    for (i = 1; i < (int)sizeof(temp_string); i++) {
        number--;
        *(--pointer) = alpha_list[((int)fmod(number, alpha_size))];
        number /= alpha_size;

diff --git a/libxslt/transform.c b/libxslt/transform.c
index a24d3e5..8b24e99 100644 (file)
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -799,11 +799,11 @@ xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node) {
 #ifdef WITH_XSLT_DEBUG_PROCESS
                    if (cur->type == XML_PI_NODE)
                        xsltGenericDebug(xsltGenericDebugContext,
-                        "xsltDefaultProcessOneNode: template found for PI %s\n",
+                    "xsltDefaultProcessOneNode: template found for PI %s\n",
                                         cur->name);
                    else if (cur->type == XML_COMMENT_NODE)
                        xsltGenericDebug(xsltGenericDebugContext,
-                        "xsltDefaultProcessOneNode: template found for comment\n");
+                    "xsltDefaultProcessOneNode: template found for comment\n");
 #endif
                    oldNode = ctxt->node;
                    ctxt->node = cur;
@@ -1245,8 +1245,8 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, xmlNodePtr node,
     if (ret < 0) {
        xsltGenericError(xsltGenericErrorContext,
            "xsltDocumentElem: unable to save to %s\n", filename);
-    } else {
 #ifdef WITH_XSLT_DEBUG_EXTRA
+    } else {
        xsltGenericDebug(xsltGenericDebugContext,
            "Wrote %d bytes to %s\n", ret, , filename);
 #endif
@@ -2278,7 +2278,7 @@ xsltApplyTemplates(xsltTransformContextPtr ctxt, xmlNodePtr node,
     if (newdoc) {
 #ifdef WITH_XSLT_DEBUG_PROCESS
        xsltGenericDebug(xsltGenericDebugContext,
-            "xsltApplyTemplates: Changing document - context doc %s, xpathdoc %s\n",
+     "xsltApplyTemplates: Changing document - context doc %s, xpathdoc %s\n",
             newCDocPtr->doc->URL, newXDocPtr->URL);
 #endif
 

diff --git a/libxslt/variables.c b/libxslt/variables.c
index 6c667ba..87fcaa0 100644 (file)
--- a/libxslt/variables.c
+++ b/libxslt/variables.c
@@ -515,12 +515,12 @@ xsltEvalGlobalVariables(xsltTransformContextPtr ctxt) {
        
 #ifdef WITH_XSLT_DEBUG_VARIABLE
        if ((style->doc != NULL) && (style->doc->URL != NULL)) {
-
            xsltGenericDebug(xsltGenericDebugContext,
-               "Registering global variables from %s\n",
+                            "Registering global variables from %s\n",
                             style->doc->URL);
        }
 #endif
+
        while (elem != NULL) {
            xsltStackElemPtr def;
 
@@ -595,6 +595,7 @@ xsltRegisterGlobalVariable(xsltStylesheetPtr style, const xmlChar *name,
        xsltGenericDebug(xsltGenericDebugContext,
                         "Defining global variable %s\n", name);
 #endif
+
     elem = xsltNewStackElem();
     if (elem == NULL)
        return(-1);
@@ -659,6 +660,7 @@ xsltEvalUserParams(xsltTransformContextPtr ctxt, const char **params) {
        xsltGenericDebug(xsltGenericDebugContext,
            "Evaluating user parameter %s=%s\n", name, value);
 #endif
+
        /*
         * Name lookup
         */
@@ -672,7 +674,7 @@ xsltEvalUserParams(xsltTransformContextPtr ctxt, const char **params) {
                                 prefix);
                if (ns == NULL) {
                    xsltGenericError(xsltGenericErrorContext,
-                       "user param : no namespace bound to prefix %s\n", prefix);
+                   "user param : no namespace bound to prefix %s\n", prefix);
                    href = NULL;
                } else {
                    href = ns->href;
@@ -723,6 +725,7 @@ xsltEvalUserParams(xsltTransformContextPtr ctxt, const char **params) {
                                        result, 0);
 #endif
 #endif
+
            elem = xsltNewStackElem();
            if (elem != NULL) {
                elem->name = xmlStrdup(ncname);
@@ -777,6 +780,7 @@ xsltBuildVariable(xsltTransformContextPtr ctxt, xsltStylePreCompPtr comp,
                         " select %s", comp->select);
     xsltGenericDebug(xsltGenericDebugContext, "\n");
 #endif
+
     elem = xsltNewStackElem();
     if (elem == NULL)
        return(NULL);
@@ -941,12 +945,12 @@ xsltParseStylesheetCallerParam(xsltTransformContextPtr ctxt, xmlNodePtr cur) {
            "xsl:param : missing name attribute\n");
        return(NULL);
     }
+
 #ifdef WITH_XSLT_DEBUG_VARIABLE
     xsltGenericDebug(xsltGenericDebugContext,
            "Handling param %s\n", comp->name);
 #endif
 
-
     if (comp->select == NULL) {
        tree = cur->children;
     } else {

diff --git a/libxslt/xslt.c b/libxslt/xslt.c
index 85b5dd6..5f1cbc5 100644 (file)
--- a/libxslt/xslt.c
+++ b/libxslt/xslt.c
@@ -21,6 +21,7 @@
 #include <libxml/uri.h>
 #include <libxml/xmlerror.h>
 #include <libxml/parserInternals.h>
+#include <libxml/xpathInternals.h>
 #include "xslt.h"
 #include "xsltInternals.h"
 #include "pattern.h"