A couple of changes...

- rename the CLEANUP macros so they make more sense (I hope)
- cntxt -> pool in the lock code and macro's

No functional change.


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

5 files changed, 10 insertions, 10 deletions

diff --git a/include/apr_lock.h b/include/apr_lock.h
index 9c5e08fdf..0f495cec2 100644
--- a/include/apr_lock.h
+++ b/include/apr_lock.h
@@ -94,16 +94,16 @@ typedef enum {APR_READER, APR_WRITER} apr_readerwriter_e;
  * @param fname A file name to use if the lock mechanism requires one.  This
  *        argument should always be provided.  The lock code itself will
  *        determine if it should be used.
- * @param cont The pool to operate on.
+ * @param pool The pool to operate on.
  * @tip APR_CROSS_PROCESS may lock both processes and threads, but it is
  *      only guaranteed to lock processes.
- * @deffunc 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)
+ * @deffunc apr_status_t apr_lock_create(apr_lock_t **lock, apr_locktype_e type, apr_lockscope_e scope, const char *fname, apr_pool_t *pool)
  */
 APR_DECLARE(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_pool_t *pool);
 
 /**
  * Lock a protected region.
@@ -144,16 +144,16 @@ APR_DECLARE(apr_status_t) apr_lock_destroy(apr_lock_t *lock);
  *              argument should always be provided.  The lock code itself will
  *              determine if it should be used.  This filename should be the 
  *              same one that was passed to apr_lock_create
- * @param cont The pool to operate on.
+ * @param pool The pool to operate on.
  * @tip This function doesn't always do something, it depends on the
  *      locking mechanism chosen for the platform, but it is a good
  *      idea to call it regardless, because it makes the code more
  *      portable. 
- * @deffunc apr_status_t apr_lock_child_init(apr_lock_t **lock, const char *fname, apr_pool_t *cont)
+ * @deffunc apr_status_t apr_lock_child_init(apr_lock_t **lock, const char *fname, apr_pool_t *pool)
  */
 APR_DECLARE(apr_status_t) apr_lock_child_init(apr_lock_t **lock,
                                               const char *fname,
-                                              apr_pool_t *cont);
+                                              apr_pool_t *pool);
 
 /**
  * Return the pool associated with the current lock.
diff --git a/include/arch/beos/locks.h b/include/arch/beos/locks.h
index 387c536ef..39f48e319 100644
--- a/include/arch/beos/locks.h
+++ b/include/arch/beos/locks.h
@@ -63,7 +63,7 @@
 #include "apr_sms.h"
 
 struct apr_lock_t {
-    apr_pool_t *cntxt;
+    apr_pool_t *pool;
     apr_sms_t *mem_sys;
     apr_locktype_e type;
     apr_lockscope_e scope;
diff --git a/include/arch/os2/locks.h b/include/arch/os2/locks.h
index d3edf99d8..09e700d00 100644
--- a/include/arch/os2/locks.h
+++ b/include/arch/os2/locks.h
@@ -60,7 +60,7 @@
 #include "apr_sms.h"
 
 struct apr_lock_t {
-    apr_pool_t *cntxt;
+    apr_pool_t *pool;
     apr_sms_t *mem_sys;
     apr_locktype_e type;
     apr_lockscope_e scope;
diff --git a/include/arch/unix/locks.h b/include/arch/unix/locks.h
index e34dcc769..2a062190c 100644
--- a/include/arch/unix/locks.h
+++ b/include/arch/unix/locks.h
@@ -109,7 +109,7 @@ union semun {
 #endif
 
 struct apr_lock_t {
-    apr_pool_t *cntxt;
+    apr_pool_t *pool;
     apr_sms_t *mem_sys;
     apr_locktype_e type;
     apr_lockscope_e scope;
diff --git a/include/arch/win32/locks.h b/include/arch/win32/locks.h
index 1083e685e..98cb41f95 100644
--- a/include/arch/win32/locks.h
+++ b/include/arch/win32/locks.h
@@ -59,7 +59,7 @@
 #include "apr_sms.h"
 
 struct apr_lock_t {
-    apr_pool_t *cntxt;
+    apr_pool_t *pool;
     apr_sms_t *mem_sys;
     apr_locktype_e type;
     apr_lockscope_e scope;