From a35bbe8977867f57c266749ac987aee2e328741c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 5 May 2024 17:45:11 +0200 Subject: [PATCH] lib: bump hash sizes to `size_t` Follow-up to cc907e80a2498c0599253271a6f657f614b52a4e #13502 Cherry-picked from #13489 Closes #13601 --- lib/conncache.c | 2 +- lib/conncache.h | 2 +- lib/hostip.c | 2 +- lib/hostip.h | 2 +- lib/multi.c | 8 ++++---- lib/multiif.h | 5 +++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/conncache.c b/lib/conncache.c index da9c4f032a..2b5ee4f25f 100644 --- a/lib/conncache.c +++ b/lib/conncache.c @@ -100,7 +100,7 @@ static void free_bundle_hash_entry(void *freethis) bundle_destroy(b); } -int Curl_conncache_init(struct conncache *connc, int size) +int Curl_conncache_init(struct conncache *connc, size_t size) { /* allocate a new easy handle to use when closing cached connections */ connc->closure_handle = curl_easy_init(); diff --git a/lib/conncache.h b/lib/conncache.h index c60f8449ee..e685123948 100644 --- a/lib/conncache.h +++ b/lib/conncache.h @@ -85,7 +85,7 @@ struct connectbundle { }; /* returns 1 on error, 0 is fine */ -int Curl_conncache_init(struct conncache *, int size); +int Curl_conncache_init(struct conncache *, size_t size); void Curl_conncache_destroy(struct conncache *connc); /* return the correct bundle, to a host or a proxy */ diff --git a/lib/hostip.c b/lib/hostip.c index 801de5ce43..2bd5dbfa02 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -1094,7 +1094,7 @@ static void freednsentry(void *freethis) /* * Curl_init_dnscache() inits a new DNS cache. */ -void Curl_init_dnscache(struct Curl_hash *hash, int size) +void Curl_init_dnscache(struct Curl_hash *hash, size_t size) { Curl_hash_init(hash, size, Curl_hash_str, Curl_str_key_compare, freednsentry); diff --git a/lib/hostip.h b/lib/hostip.h index 3ccf4354fe..bf4e94d2fa 100644 --- a/lib/hostip.h +++ b/lib/hostip.h @@ -166,7 +166,7 @@ void Curl_resolv_unlock(struct Curl_easy *data, struct Curl_dns_entry *dns); /* init a new dns cache */ -void Curl_init_dnscache(struct Curl_hash *hash, int hashsize); +void Curl_init_dnscache(struct Curl_hash *hash, size_t hashsize); /* prune old entries from the DNS cache */ void Curl_hostcache_prune(struct Curl_easy *data); diff --git a/lib/multi.c b/lib/multi.c index 2a4a09dae3..6bbdfe2672 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -364,7 +364,7 @@ static size_t hash_fd(void *key, size_t key_length, size_t slots_num) * per call." * */ -static void sh_init(struct Curl_hash *hash, int hashsize) +static void sh_init(struct Curl_hash *hash, size_t hashsize) { Curl_hash_init(hash, hashsize, hash_fd, fd_key_compare, sh_freeentry); @@ -381,9 +381,9 @@ static void multi_addmsg(struct Curl_multi *multi, struct Curl_message *msg) Curl_llist_append(&multi->msglist, msg, &msg->list); } -struct Curl_multi *Curl_multi_handle(int hashsize, /* socket hash */ - int chashsize, /* connection hash */ - int dnssize) /* dns hash */ +struct Curl_multi *Curl_multi_handle(size_t hashsize, /* socket hash */ + size_t chashsize, /* connection hash */ + size_t dnssize) /* dns hash */ { struct Curl_multi *multi = calloc(1, sizeof(struct Curl_multi)); diff --git a/lib/multiif.h b/lib/multiif.h index f36e14624a..59a30646c1 100644 --- a/lib/multiif.h +++ b/lib/multiif.h @@ -45,8 +45,9 @@ void Curl_multi_connchanged(struct Curl_multi *multi); /* Internal version of curl_multi_init() accepts size parameters for the socket, connection and dns hashes */ -struct Curl_multi *Curl_multi_handle(int hashsize, int chashsize, - int dnssize); +struct Curl_multi *Curl_multi_handle(size_t hashsize, + size_t chashsize, + size_t dnssize); /* the write bits start at bit 16 for the *getsock() bitmap */ #define GETSOCK_WRITEBITSTART 16