renaming various functions for consistency sake

see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


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

8 files changed, 59 insertions, 59 deletions

diff --git a/locks/beos/crossproc.c b/locks/beos/crossproc.c
index b17aa28f3..a2052891b 100644
--- a/locks/beos/crossproc.c
+++ b/locks/beos/crossproc.c
@@ -81,8 +81,8 @@ apr_status_t create_inter_lock(apr_lock_t *new)
     }
     new->ben_interproc = 0;
     new->sem_interproc = stat;
-    apr_register_cleanup(new->cntxt, (void *)new, lock_inter_cleanup,
-                        apr_null_cleanup);
+    apr_pool_cleanup_register(new->cntxt, (void *)new, lock_inter_cleanup,
+                        apr_pool_cleanup_null);
     return APR_SUCCESS;
 }
 
@@ -116,7 +116,7 @@ apr_status_t destroy_inter_lock(apr_lock_t *lock)
 {
     apr_status_t stat;
     if ((stat = lock_inter_cleanup(lock)) == APR_SUCCESS) {
-        apr_kill_cleanup(lock->cntxt, lock, lock_inter_cleanup);
+        apr_pool_cleanup_kill(lock->cntxt, lock, lock_inter_cleanup);
         return APR_SUCCESS;
     }
     return stat;
diff --git a/locks/beos/intraproc.c b/locks/beos/intraproc.c
index 65cb5a3e5..57f1c9b67 100644
--- a/locks/beos/intraproc.c
+++ b/locks/beos/intraproc.c
@@ -76,8 +76,8 @@ apr_status_t create_intra_lock(apr_lock_t *new)
     }
     new->ben_intraproc = 0;
     new->sem_intraproc = stat;
-    apr_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup,
-                        apr_null_cleanup);
+    apr_pool_cleanup_register(new->cntxt, (void *)new, lock_intra_cleanup,
+                        apr_pool_cleanup_null);
     return APR_SUCCESS;
 }
 
