Commit 23e6bf04 authored by Dmitry Kostjuchenko's avatar Dmitry Kostjuchenko Committed by Richard Levitte
Browse files

Corrections according the review comments. 



Updated indentations according project rules, renamed file-local define to the shorter version - USE_RWLOCK, fixed declaration after the if statement in CRYPTO_THREAD_lock_new().
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1981)
(cherry picked from commit ec93a292)
parent 90078aa0

crypto/threads_pthread.c

+22 −21
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ 
#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)



# ifdef PTHREAD_RWLOCK_INITIALIZER

    #define OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK

#  define USE_RWLOCK

# endif



CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)

{

#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK

# ifdef USE_RWLOCK

    CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_rwlock_t));

    if (lock == NULL)

        return NULL;
@@ -27,11 +27,12 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void) 
        return NULL;

    }

# else

    pthread_mutexattr_t attr;



    CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_mutex_t));

    if (lock == NULL)

        return NULL;



    pthread_mutexattr_t attr;

    pthread_mutexattr_init(&attr);

    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
@@ -49,7 +50,7 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void) 


int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)

{

#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK

# ifdef USE_RWLOCK

    if (pthread_rwlock_rdlock(lock) != 0)

        return 0;

# else
@@ -62,7 +63,7 @@ int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock) 


int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)

{

#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK

# ifdef USE_RWLOCK

    if (pthread_rwlock_wrlock(lock) != 0)

        return 0;

# else
@@ -75,7 +76,7 @@ int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock) 


int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)

{

#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK

# ifdef USE_RWLOCK

    if (pthread_rwlock_unlock(lock) != 0)

        return 0;

# else
@@ -91,7 +92,7 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock) 
    if (lock == NULL)

        return;



#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK

# ifdef USE_RWLOCK

    pthread_rwlock_destroy(lock);

# else

    pthread_mutex_destroy(lock);