Collapse this down to the infinately more readable apr_pool_cleanup_run().

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

1 files changed, 1 insertions, 6 deletions

diff --git a/locks/unix/thread_mutex.c b/locks/unix/thread_mutex.c
index f27b1d1cd..885fc83fd 100644
--- a/locks/unix/thread_mutex.c
+++ b/locks/unix/thread_mutex.c
@@ -228,12 +228,7 @@ APR_DECLARE(apr_status_t) apr_thread_mutex_unlock(apr_thread_mutex_t *mutex)
 
 APR_DECLARE(apr_status_t) apr_thread_mutex_destroy(apr_thread_mutex_t *mutex)
 {
-    apr_status_t rv;
-    if ((rv = thread_mutex_cleanup(mutex)) == APR_SUCCESS) {
-        apr_pool_cleanup_kill(mutex->pool, mutex, thread_mutex_cleanup);
-        return APR_SUCCESS;
-    }
-    return rv;
+    return apr_pool_cleanup_run(mutex->pool, mutex, thread_mutex_cleanup);
 }
 
 APR_POOL_IMPLEMENT_ACCESSOR(thread_mutex)