summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-04-06 14:19:39 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-04-06 23:42:25 +0200
commitdd03e8c281582af454fabfb4a666a5b232d518aa (patch)
tree2e6ee4ec36819f0c7e56abdf7c4b26a5d6a41c1d
parent67bd4ab19e2903b45b66278956801a681fc35520 (diff)
downloadcurl-dd03e8c281582af454fabfb4a666a5b232d518aa.tar.gz
hash: calculate sizes with size_t instead of longs
... since they return size_t anyway! closes #2462
-rw-r--r--lib/cookie.c4
-rw-r--r--lib/hash.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/cookie.c b/lib/cookie.c
index 5aa959690..9c90c2a38 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -270,11 +270,11 @@ static const char *get_top_domain(const char * const domain, size_t *outlen)
static size_t cookie_hash_domain(const char *domain, const size_t len)
{
const char *end = domain + len;
- unsigned long h = 5381;
+ size_t h = 5381;
while(domain < end) {
h += h << 5;
- h ^= (unsigned long) Curl_raw_toupper(*domain++);
+ h ^= Curl_raw_toupper(*domain++);
}
return (h % COOKIE_HASH_SIZE);
diff --git a/lib/hash.c b/lib/hash.c
index c99b1b699..15a128fec 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -261,11 +261,11 @@ size_t Curl_hash_str(void *key, size_t key_length, size_t slots_num)
{
const char *key_str = (const char *) key;
const char *end = key_str + key_length;
- unsigned long h = 5381;
+ size_t h = 5381;
while(key_str < end) {
h += h << 5;
- h ^= (unsigned long) *key_str++;
+ h ^= *key_str++;
}
return (h % slots_num);