From: Pekka Riikonen Date: Sun, 10 Dec 2006 16:05:56 +0000 (+0000) Subject: Compilation warning fixes. X-Git-Tag: 1.2.beta1~565 X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=commitdiff_plain;h=5d5d716793e67191e7d65ff744e90e01042e4165 Compilation warning fixes. --- diff --git a/lib/silcutil/silcatomic.h b/lib/silcutil/silcatomic.h index b42e77a8..65d8b99d 100644 --- a/lib/silcutil/silcatomic.h +++ b/lib/silcutil/silcatomic.h @@ -1017,8 +1017,6 @@ static inline SilcBool silc_atomic_cas32(SilcAtomic32 *atomic, SilcUInt32 old_val, SilcUInt32 new_val) { - SilcUInt32 ret; - #if !defined(SILC_THREADS) /* No atomic operations */ if (atomic->value == old_val) { @@ -1034,6 +1032,7 @@ SilcBool silc_atomic_cas32(SilcAtomic32 *atomic, SilcUInt32 old_val, #elif defined(__GNUC__) && (defined(SILC_I486) || defined(SILC_X86_64)) /* GCC + i486 or x86_64 */ + SilcUInt32 ret; __asm __volatile("lock; cmpxchgl %2, %1" : "=a" (ret), "=m" (atomic->value) : "r" (new_val), "m" (atomic->value), "0" (old_val)); @@ -1081,8 +1080,6 @@ static inline SilcBool silc_atomic_cas16(SilcAtomic16 *atomic, SilcUInt16 old_val, SilcUInt16 new_val) { - SilcUInt16 ret; - #if !defined(SILC_THREADS) /* No atomic operations */ if (atomic->value == old_val) { @@ -1098,6 +1095,7 @@ SilcBool silc_atomic_cas16(SilcAtomic16 *atomic, SilcUInt16 old_val, #elif defined(__GNUC__) && (defined(SILC_I486) || defined(SILC_X86_64)) /* GCC + i486 or x86_64 */ + SilcUInt16 ret; __asm __volatile("lock; cmpxchgw %2, %1" : "=a" (ret), "=m" (atomic->value) : "c" (new_val), "m" (atomic->value), "0" (old_val)); @@ -1146,8 +1144,6 @@ static inline SilcBool silc_atomic_cas8(SilcAtomic8 *atomic, SilcUInt8 old_val, SilcUInt8 new_val) { - SilcUInt8 ret; - #if !defined(SILC_THREADS) /* No atomic operations */ if (atomic->value == old_val) { @@ -1163,6 +1159,7 @@ SilcBool silc_atomic_cas8(SilcAtomic8 *atomic, SilcUInt8 old_val, #elif defined(__GNUC__) && (defined(SILC_I486) || defined(SILC_X86_64)) /* GCC + i486 or x86_64 */ + SilcUInt8 ret; __asm __volatile("lock; cmpxchgb %2, %1" : "=a" (ret), "=m" (atomic->value) : "c" (new_val), "m" (atomic->value), "0" (old_val)); @@ -1211,8 +1208,6 @@ static inline SilcBool silc_atomic_cas_pointer(SilcAtomicPointer *atomic, void *old_val, void *new_val) { - void *ret; - #if !defined(SILC_THREADS) /* No atomic operations */ if (atomic->pointer == old_val) { @@ -1227,6 +1222,7 @@ SilcBool silc_atomic_cas_pointer(SilcAtomicPointer *atomic, void *old_val, #elif defined(__GNUC__) && defined(SILC_I486) /* GCC + i486 */ + void *ret; __asm __volatile("lock; cmpxchgl %2, %1" : "=a" (ret), "=m" (atomic->pointer) : "c" (new_val), "m" (atomic->pointer), "0" (old_val)); @@ -1234,6 +1230,7 @@ SilcBool silc_atomic_cas_pointer(SilcAtomicPointer *atomic, void *old_val, #elif defined(__GNUC__) && defined(SILC_X86_64) /* GCC + x86_64 */ + void *ret; __asm __volatile("lock; cmpxchgq %q2, %1" : "=a" (ret), "=m" (atomic->pointer) : "c" (new_val), "m" (atomic->pointer), "0" (old_val)); diff --git a/lib/silcutil/silcbuffmt.c b/lib/silcutil/silcbuffmt.c index e980d2b6..b17e5253 100644 --- a/lib/silcutil/silcbuffmt.c +++ b/lib/silcutil/silcbuffmt.c @@ -85,8 +85,8 @@ int silc_buffer_sformat_vp(SilcStack stack, SilcBuffer dst, va_list ap) switch(fmt) { case SILC_PARAM_FUNC: { - SilcBufferFormatFunc func; - SilcBufferSFormatFunc funcs; + SilcBufferFormatFunc func = NULL; + SilcBufferSFormatFunc funcs = NULL; void *val; void *context; int tmp_len; @@ -322,8 +322,8 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap) switch(fmt) { case SILC_PARAM_FUNC: { - SilcBufferUnformatFunc func; - SilcBufferSUnformatFunc funcs; + SilcBufferUnformatFunc func = NULL; + SilcBufferSUnformatFunc funcs = NULL; void **val; void *context; int tmp_len; diff --git a/lib/silcutil/silcconfig.c b/lib/silcutil/silcconfig.c index 93e27d2d..b0c4f816 100644 --- a/lib/silcutil/silcconfig.c +++ b/lib/silcutil/silcconfig.c @@ -4,7 +4,7 @@ Author: Giovanni Giacobbi - Copyright (C) 2002 - 2003 Giovanni Giacobbi + Copyright (C) 2002 - 2006 Giovanni Giacobbi This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -94,7 +94,7 @@ char *silc_config_strerror(int errnum) static void my_trim_spaces(SilcConfigFile *file) { register char *r = file->p; - while ((*r != '\0' && *r != EOF) && isspace(*r)) + while ((*r != '\0' && *r != EOF) && isspace((int)*r)) if (*r++ == '\n') file->line++; file->p = r; } @@ -113,7 +113,7 @@ static char *my_next_token(SilcConfigFile *file, char *to) register char *o; my_trim_spaces(file); o = file->p; - while (isalnum(*o) || (*o == '_') || (*o == '-')) + while (isalnum((int)*o) || (*o == '_') || (*o == '-')) *to++ = *o++; *to = '\0'; file->p = o; @@ -208,7 +208,7 @@ static void *silc_config_marshall(SilcConfigType type, const char *val) if (val == val_tmp) return NULL; /* really wrong, there must be at least one digit */ /* Search for a designator */ - switch (tolower(val_tmp[0])) { + switch (tolower((int)val_tmp[0])) { case '\0': /* None */ break; case 'k': /* Kilobytes */ diff --git a/lib/silcutil/silcnet.c b/lib/silcutil/silcnet.c index 5ef8fa82..2a868d22 100644 --- a/lib/silcutil/silcnet.c +++ b/lib/silcutil/silcnet.c @@ -70,7 +70,7 @@ SilcBool silc_net_is_ip4(const char *addr) int count = 0; while (*addr) { - if (*addr != '.' && !isdigit(*addr)) + if (*addr != '.' && !isdigit((int)*addr)) return FALSE; if (*addr == '.') count++; @@ -89,7 +89,7 @@ SilcBool silc_net_is_ip6(const char *addr) { /* XXX does this work with all kinds of IPv6 addresses? */ while (*addr) { - if (*addr != ':' && !isxdigit(*addr)) + if (*addr != ':' && !isxdigit((int)*addr)) return FALSE; addr++; } diff --git a/lib/silcutil/silcschedule.c b/lib/silcutil/silcschedule.c index 536cfa21..44997520 100644 --- a/lib/silcutil/silcschedule.c +++ b/lib/silcutil/silcschedule.c @@ -232,8 +232,6 @@ static void silc_schedule_task_remove(SilcSchedule schedule, SilcTask task) /* Put to free list */ silc_list_add(schedule->free_tasks, ttask); - if (silc_list_count(schedule->free_tasks) == 1) - silc_list_start(schedule->free_tasks); break; } } @@ -566,6 +564,7 @@ SilcTask silc_schedule_task_add(SilcSchedule schedule, SilcUInt32 fd, if (type == SILC_TASK_TIMEOUT) { SilcTaskTimeout tmp, prev, ttask; + silc_list_start(schedule->free_tasks); ttask = silc_list_get(schedule->free_tasks); if (!ttask) { ttask = silc_calloc(1, sizeof(*ttask)); diff --git a/lib/silcutil/silcutil.c b/lib/silcutil/silcutil.c index ebec35a7..c4122624 100644 --- a/lib/silcutil/silcutil.c +++ b/lib/silcutil/silcutil.c @@ -88,7 +88,7 @@ SilcBool silc_to_upper(const char *string, char *dest, SilcUInt32 dest_size) return FALSE; for (i = 0; i < strlen(string); i++) - dest[i] = toupper(string[i]); + dest[i] = (char)toupper((int)string[i]); return TRUE; } @@ -103,7 +103,7 @@ SilcBool silc_to_lower(const char *string, char *dest, SilcUInt32 dest_size) return FALSE; for (i = 0; i < strlen(string); i++) - dest[i] = tolower(string[i]); + dest[i] = (char)tolower((int)string[i]); return TRUE; } @@ -253,7 +253,7 @@ SilcUInt32 silc_hash_string(void *key, void *user_context) SilcUInt32 h = 0, g; while (*s != '\0') { - h = (h << 4) + tolower(*s); + h = (h << 4) + tolower((int)*s); if ((g = h & 0xf0000000)) { h = h ^ (g >> 24); h = h ^ g;