From: Pekka Riikonen <priikone@silcnet.org>
Date: Sat, 1 Sep 2007 09:37:45 +0000 (+0000)
Subject: 	ICC compiler warning fixes.
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=6775a31c494ae3a05c8543cd850c031aa0596a9b

	ICC compiler warning fixes.
---

diff --git a/lib/silcutil/silcbuffmt.c b/lib/silcutil/silcbuffmt.c
index ff69ac6e..36d9b481 100644
--- a/lib/silcutil/silcbuffmt.c
+++ b/lib/silcutil/silcbuffmt.c
@@ -108,11 +108,11 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap)
     case SILC_PARAM_UI16_STRING_ALLOC:
     case SILC_PARAM_UI32_STRING_ALLOC:
       {
-	unsigned char *x = va_arg(ap, unsigned char *);
+	char *x = va_arg(ap, char *);
 	SilcUInt32 tmp_len = x ? strlen(x) : 0;
 	if (x && tmp_len) {
 	  FORMAT_HAS_SPACE(stack, dst, tmp_len);
-	  silc_buffer_put(dst, x, tmp_len);
+	  silc_buffer_put(dst, (unsigned char *)x, tmp_len);
 	  silc_buffer_pull(dst, tmp_len);
 	}
 	break;
@@ -179,7 +179,7 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap)
       {
 	char x = (char)va_arg(ap, int);
 	FORMAT_HAS_SPACE(stack, dst, 1);
-	silc_buffer_put(dst, &x, 1);
+	silc_buffer_put(dst, (unsigned char *)&x, 1);
 	silc_buffer_pull(dst, 1);
 	break;
       }
diff --git a/lib/silcutil/silcfileutil.c b/lib/silcutil/silcfileutil.c
index 5404183a..c28ba38f 100644
--- a/lib/silcutil/silcfileutil.c
+++ b/lib/silcutil/silcfileutil.c
@@ -128,7 +128,7 @@ char *silc_file_readfile(const char *filename, SilcUInt32 *return_len,
 			 SilcStack stack)
 {
   int fd;
-  char *buffer;
+  unsigned char *buffer;
   int filelen;
 
   fd = silc_file_open(filename, O_RDONLY);
@@ -155,7 +155,7 @@ char *silc_file_readfile(const char *filename, SilcUInt32 *return_len,
     return NULL;
   }
 
-  buffer = silc_calloc(filelen + 1, sizeof(char));
+  buffer = silc_calloc(filelen + 1, sizeof(*buffer));
 
   if ((silc_file_read(fd, buffer, filelen)) == -1) {
     memset(buffer, 0, sizeof(buffer));
@@ -171,7 +171,7 @@ char *silc_file_readfile(const char *filename, SilcUInt32 *return_len,
   if (return_len)
     *return_len = filelen;
 
-  return buffer;
+  return (char *)buffer;
 }
 
 /* Returns the size of `filename'. Returns 0 on error. */
diff --git a/lib/silcutil/silcstack_i.h b/lib/silcutil/silcstack_i.h
index 71280050..badc5ff7 100644
--- a/lib/silcutil/silcstack_i.h
+++ b/lib/silcutil/silcstack_i.h
@@ -32,7 +32,7 @@
 #define SILC_STACK_DEFAULT_NUM 32
 
 /* Default alignment */
-#define SILC_STACK_DEFAULT_ALIGN sizeof(unsigned long)
+#define SILC_STACK_DEFAULT_ALIGN SILC_ALIGNMENT
 
 /* Maximum allocation that can be made with SilcStack. */
 #define SILC_STACK_BLOCK_NUM 21
diff --git a/lib/silcutil/silctime.c b/lib/silcutil/silctime.c
index 639724c4..5a917172 100644
--- a/lib/silcutil/silctime.c
+++ b/lib/silcutil/silctime.c
@@ -224,9 +224,9 @@ SilcBool silc_time_universal(const char *universal_time, SilcTime ret_time)
       return FALSE;
     }
 
-    if (hour < 0 || hour > 23)
+    if (hour > 23)
       return FALSE;
-    if (minute < 0 || minute > 60)
+    if (minute > 60)
       return FALSE;
 
     ret_time->utc_hour   = hour;
@@ -342,9 +342,9 @@ SilcBool silc_time_generalized(const char *generalized_time, SilcTime ret_time)
       return FALSE;
     }
 
-    if (hour < 0 || hour > 23)
+    if (hour > 23)
       return FALSE;
-    if (minute < 0 || minute > 60)
+    if (minute > 60)
       return FALSE;
 
     ret_time->utc_hour   = hour;
diff --git a/lib/silcutil/silctime.h b/lib/silcutil/silctime.h
index 6c22d90a..e01e1ae7 100644
--- a/lib/silcutil/silctime.h
+++ b/lib/silcutil/silctime.h
@@ -276,7 +276,7 @@ int silc_gettimeofday(struct timeval *p);
  *
  * SYNOPSIS
  *
- *    void silc_usleep(long microseconds);
+ *    void silc_usleep(unsigned long microseconds);
  *
  * DESCRIPTION
  *
@@ -290,7 +290,7 @@ int silc_gettimeofday(struct timeval *p);
  *
  ***/
 static inline
-void silc_usleep(long microseconds)
+void silc_usleep(unsigned long microseconds)
 {
 #ifdef SILC_UNIX
 #ifdef HAVE_NANOSLEEP
diff --git a/lib/silcutil/silcutil.c b/lib/silcutil/silcutil.c
index 0333e630..a191f46b 100644
--- a/lib/silcutil/silcutil.c
+++ b/lib/silcutil/silcutil.c
@@ -165,7 +165,7 @@ void silc_parse_command_line(unsigned char *buffer,
 {
   int i, len = 0;
   int argc = 0;
-  const char *cp = buffer;
+  const char *cp = (const char *)buffer;
   char *tmp;
 
   *parsed = silc_calloc(1, sizeof(**parsed));