romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-20 14:11:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

mbedtls: replace macro constant with CURL_ARRAYSIZE()

Browse source 
Also move from `int` to `size_t` for index variables.

Closes #19762
This commit is contained in:
Viktor Szakats 2025-11-29 19:51:45 +01:00
parent 985f86f0be
commit c3add7130d
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/vtls/mbedtls_threadlock.c
View file

@ -37,17 +37,14 @@
#include "mbedtls_threadlock.h"
/* number of thread locks */
#define NUMT 2
/* This array stores the mutexes available to Mbedtls */
static MBEDTLS_MUTEX_T mutex_buf[NUMT];
/* This array stores the mutexes available to mbedTLS */
static MBEDTLS_MUTEX_T mutex_buf[2];
int Curl_mbedtlsthreadlock_thread_setup(void)
{
int i;
size_t i;
for(i = 0; i < NUMT; i++) {
for(i = 0; i < CURL_ARRAYSIZE(mutex_buf); i++) {
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
if(pthread_mutex_init(&mutex_buf[i], NULL))
return 0; /* pthread_mutex_init failed */
@ -63,9 +60,9 @@ int Curl_mbedtlsthreadlock_thread_setup(void)
int Curl_mbedtlsthreadlock_thread_cleanup(void)
{
int i;
size_t i;
for(i = 0; i < NUMT; i++) {
for(i = 0; i < CURL_ARRAYSIZE(mutex_buf); i++) {
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
if(pthread_mutex_destroy(&mutex_buf[i]))
return 0; /* pthread_mutex_destroy failed */
@ -78,9 +75,9 @@ int Curl_mbedtlsthreadlock_thread_cleanup(void)
return 1; /* OK */
}
int Curl_mbedtlsthreadlock_lock_function(int n)
int Curl_mbedtlsthreadlock_lock_function(size_t n)
{
if(n < NUMT) {
if(n < CURL_ARRAYSIZE(mutex_buf)) {
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
if(pthread_mutex_lock(&mutex_buf[n])) {
DEBUGF(curl_mfprintf(stderr, "Error: "
@ -98,9 +95,9 @@ int Curl_mbedtlsthreadlock_lock_function(int n)
return 1; /* OK */
}
int Curl_mbedtlsthreadlock_unlock_function(int n)
int Curl_mbedtlsthreadlock_unlock_function(size_t n)
{
if(n < NUMT) {
if(n < CURL_ARRAYSIZE(mutex_buf)) {
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
if(pthread_mutex_unlock(&mutex_buf[n])) {
DEBUGF(curl_mfprintf(stderr, "Error: "

4
lib/vtls/mbedtls_threadlock.h
View file

@ -33,8 +33,8 @@
int Curl_mbedtlsthreadlock_thread_setup(void);
int Curl_mbedtlsthreadlock_thread_cleanup(void);
int Curl_mbedtlsthreadlock_lock_function(int n);
int Curl_mbedtlsthreadlock_unlock_function(int n);
int Curl_mbedtlsthreadlock_lock_function(size_t n);
int Curl_mbedtlsthreadlock_unlock_function(size_t n);
#else