minor cleanup for various compilation warnings (AIX as well as gcc)

* libxslt/numbers.c, libxslt/extensions.c, libexslt/date.c,
  python/libxslt.c, xsltproc/xsltproc.c: minor cleanup for
  various compilation warnings (AIX as well as gcc)

diff --git a/ChangeLog b/ChangeLog
index d1d28e4..fcb6bb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 27 18:42:57 PDT 2003 William Brack <wbrack@mmm.com.hk>
+
+       * libxslt/numbers.c, libxslt/extensions.c, libexslt/date.c,
+         python/libxslt.c, xsltproc/xsltproc.c: minor cleanup for
+         various compilation warnings (AIX as well as gcc)
+
 Sat Sep 27 17:29:43 CEST 2003 Daniel Veillard <daniel@veillard.com>
 
        * libexslt/saxon.c: applied patch from Brett Kail to implement

diff --git a/libexslt/date.c b/libexslt/date.c
index 88980eb..b7b71dd 100644 (file)
--- a/libexslt/date.c
+++ b/libexslt/date.c
@@ -77,7 +77,7 @@ struct _exsltDateValDate {
     unsigned int       hour    :5;     /* 0 <=  hour   <= 23   */
     unsigned int       min     :6;     /* 0 <=  min    <= 59   */
     double             sec;
-    int                        tz_flag :1;     /* is tzo explicitely set? */
+    unsigned int       tz_flag :1;     /* is tzo explicitely set? */
     int                        tzo     :11;    /* -1440 <= tzo <= 1440 */
 };
 
@@ -147,8 +147,12 @@ static const unsigned long daysInMonthLeap[12] =
 #define VALID_DATE(dt)                                         \
        (VALID_YEAR(dt->year) && VALID_MONTH(dt->mon) && VALID_MDAY(dt))
 
+/*
+    hour and min structure vals are unsigned, so normal macros give
+    warnings on some compilers.
+*/
 #define VALID_TIME(dt)                                         \
-       (VALID_HOUR(dt->hour) && VALID_MIN(dt->min) &&          \
+       ((dt->hour <=23 ) && (dt->min <= 59) &&                 \
         VALID_SEC(dt->sec) && VALID_TZO(dt->tzo))
 
 #define VALID_DATETIME(dt)                                     \

diff --git a/libxslt/extensions.c b/libxslt/extensions.c
index f000287..afff0a8 100644 (file)
--- a/libxslt/extensions.c
+++ b/libxslt/extensions.c
@@ -331,9 +331,7 @@ xsltRegisterExtPrefix(xsltStylesheetPtr style,
 
        module = xmlHashLookup(xsltExtensionsHash, URI);
        if (module != NULL) {
-           xsltExtDataPtr data;
-
-           data = xsltStyleGetExtData(style, URI);
+           xsltStyleGetExtData(style, URI);
        }
     }
     return(0);

diff --git a/libxslt/numbers.c b/libxslt/numbers.c
index 94a69da..668ca47 100644 (file)
--- a/libxslt/numbers.c
+++ b/libxslt/numbers.c
@@ -215,7 +215,7 @@ xsltNumberFormatDecimal(xmlBufferPtr buffer,
                break;
            }
            pointer -= len;
-           strncpy((char *)pointer, (const char *)temp_char, len);
+           memcpy(pointer, temp_char, len);
        }
        number /= 10.0;
        ++i;

diff --git a/python/libxslt.c b/python/libxslt.c
index 09b4cc5..e5a852d 100644 (file)
--- a/python/libxslt.c
+++ b/python/libxslt.c
@@ -16,6 +16,7 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
+#include "libexslt/exslt.h"
 #include "libxslt_wrap.h"
 #include "libxslt-py.h"
 

diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c
index 0785171..a82af9a 100644 (file)
--- a/xsltproc/xsltproc.c
+++ b/xsltproc/xsltproc.c
@@ -441,16 +441,15 @@ xsltProcess(xmlDocPtr doc, xsltStylesheetPtr cur, const char *filename) {
 
        xmlFreeDoc(res);
     } else {
-       int ret;
 
        ctxt = xsltNewTransformContext(cur, doc);
        if (ctxt == NULL)
            return;
        if (profile) {
-           ret = xsltRunStylesheetUser(cur, doc, params, output,
+           xsltRunStylesheetUser(cur, doc, params, output,
                                        NULL, NULL, stderr, ctxt);
        } else {
-           ret = xsltRunStylesheetUser(cur, doc, params, output,
+           xsltRunStylesheetUser(cur, doc, params, output,
                                        NULL, NULL, NULL, ctxt);
        }
        if (ctxt->state == XSLT_STATE_ERROR)
@@ -644,12 +643,10 @@ main(int argc, char **argv)
                    (!strcmp(argv[i], "--stringparam"))) {
            const xmlChar *string;
            xmlChar *value;
-           int len;
 
             i++;
             params[nbparams++] = argv[i++];
            string = (const xmlChar *) argv[i];
-           len = xmlStrlen(string);
            if (xmlStrchr(string, '"')) {
                if (xmlStrchr(string, '\'')) {
                    fprintf(stderr,