romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-22 10:15:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

conncache: make Curl_cpool_init return void

Browse source 
Since it cannot fail, removing the return code simplifies the code paths
calling this function.

Closes #16936
This commit is contained in:
Daniel Stenberg 2025-04-03 10:48:25 +02:00
parent 49701094fc
commit 78710ee955
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/conncache.c
View file

@ -132,10 +132,10 @@ static void cpool_bundle_free_entry(void *freethis)
cpool_bundle_destroy((struct cpool_bundle *)freethis);
}
int Curl_cpool_init(struct cpool *cpool,
struct Curl_easy *idata,
struct Curl_share *share,
size_t size)
void Curl_cpool_init(struct cpool *cpool,
struct Curl_easy *idata,
struct Curl_share *share,
size_t size)
{
Curl_hash_init(&cpool->dest2bundle, size, Curl_hash_str,
Curl_str_key_compare, cpool_bundle_free_entry);
@ -145,7 +145,6 @@ int Curl_cpool_init(struct cpool *cpool,
cpool->idata = idata;
cpool->share = share;
cpool->initialised = TRUE;
return 0; /* good */
}
/* Return the "first" connection in the pool or NULL. */

10
lib/conncache.h
View file

@ -62,12 +62,12 @@ struct cpool {
};
/* Init the pool, pass multi only if pool is owned by it.
* returns 1 on error, 0 is fine.
* Cannot fail.
*/
int Curl_cpool_init(struct cpool *cpool,
struct Curl_easy *idata,
struct Curl_share *share,
size_t size);
void Curl_cpool_init(struct cpool *cpool,
struct Curl_easy *idata,
struct Curl_share *share,
size_t size);
/* Destroy all connections and free all members */
void Curl_cpool_destroy(struct cpool *connc);

3
lib/multi.c
View file

@ -242,8 +242,7 @@ struct Curl_multi *Curl_multi_handle(size_t ev_hashsize, /* event hash */
if(Curl_cshutdn_init(&multi->cshutdn, multi))
goto error;
if(Curl_cpool_init(&multi->cpool, multi->admin, NULL, chashsize))
goto error;
Curl_cpool_init(&multi->cpool, multi->admin, NULL, chashsize);
if(Curl_ssl_scache_create(sesssize, 2, &multi->ssl_scache))
goto error;

3
lib/share.c
View file

@ -136,8 +136,7 @@ curl_share_setopt(CURLSH *sh, CURLSHoption option, ...)
case CURL_LOCK_DATA_CONNECT:
/* It is safe to set this option several times on a share. */
if(!share->cpool.initialised) {
if(Curl_cpool_init(&share->cpool, share->admin, share, 103))
res = CURLSHE_NOMEM;
Curl_cpool_init(&share->cpool, share->admin, share, 103);
}
break;