You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2013/05/07 12:56:08 UTC

svn commit: r1479853 - /apr/apr/trunk/util-misc/apu_dso.c

Author: fuankg
Date: Tue May  7 10:56:08 2013
New Revision: 1479853

URL: http://svn.apache.org/r1479853
Log:
Followup fix for incomplete patch with r1479836.

Modified:
    apr/apr/trunk/util-misc/apu_dso.c

Modified: apr/apr/trunk/util-misc/apu_dso.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/util-misc/apu_dso.c?rev=1479853&r1=1479852&r2=1479853&view=diff
==============================================================================
--- apr/apr/trunk/util-misc/apu_dso.c (original)
+++ apr/apr/trunk/util-misc/apu_dso.c Tue May  7 10:56:08 2013
@@ -73,7 +73,6 @@ static apr_status_t apu_dso_term(void *p
 apr_status_t apu_dso_init(apr_pool_t *pool)
 {
     apr_status_t ret = APR_SUCCESS;
-    apr_pool_t *global;
     apr_pool_t *parent;
 
     if (apr_atomic_inc32(&initialised)) {
@@ -91,14 +90,14 @@ apr_status_t apu_dso_init(apr_pool_t *po
          parent = apr_pool_parent_get(pool))
         pool = parent;
 
-    dsos = apr_hash_make(global);
+    dsos = apr_hash_make(pool);
 
 #if APR_HAS_THREADS
-    ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, global);
+    ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool);
     /* This already registers a pool cleanup */
 #endif
 
-    apr_pool_cleanup_register(global, NULL, apu_dso_term,
+    apr_pool_cleanup_register(pool, NULL, apu_dso_term,
                               apr_pool_cleanup_null);
 
     apr_atomic_dec32(&in_init);