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: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1981)

diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index f10757c5dc4737ca49b0e3b049c3fad961667dbe..4ba47966a6c134eaf2b285c73d346e0a6567cfed 100644 (file)
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -11,13 +11,13 @@
 
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
 
 
 #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
 

-#ifdef PTHREAD_RWLOCK_INITIALIZER
-    #define OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
-#endif
+# ifdef PTHREAD_RWLOCK_INITIALIZER
+#  define USE_RWLOCK
+# endif

 
 CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
 {
 
 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;
     CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_rwlock_t));
     if (lock == NULL)
         return NULL;


@@ -26,62 +26,63 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
         OPENSSL_free(lock);
         return NULL;
     }
         OPENSSL_free(lock);
         return NULL;
     }

-#else
+# else
+    pthread_mutexattr_t attr;
+

     CRYPTO_RWLOCK *lock = OPENSSL_zalloc(sizeof(pthread_mutex_t));
     if (lock == NULL)
         return NULL;
 
     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);
     pthread_mutexattr_init(&attr);
     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);

-    
+       

     if (pthread_mutex_init(lock, &attr) != 0) {
         pthread_mutexattr_destroy(&attr);
         OPENSSL_free(lock);
         return NULL;
     }
     if (pthread_mutex_init(lock, &attr) != 0) {
         pthread_mutexattr_destroy(&attr);
         OPENSSL_free(lock);
         return NULL;
     }

-
+       

     pthread_mutexattr_destroy(&attr);
     pthread_mutexattr_destroy(&attr);

-#endif
+# endif

 
     return lock;
 }
 
 int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *lock)
 {
 
     return lock;
 }
 
 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;
     if (pthread_rwlock_rdlock(lock) != 0)
         return 0;

-#else
+# else

     if (pthread_mutex_lock(lock) != 0)
         return 0;
     if (pthread_mutex_lock(lock) != 0)
         return 0;

-#endif
+# endif

 
     return 1;
 }
 
 int CRYPTO_THREAD_write_lock(CRYPTO_RWLOCK *lock)
 {
 
     return 1;
 }
 
 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;
     if (pthread_rwlock_wrlock(lock) != 0)
         return 0;

-#else
+# else

     if (pthread_mutex_lock(lock) != 0)
         return 0;
     if (pthread_mutex_lock(lock) != 0)
         return 0;

-#endif
+# endif

 
     return 1;
 }
 
 int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
 {
 
     return 1;
 }
 
 int CRYPTO_THREAD_unlock(CRYPTO_RWLOCK *lock)
 {

-#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
+# ifdef USE_RWLOCK

     if (pthread_rwlock_unlock(lock) != 0)
         return 0;
     if (pthread_rwlock_unlock(lock) != 0)
         return 0;

-#else
+# else

     if (pthread_mutex_unlock(lock) != 0)
         return 0;
     if (pthread_mutex_unlock(lock) != 0)
         return 0;

-#endif
+# endif

 
     return 1;
 }
 
     return 1;
 }


@@ -91,11 +92,11 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock)
     if (lock == NULL)
         return;
 
     if (lock == NULL)
         return;
 

-#ifdef OPENSSL_THREADS_HAVE_PTHREAD_RWLOCK
+# ifdef USE_RWLOCK

     pthread_rwlock_destroy(lock);
     pthread_rwlock_destroy(lock);

-#else
+# else

     pthread_mutex_destroy(lock);
     pthread_mutex_destroy(lock);

-#endif
+# endif

     OPENSSL_free(lock);
 
     return;
     OPENSSL_free(lock);
 
     return;