romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-15 23:47:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: replace scache no-op macros with #ifdef

Browse source 
To avoid warning/error in no-SSL, non-unity builds:
```
lib/multi.c:273:5: error: code will never be executed [-Werror,-Wunreachable-code]
273 |     goto error;
    |     ^~~~~~~~~~
```

Reported-by: Marcel Raad
Fixes #17754
Closes #17760
This commit is contained in:
Viktor Szakats 2025-06-27 09:03:24 +02:00
parent 3f36e1e502
commit 081e78b023
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/multi.c
View file

@ -271,20 +271,22 @@ struct Curl_multi *Curl_multi_handle(unsigned int xfer_table_size,
Curl_cpool_init(&multi->cpool, multi->admin, NULL, chashsize);
#ifdef USE_SSL
if(Curl_ssl_scache_create(sesssize, 2, &multi->ssl_scache))
goto error;
#else
(void)sesssize;
#endif
#ifdef USE_WINSOCK
multi->wsa_event = WSACreateEvent();
if(multi->wsa_event == WSA_INVALID_EVENT)
goto error;
#else
#ifdef ENABLE_WAKEUP
#elif defined(ENABLE_WAKEUP)
if(wakeup_create(multi->wakeup_pair, TRUE) < 0) {
multi->wakeup_pair[0] = CURL_SOCKET_BAD;
multi->wakeup_pair[1] = CURL_SOCKET_BAD;
}
#endif
#endif
return multi;
@ -296,7 +298,9 @@ error:
Curl_dnscache_destroy(&multi->dnscache);
Curl_cpool_destroy(&multi->cpool);
Curl_cshutdn_destroy(&multi->cshutdn, multi->admin);
#ifdef USE_SSL
Curl_ssl_scache_destroy(multi->ssl_scache);
#endif
if(multi->admin) {
multi->admin->multi = NULL;
Curl_close(&multi->admin);
@ -2849,7 +2853,9 @@ CURLMcode curl_multi_cleanup(CURLM *m)
Curl_hash_destroy(&multi->proto_hash);
Curl_dnscache_destroy(&multi->dnscache);
Curl_psl_destroy(&multi->psl);
#ifdef USE_SSL
Curl_ssl_scache_destroy(multi->ssl_scache);
#endif
#ifdef USE_WINSOCK
WSACloseEvent(multi->wsa_event);

8
lib/vtls/vtls_scache.h
View file

@ -206,12 +206,6 @@ CURLcode Curl_ssl_session_export(struct Curl_easy *data,
void *userptr);
#endif /* USE_SSLS_EXPORT */
#else /* USE_SSL */
#define Curl_ssl_scache_create(x,y,z) ((void)x, CURLE_OK)
#define Curl_ssl_scache_destroy(x) do {} while(0)
#endif /* USE_SSL (else) */
#endif /* USE_SSL */
#endif /* HEADER_CURL_VTLS_SCACHE_H */