From: wessels <> Date: Wed, 11 Feb 1998 01:06:22 +0000 (+0000) Subject: compiler type warnings X-Git-Tag: SQUID_3_0_PRE1~4123 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7363fc176f9d6ba4a77a50b2d85c9e73ea2cef0f;p=thirdparty%2Fsquid.git compiler type warnings --- diff --git a/src/store_dir.cc b/src/store_dir.cc index 616e99654e..a52b9ce380 100644 --- a/src/store_dir.cc +++ b/src/store_dir.cc @@ -1,6 +1,6 @@ /* - * $Id: store_dir.cc,v 1.50 1998/02/10 02:16:39 wessels Exp $ + * $Id: store_dir.cc,v 1.51 1998/02/10 18:06:22 wessels Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -554,7 +554,7 @@ storeDirWriteCleanLogs(int reopen) assert(dirn < Config.cacheSwap.n_configured); if (fd[dirn] < 0) continue; - s = (void *) outbuf[dirn] + outbufoffset[dirn]; + s = (storeSwapData *) (outbuf[dirn] + outbufoffset[dirn]); outbufoffset[dirn] += sizeof(storeSwapData); memset(s, '\0', sizeof(storeSwapData)); s->op = (char) SWAP_LOG_ADD; diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc index 0daed041e6..0a4062d41f 100644 --- a/src/store_key_md5.cc +++ b/src/store_key_md5.cc @@ -21,7 +21,7 @@ storeKeyScan(const char *buf) static unsigned char digest[MD5_DIGEST_CHARS]; int i; int j = 0; - unsigned char t[3]; + char t[3]; for (i = 0; i < MD5_DIGEST_CHARS; i++) { t[0] = *(buf + (j++)); t[1] = *(buf + (j++)); @@ -72,7 +72,7 @@ storeKeyPrivate(const char *url, method_t method, int num) RequestMethodStr[method], url); MD5Init(&M); - MD5Update(&M, key_buf, n); + MD5Update(&M, (unsigned char *) key_buf, n); MD5Final(digest, &M); return digest; } @@ -88,7 +88,7 @@ storeKeyPublic(const char *url, method_t method) RequestMethodStr[method], url); MD5Init(&M); - MD5Update(&M, key_buf, n); + MD5Update(&M, (unsigned char *) key_buf, n); MD5Final(digest, &M); return digest; } diff --git a/src/structs.h b/src/structs.h index 06654e8de9..1fe4899de5 100644 --- a/src/structs.h +++ b/src/structs.h @@ -969,5 +969,5 @@ struct _storeSwapData { int object_len; u_short refcount; u_short flags; - char key[MD5_DIGEST_CHARS]; + unsigned char key[MD5_DIGEST_CHARS]; };