fixing bug 118558

diff --git a/ChangeLog b/ChangeLog
index 1353219..0170dbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 31 20:33:12 HKT 2003 William Brack <wbrack@mmm.com.hk>
+
+       Fixing bug 118558 (Solaris 8 compiler warnings)
+       * xslt.c: minor re-ordering of code
+       * functions.c: added an explicit cast
+       * number.c: added include for string.h
+       * security.c: added an explicit cast
+
 Tue Jul 29 12:43:17 HKT 2003 William Brack <wbrack@mmm.com.hk>
 
        * libexslt/date.c test/exslt/data/seconds.1 : changed sign

diff --git a/libxslt/functions.c b/libxslt/functions.c
index dfb48c9..1954f7b 100644 (file)
--- a/libxslt/functions.c
+++ b/libxslt/functions.c
@@ -128,7 +128,7 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, xmlChar* URI)
     /*
      * check for and remove fragment identifier
      */
-    fragment = uri->fragment;
+    fragment = (xmlChar *)uri->fragment;
     if (fragment != NULL) {
        uri->fragment = NULL;
        URI = xmlSaveUri(uri);

diff --git a/libxslt/numbers.c b/libxslt/numbers.c
index 7e65707..c992998 100644 (file)
--- a/libxslt/numbers.c
+++ b/libxslt/numbers.c
@@ -16,6 +16,7 @@
 #include <math.h>
 #include <limits.h>
 #include <float.h>
+#include <string.h>
 
 #include <libxml/xmlmemory.h>
 #include <libxml/parserInternals.h>

diff --git a/libxslt/security.c b/libxslt/security.c
index ee5d4d3..bb1cf06 100644 (file)
--- a/libxslt/security.c
+++ b/libxslt/security.c
@@ -295,7 +295,7 @@ xsltCheckWrite(xsltSecurityPrefsPtr sec,
             "xsltCheckWrite: out of memory for %s\n", URL);
            return(-1);
        }
-       uri->path = xmlStrdup(URL);
+       uri->path = (char *)xmlStrdup(URL);
     }
     if ((uri->scheme == NULL) ||
        (xmlStrEqual(BAD_CAST uri->scheme, BAD_CAST "file"))) {

diff --git a/libxslt/xslt.c b/libxslt/xslt.c
index 5bc3863..b205482 100644 (file)
--- a/libxslt/xslt.c
+++ b/libxslt/xslt.c
@@ -1516,16 +1516,14 @@ skip_children:
        if ((IS_XSLT_ELEM(cur)) && (IS_XSLT_NAME(cur, "param"))) {
            xmlNodePtr param = cur;
 
-            cur = cur->next;
            xsltTransformError(NULL, style, cur,
                "xsltParseTemplateContent: ignoring misplaced param element\n");
            if (style != NULL) style->warnings++;
+            cur = cur->next;
            xmlUnlinkNode(param);
            xmlFreeNode(param);
-           continue;
        } else
            break;
-       cur = cur->next;
     }
 }