apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r659344 - in /apr/apr-util/branches/1.3.x: dbd/apr_dbd.c include/private/apu_internal.h ldap/apr_ldap_stub.c misc/apu_dso.c
Date Fri, 23 May 2008 00:40:11 GMT
Author: wrowe
Date: Thu May 22 17:40:09 2008
New Revision: 659344

URL: http://svn.apache.org/viewvc?rev=659344&view=rev
Log:
Clean all lingering maintainer mode emits, and drop apu_dso_init from
the external entry points.

Backport: r659343

Modified:
    apr/apr-util/branches/1.3.x/dbd/apr_dbd.c
    apr/apr-util/branches/1.3.x/include/private/apu_internal.h
    apr/apr-util/branches/1.3.x/ldap/apr_ldap_stub.c
    apr/apr-util/branches/1.3.x/misc/apu_dso.c

Modified: apr/apr-util/branches/1.3.x/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/apr_dbd.c?rev=659344&r1=659343&r2=659344&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/dbd/apr_dbd.c (original)
+++ apr/apr-util/branches/1.3.x/dbd/apr_dbd.c Thu May 22 17:40:09 2008
@@ -26,6 +26,7 @@
 #include "apr_hash.h"
 #include "apr_thread_mutex.h"
 
+#include "apu_internal.h"
 #include "apr_dbd_internal.h"
 #include "apr_dbd.h"
 #include "apu_version.h"
@@ -93,7 +94,7 @@
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for ( ; parent = apr_pool_parent_get(pool); parent)
+    for (parent = pool;  parent; parent = apr_pool_parent_get(pool))
          pool = parent;
 
     /* deprecate in 2.0 - permit implicit initialization */

Modified: apr/apr-util/branches/1.3.x/include/private/apu_internal.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/include/private/apu_internal.h?rev=659344&r1=659343&r2=659344&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/include/private/apu_internal.h (original)
+++ apr/apr-util/branches/1.3.x/include/private/apu_internal.h Thu May 22 17:40:09 2008
@@ -32,6 +32,8 @@
  * of apu_dso_load must lock first, and not unlock until any init
  * finalization is complete.
  */ 
+apr_status_t apu_dso_init(apr_pool_t *pool);
+
 apr_status_t apu_dso_mutex_lock(void);
 apr_status_t apu_dso_mutex_unlock(void);
 

Modified: apr/apr-util/branches/1.3.x/ldap/apr_ldap_stub.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/ldap/apr_ldap_stub.c?rev=659344&r1=659343&r2=659344&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/ldap/apr_ldap_stub.c (original)
+++ apr/apr-util/branches/1.3.x/ldap/apr_ldap_stub.c Thu May 22 17:40:09 2008
@@ -36,7 +36,6 @@
     char *modname;
     apr_dso_handle_sym_t symbol;
     apr_status_t rv;
-    apr_pool_t *parent;
 
     /* deprecate in 2.0 - permit implicit initialization */
     apu_dso_init(pool);

Modified: apr/apr-util/branches/1.3.x/misc/apu_dso.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/misc/apu_dso.c?rev=659344&r1=659343&r2=659344&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/misc/apu_dso.c (original)
+++ apr/apr-util/branches/1.3.x/misc/apu_dso.c Thu May 22 17:40:09 2008
@@ -25,10 +25,10 @@
 #include "apr_dso.h"
 #include "apr_strings.h"
 #include "apr_hash.h"
-#include "apr_thread_mutex.h"
+#include "apr_file_io.h"
+#include "apr_env.h"
 
-#include "apr_dbd_internal.h"
-#include "apr_dbd.h"
+#include "apu_internal.h"
 #include "apu_version.h"
 
 
@@ -73,7 +73,7 @@
     return APR_SUCCESS;
 }
 
-APU_DECLARE(apr_status_t) apu_dso_init(apr_pool_t *pool)
+apr_status_t apu_dso_init(apr_pool_t *pool)
 {
     apr_status_t ret = APR_SUCCESS;
     apr_pool_t *global;
@@ -81,7 +81,7 @@
 
 #ifdef APU_DSO_BUILD
     /* Top level pool scope, need process-scope lifetime */
-    for (global = pool; parent = apr_pool_parent_get(global); parent)
+    for (parent = global = pool; parent; parent = apr_pool_parent_get(global))
          global = parent;
 
     if (dsos != NULL) {
@@ -112,7 +112,7 @@
     char path[APR_PATH_MAX + 1];
     apr_array_header_t *paths;
     apr_pool_t *global;
-    apr_status_t rv;
+    apr_status_t rv = APR_EDSOOPEN;
     char *eos = NULL;
     int i;
 



Mime
View raw message