@@ -111,7 +111,7 @@ apr_status_t destroy_intra_lock(apr_lock_t *lock)
 {
     apr_status_t stat;
     if ((stat = lock_intra_cleanup(lock)) == APR_SUCCESS) {
-        apr_kill_cleanup(lock->cntxt, lock, lock_intra_cleanup);
+        apr_pool_cleanup_kill(lock->cntxt, lock, lock_intra_cleanup);
         return APR_SUCCESS;
     }
     return stat;
diff --git a/locks/beos/locks.c b/locks/beos/locks.c
index 5302a1b59..43d921465 100644
--- a/locks/beos/locks.c
+++ b/locks/beos/locks.c
@@ -56,7 +56,7 @@
 #include "apr_strings.h"
 #include "apr_portable.h"
 
-apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, 
+apr_status_t apr_lock_create(apr_lock_t **lock, apr_locktype_e type, 
                            apr_lockscope_e scope, const char *fname, 
                            apr_pool_t *cont)
 {
@@ -86,7 +86,7 @@ apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type,
     return APR_SUCCESS;
 }
 
-apr_status_t apr_lock(apr_lock_t *lock)
+apr_status_t apr_lock_aquire(apr_lock_t *lock)
 {
     apr_status_t stat;
     
@@ -103,7 +103,7 @@ apr_status_t apr_lock(apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_unlock(apr_lock_t *lock)
+apr_status_t apr_lock_release(apr_lock_t *lock)
 {
     apr_status_t stat;
     if (lock->scope != APR_CROSS_PROCESS) {
@@ -119,7 +119,7 @@ apr_status_t apr_unlock(apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_destroy_lock(apr_lock_t *lock)
+apr_status_t apr_lock_destroy(apr_lock_t *lock)
 {
     apr_status_t stat; 
     if (lock->scope != APR_CROSS_PROCESS) {
@@ -135,7 +135,7 @@ apr_status_t apr_destroy_lock(apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname, 
+apr_status_t apr_lock_child_init(apr_lock_t **lock, const char *fname, 
 			       apr_pool_t *cont)
 {
     apr_status_t stat;
@@ -147,18 +147,18 @@ apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname,
     return APR_SUCCESS;
 }
 
-apr_status_t apr_get_lockdata(apr_lock_t *lock, const char *key, void *data)
+apr_status_t apr_lock_data_get(apr_lock_t *lock, const char *key, void *data)
 {
-    return apr_get_userdata(data, key, lock->cntxt);
+    return apr_pool_userdata_get(data, key, lock->cntxt);
 }
 
-apr_status_t apr_set_lockdata(apr_lock_t *lock, void *data, const char *key,
+apr_status_t apr_lock_data_set(apr_lock_t *lock, void *data, const char *key,
                             apr_status_t (*cleanup) (void *))
 {
-    return apr_set_userdata(data, key, cleanup, lock->cntxt);
+    return apr_pool_userdata_set(data, key, cleanup, lock->cntxt);
 }
 
-apr_status_t apr_get_os_lock(apr_os_lock_t *oslock, apr_lock_t *lock)
+apr_status_t apr_os_lock_get(apr_os_lock_t *oslock, apr_lock_t *lock)
 {
     oslock->sem_interproc = lock->sem_interproc;
     oslock->sem_intraproc = lock->sem_intraproc;
@@ -167,7 +167,7 @@ apr_status_t apr_get_os_lock(apr_os_lock_t *oslock, apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_put_os_lock(apr_lock_t **lock, apr_os_lock_t *thelock, 
+apr_status_t apr_os_lock_put(apr_lock_t **lock, apr_os_lock_t *thelock, 
                            apr_pool_t *cont)
 {
     if (cont == NULL) {
diff --git a/locks/os2/locks.c b/locks/os2/locks.c
index 45f769db1..55e48edf2 100644
--- a/locks/os2/locks.c
+++ b/locks/os2/locks.c
@@ -71,12 +71,12 @@ void setup_lock()
 static apr_status_t lock_cleanup(void *thelock)
 {
     apr_lock_t *lock = thelock;
-    return apr_destroy_lock(lock);
+    return apr_lock_destroy(lock);
 }
 
 
 
-apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, apr_lockscope_e scope, 
+apr_status_t apr_lock_create(apr_lock_t **lock, apr_locktype_e type, apr_lockscope_e scope, 
 			   const char *fname, apr_pool_t *cont)
 {
     apr_lock_t *new;
@@ -102,14 +102,14 @@ apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, apr_locksco
     *lock = new;
 
     if (!rc)
-        apr_register_cleanup(cont, new, lock_cleanup, apr_null_cleanup);
+        apr_pool_cleanup_register(cont, new, lock_cleanup, apr_pool_cleanup_null);
 
     return APR_OS2_STATUS(rc);
 }
 
 
 
-apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname,
+apr_status_t apr_lock_child_init(apr_lock_t **lock, const char *fname,
 			       apr_pool_t *cont)
 {
     int rc;
@@ -126,14 +126,14 @@ apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname,
     rc = DosOpenMutexSem( (char *)fname, &(*lock)->hMutex );
 
     if (!rc)
-        apr_register_cleanup(cont, *lock, lock_cleanup, apr_null_cleanup);
+        apr_pool_cleanup_register(cont, *lock, lock_cleanup, apr_pool_cleanup_null);
 
     return APR_OS2_STATUS(rc);
 }
 
 
 
-apr_status_t apr_lock(apr_lock_t *lock)
+apr_status_t apr_lock_aquire(apr_lock_t *lock)
 {
     ULONG rc;
     
@@ -149,7 +149,7 @@ apr_status_t apr_lock(apr_lock_t *lock)
 
 
 
-apr_status_t apr_unlock(apr_lock_t *lock)
+apr_status_t apr_lock_release(apr_lock_t *lock)
 {
     ULONG rc;
     
@@ -164,14 +164,14 @@ apr_status_t apr_unlock(apr_lock_t *lock)
 
 
 
-apr_status_t apr_destroy_lock(apr_lock_t *lock)
+apr_status_t apr_lock_destroy(apr_lock_t *lock)
 {
     ULONG rc;
     apr_status_t stat = APR_SUCCESS;
 
     if (lock->owner == CurrentTid) {
         while (lock->lock_count > 0 && stat == APR_SUCCESS)
-            stat = apr_unlock(lock);
+            stat = apr_lock_release(lock);
     }
 
     if (stat != APR_SUCCESS)
diff --git a/locks/unix/crossproc.c b/locks/unix/crossproc.c
index f140183e1..050e9c4e5 100644
--- a/locks/unix/crossproc.c
+++ b/locks/unix/crossproc.c
@@ -99,7 +99,7 @@ apr_status_t apr_unix_create_inter_lock(apr_lock_t *new)
         return errno;
     }
     new->curr_locked = 0;
-    apr_register_cleanup(new->cntxt, (void *)new, lock_cleanup, apr_null_cleanup);
+    apr_pool_cleanup_register(new->cntxt, (void *)new, lock_cleanup, apr_pool_cleanup_null);
     return APR_SUCCESS;
 }
 
@@ -136,7 +136,7 @@ apr_status_t apr_unix_destroy_inter_lock(apr_lock_t *lock)
     apr_status_t stat;
 
     if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
-        apr_kill_cleanup(lock->cntxt, lock, lock_cleanup);
+        apr_pool_cleanup_kill(lock->cntxt, lock, lock_cleanup);
         return APR_SUCCESS;
     }
     return stat;
@@ -222,7 +222,7 @@ apr_status_t apr_unix_create_inter_lock(apr_lock_t *new)
     }
 
     new->curr_locked = 0;
-    apr_register_cleanup(new->cntxt, (void *)new, lock_cleanup, apr_null_cleanup);
+    apr_pool_cleanup_register(new->cntxt, (void *)new, lock_cleanup, apr_pool_cleanup_null);
     return APR_SUCCESS;
 }
 
@@ -258,7 +258,7 @@ apr_status_t apr_unix_destroy_inter_lock(apr_lock_t *lock)
 {
     apr_status_t stat;
     if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
-        apr_kill_cleanup(lock->cntxt, lock, lock_cleanup);
+        apr_pool_cleanup_kill(lock->cntxt, lock, lock_cleanup);
         return APR_SUCCESS;
     }
     return stat;
@@ -315,7 +315,7 @@ apr_status_t apr_unix_create_inter_lock(apr_lock_t *new)
 
     new->curr_locked=0;
     unlink(new->fname);
-    apr_register_cleanup(new->cntxt, new, lock_cleanup, apr_null_cleanup);
+    apr_pool_cleanup_register(new->cntxt, new, lock_cleanup, apr_pool_cleanup_null);
     return APR_SUCCESS; 
 }
 
@@ -351,7 +351,7 @@ apr_status_t apr_unix_destroy_inter_lock(apr_lock_t *lock)
 {
     apr_status_t stat;
     if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
-        apr_kill_cleanup(lock->cntxt, lock, lock_cleanup);
+        apr_pool_cleanup_kill(lock->cntxt, lock, lock_cleanup);
         return APR_SUCCESS;
     }
     return stat;
@@ -395,7 +395,7 @@ apr_status_t apr_unix_create_inter_lock(apr_lock_t *new)
         return errno;
     }
     new->curr_locked = 0;
-    apr_register_cleanup(new->cntxt, (void *)new, lock_cleanup, apr_null_cleanup);
+    apr_pool_cleanup_register(new->cntxt, (void *)new, lock_cleanup, apr_pool_cleanup_null);
     return APR_SUCCESS;
 }
 
@@ -431,7 +431,7 @@ apr_status_t apr_unix_destroy_inter_lock(apr_lock_t *lock)
 {
     apr_status_t stat;
     if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
-        apr_kill_cleanup(lock->cntxt, lock, lock_cleanup);
+        apr_pool_cleanup_kill(lock->cntxt, lock, lock_cleanup);
         return APR_SUCCESS;
     }
     return stat;
diff --git a/locks/unix/intraproc.c b/locks/unix/intraproc.c
index 514d6a83e..cd9c0f666 100644
--- a/locks/unix/intraproc.c
+++ b/locks/unix/intraproc.c
@@ -108,8 +108,8 @@ apr_status_t apr_unix_create_intra_lock(apr_lock_t *new)
     }
 
     new->curr_locked = 0;
-    apr_register_cleanup(new->cntxt, (void *)new, lock_intra_cleanup,
-                        apr_null_cleanup);
+    apr_pool_cleanup_register(new->cntxt, (void *)new, lock_intra_cleanup,
+                        apr_pool_cleanup_null);
     return APR_SUCCESS;
 }
 
@@ -143,7 +143,7 @@ apr_status_t apr_unix_destroy_intra_lock(apr_lock_t *lock)
 {
     apr_status_t stat;
     if ((stat = lock_intra_cleanup(lock)) == APR_SUCCESS) {
-        apr_kill_cleanup(lock->cntxt, lock, lock_intra_cleanup);
+        apr_pool_cleanup_kill(lock->cntxt, lock, lock_intra_cleanup);
         return APR_SUCCESS;
     }
     return stat;
diff --git a/locks/unix/locks.c b/locks/unix/locks.c
index 8104e22fe..841433022 100644
--- a/locks/unix/locks.c
+++ b/locks/unix/locks.c
@@ -56,7 +56,7 @@
 #include "apr_strings.h"
 #include "apr_portable.h"
 
-apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, 
+apr_status_t apr_lock_create(apr_lock_t **lock, apr_locktype_e type, 
                            apr_lockscope_e scope, const char *fname, 
                            apr_pool_t *cont)
 {
@@ -101,7 +101,7 @@ apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type,
     return APR_SUCCESS;
 }
 
-apr_status_t apr_lock(apr_lock_t *lock)
+apr_status_t apr_lock_aquire(apr_lock_t *lock)
 {
     apr_status_t stat;
 #if APR_PROCESS_LOCK_IS_GLOBAL /* don't need intra lock for APR_LOCKALL */
@@ -125,7 +125,7 @@ apr_status_t apr_lock(apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_unlock(apr_lock_t *lock)
+apr_status_t apr_lock_release(apr_lock_t *lock)
 {
     apr_status_t stat;
 
@@ -150,7 +150,7 @@ apr_status_t apr_unlock(apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_destroy_lock(apr_lock_t *lock)
+apr_status_t apr_lock_destroy(apr_lock_t *lock)
 {
     apr_status_t stat;
 #if APR_PROCESS_LOCK_IS_GLOBAL /* don't need intra lock for APR_LOCKALL */
@@ -176,7 +176,7 @@ apr_status_t apr_destroy_lock(apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname, 
+apr_status_t apr_lock_child_init(apr_lock_t **lock, const char *fname, 
                                apr_pool_t *cont)
 {
     apr_status_t stat;
@@ -188,18 +188,18 @@ apr_status_t apr_child_init_lock(apr_lock_t **lock, const char *fname,
     return APR_SUCCESS;
 }
 
-apr_status_t apr_get_lockdata(apr_lock_t *lock, const char *key, void *data)
+apr_status_t apr_lock_data_get(apr_lock_t *lock, const char *key, void *data)
 {
-    return apr_get_userdata(data, key, lock->cntxt);
+    return apr_pool_userdata_get(data, key, lock->cntxt);
 }
 
-apr_status_t apr_set_lockdata(apr_lock_t *lock, void *data, const char *key,
+apr_status_t apr_lock_data_set(apr_lock_t *lock, void *data, const char *key,
                             apr_status_t (*cleanup) (void *))
 {
-    return apr_set_userdata(data, key, cleanup, lock->cntxt);
+    return apr_pool_userdata_set(data, key, cleanup, lock->cntxt);
 }
 
-apr_status_t apr_get_os_lock(apr_os_lock_t *oslock, apr_lock_t *lock)
+apr_status_t apr_os_lock_get(apr_os_lock_t *oslock, apr_lock_t *lock)
 {
     oslock->crossproc = lock->interproc;
 #if APR_HAS_THREADS
@@ -211,7 +211,7 @@ apr_status_t apr_get_os_lock(apr_os_lock_t *oslock, apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-apr_status_t apr_put_os_lock(apr_lock_t **lock, apr_os_lock_t *thelock, 
+apr_status_t apr_os_lock_put(apr_lock_t **lock, apr_os_lock_t *thelock, 
                            apr_pool_t *cont)
 {
     if (cont == NULL) {
diff --git a/locks/win32/locks.c b/locks/win32/locks.c
index 701e2c281..fa802ce66 100644
--- a/locks/win32/locks.c
+++ b/locks/win32/locks.c
@@ -57,7 +57,7 @@
 #include "win32/locks.h"
 #include "apr_portable.h"
 
-APR_DECLARE(apr_status_t) apr_create_lock(apr_lock_t **lock, 
+APR_DECLARE(apr_status_t) apr_lock_create(apr_lock_t **lock, 
                                           apr_locktype_e type, 
                                           apr_lockscope_e scope, 
                                           const char *fname,
@@ -94,7 +94,7 @@ APR_DECLARE(apr_status_t) apr_create_lock(apr_lock_t **lock,
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_child_init_lock(apr_lock_t **lock, 
+APR_DECLARE(apr_status_t) apr_lock_child_init(apr_lock_t **lock, 
                                               const char *fname, 
                                               apr_pool_t *cont)
 {
@@ -115,7 +115,7 @@ APR_DECLARE(apr_status_t) apr_child_init_lock(apr_lock_t **lock,
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_lock(apr_lock_t *lock)
+APR_DECLARE(apr_status_t) apr_lock_aquire(apr_lock_t *lock)
 {
     DWORD rv;
     if (lock->scope == APR_INTRAPROCESS) {
@@ -131,7 +131,7 @@ APR_DECLARE(apr_status_t) apr_lock(apr_lock_t *lock)
     return apr_get_os_error();
 }
 
-APR_DECLARE(apr_status_t) apr_unlock(apr_lock_t *lock)
+APR_DECLARE(apr_status_t) apr_lock_release(apr_lock_t *lock)
 {
     if (lock->scope == APR_INTRAPROCESS) {
         LeaveCriticalSection(&lock->section);
@@ -144,7 +144,7 @@ APR_DECLARE(apr_status_t) apr_unlock(apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_destroy_lock(apr_lock_t *lock)
+APR_DECLARE(apr_status_t) apr_lock_destroy(apr_lock_t *lock)
 {
     if (lock->scope == APR_INTRAPROCESS) {
         DeleteCriticalSection(&lock->section);
@@ -157,27 +157,27 @@ APR_DECLARE(apr_status_t) apr_destroy_lock(apr_lock_t *lock)
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_get_lockdata(apr_lock_t *lock, const char *key,
+APR_DECLARE(apr_status_t) apr_lock_data_get(apr_lock_t *lock, const char *key,
                                            void *data)
 {
-    return apr_get_userdata(data, key, lock->cntxt);
+    return apr_pool_userdata_get(data, key, lock->cntxt);
 }
 
-APR_DECLARE(apr_status_t) apr_set_lockdata(apr_lock_t *lock, void *data,
+APR_DECLARE(apr_status_t) apr_lock_data_set(apr_lock_t *lock, void *data,
                                            const char *key,
                                            apr_status_t (*cleanup) (void *))
 {
-    return apr_set_userdata(data, key, cleanup, lock->cntxt);
+    return apr_pool_userdata_set(data, key, cleanup, lock->cntxt);
 }
 
-APR_DECLARE(apr_status_t) apr_get_os_lock(apr_os_lock_t *thelock,
+APR_DECLARE(apr_status_t) apr_os_lock_get(apr_os_lock_t *thelock,
                                           apr_lock_t *lock)
 {
     *thelock = lock->mutex;
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_put_os_lock(apr_lock_t **lock,
+APR_DECLARE(apr_status_t) apr_os_lock_put(apr_lock_t **lock,
                                           apr_os_lock_t *thelock,
                                           apr_pool_t *cont)
 {