commit 6eccd0301b345693b5c606bd18c4ec7aba198554
author Yann Ylavic <ylavic@apache.org> Tue Nov 24 21:12:37 2020 +0000
committer Yann Ylavic <ylavic@apache.org> Tue Nov 24 21:12:37 2020 +0000
tree 7f0907696c37d7081f32ffe455dfdc557ecbe552
parent 6c62ba9cb9370e8f8c5dbd23cdc4f6b972b7adaf

apr_pools: follow up to r1883750 and r1883800.

After r1883800, the mutex of a pool in APR_POOL_DEBUG can't be NULL, so
remove useless NULL checks around locking.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1883801 13f79535-47bb-0310-9956-ffa450edef68

memory/unix/apr_pools.c

diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index 52b8340..15d429e 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -1501,9 +1501,7 @@
         return rv;
 
 #if APR_HAS_THREADS
-    if (pool->mutex) {
-        apr_thread_mutex_lock(pool->mutex);
-                        }
+    apr_thread_mutex_lock(pool->mutex);
 #endif /* APR_HAS_THREADS */
 
     child = pool->child;
@@ -1516,9 +1514,7 @@
     }
 
 #if APR_HAS_THREADS
-    if (pool->mutex) {
-        apr_thread_mutex_unlock(pool->mutex);
-    }
+    apr_thread_mutex_unlock(pool->mutex);
 #endif /* APR_HAS_THREADS */
 
     return rv;
@@ -1958,18 +1954,14 @@
     /* Remove the pool from the parents child list */
     if (pool->parent) {
 #if APR_HAS_THREADS
-        apr_thread_mutex_t *mutex;
-
-        if ((mutex = pool->parent->mutex) != NULL)
-            apr_thread_mutex_lock(mutex);
+        apr_thread_mutex_lock(pool->parent->mutex);
 #endif /* APR_HAS_THREADS */
 
         if ((*pool->ref = pool->sibling) != NULL)
             pool->sibling->ref = pool->ref;
 
 #if APR_HAS_THREADS
-        if (mutex)
-            apr_thread_mutex_unlock(mutex);
+        apr_thread_mutex_unlock(pool->parent->mutex);
 #endif /* APR_HAS_THREADS */
     }
 
@@ -2060,9 +2052,9 @@
 
     if ((pool->parent = parent) != NULL) {
 #if APR_HAS_THREADS
-        if (parent->mutex)
-            apr_thread_mutex_lock(parent->mutex);
+        apr_thread_mutex_lock(parent->mutex);
 #endif /* APR_HAS_THREADS */
+
         if ((pool->sibling = parent->child) != NULL)
             pool->sibling->ref = &pool->sibling;
 
@@ -2070,8 +2062,7 @@
         pool->ref = &parent->child;
 
 #if APR_HAS_THREADS
-        if (parent->mutex)
-            apr_thread_mutex_unlock(parent->mutex);
+        apr_thread_mutex_unlock(parent->mutex);
 #endif /* APR_HAS_THREADS */
     }
     else {