mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-21 06:50:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

mbedtls_threadlock: fix unused variable warning

Browse Source 
Closes #7393
This commit is contained in:
modbw 2021-07-14 11:11:57 +02:00 committed by Daniel Stenberg
parent e3dbdd5468
commit 65c1b8ee17
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/vtls/mbedtls_threadlock.c
View File

@ -55,10 +55,8 @@ int Curl_mbedtlsthreadlock_thread_setup(void)
return 0; /* error, no number of threads defined */ return 0; /* error, no number of threads defined */
for(i = 0; i < NUMT; i++) { for(i = 0; i < NUMT; i++) {
int ret;
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H) #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
ret = pthread_mutex_init(&mutex_buf[i], NULL); if(pthread_mutex_init(&mutex_buf[i], NULL))
if(ret)
return 0; /* pthread_mutex_init failed */ return 0; /* pthread_mutex_init failed */
#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H) #elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
mutex_buf[i] = CreateMutex(0, FALSE, 0); mutex_buf[i] = CreateMutex(0, FALSE, 0);
@ -78,14 +76,11 @@ int Curl_mbedtlsthreadlock_thread_cleanup(void)
return 0; /* error, no threads locks defined */ return 0; /* error, no threads locks defined */
for(i = 0; i < NUMT; i++) { for(i = 0; i < NUMT; i++) {
int ret;
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H) #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
ret = pthread_mutex_destroy(&mutex_buf[i]); if(pthread_mutex_destroy(&mutex_buf[i]))
if(ret)
return 0; /* pthread_mutex_destroy failed */ return 0; /* pthread_mutex_destroy failed */
#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H) #elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
ret = CloseHandle(mutex_buf[i]); if(!CloseHandle(mutex_buf[i]))
if(!ret)
return 0; /* CloseHandle failed */ return 0; /* CloseHandle failed */
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */ #endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
} }
@ -98,17 +93,14 @@ int Curl_mbedtlsthreadlock_thread_cleanup(void)
int Curl_mbedtlsthreadlock_lock_function(int n) int Curl_mbedtlsthreadlock_lock_function(int n)
{ {
if(n < NUMT) { if(n < NUMT) {
int ret;
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H) #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
ret = pthread_mutex_lock(&mutex_buf[n]); if(pthread_mutex_lock(&mutex_buf[n])) {
if(ret) {
DEBUGF(fprintf(stderr, DEBUGF(fprintf(stderr,
"Error: mbedtlsthreadlock_lock_function failed\n")); "Error: mbedtlsthreadlock_lock_function failed\n"));
return 0; /* pthread_mutex_lock failed */ return 0; /* pthread_mutex_lock failed */
} }
#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H) #elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
ret = (WaitForSingleObject(mutex_buf[n], INFINITE) == WAIT_FAILED?1:0); if(WaitForSingleObject(mutex_buf[n], INFINITE) == WAIT_FAILED) {
if(ret) {
DEBUGF(fprintf(stderr, DEBUGF(fprintf(stderr,
"Error: mbedtlsthreadlock_lock_function failed\n")); "Error: mbedtlsthreadlock_lock_function failed\n"));
return 0; /* pthread_mutex_lock failed */ return 0; /* pthread_mutex_lock failed */
@ -121,17 +113,14 @@ int Curl_mbedtlsthreadlock_lock_function(int n)
int Curl_mbedtlsthreadlock_unlock_function(int n) int Curl_mbedtlsthreadlock_unlock_function(int n)
{ {
if(n < NUMT) { if(n < NUMT) {
int ret;
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H) #if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
ret = pthread_mutex_unlock(&mutex_buf[n]); if(pthread_mutex_unlock(&mutex_buf[n])) {
if(ret) {
DEBUGF(fprintf(stderr, DEBUGF(fprintf(stderr,
"Error: mbedtlsthreadlock_unlock_function failed\n")); "Error: mbedtlsthreadlock_unlock_function failed\n"));
return 0; /* pthread_mutex_unlock failed */ return 0; /* pthread_mutex_unlock failed */
} }
#elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H) #elif defined(USE_THREADS_WIN32) && defined(HAVE_PROCESS_H)
ret = ReleaseMutex(mutex_buf[n]); if(!ReleaseMutex(mutex_buf[n])) {
if(!ret) {
DEBUGF(fprintf(stderr, DEBUGF(fprintf(stderr,
"Error: mbedtlsthreadlock_unlock_function failed\n")); "Error: mbedtlsthreadlock_unlock_function failed\n"));
return 0; /* pthread_mutex_lock failed */ return 0; /* pthread_mutex_lock failed */