Align internal names with external... Note, rename

of return to release for obvious reserved keyword
reasons :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775256 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/slotmem/mod_slotmem_plain.c b/modules/slotmem/mod_slotmem_plain.c
index f07725eef076bfc5ed62f255102fee0ed0029c98..8b8f7e4211c62c60b107833cef22ba624e4e659f 100644 (file)
--- a/modules/slotmem/mod_slotmem_plain.c
+++ b/modules/slotmem/mod_slotmem_plain.c
@@ -127,7 +127,7 @@ static apr_status_t slotmem_attach(ap_slotmem_instance_t **new, const char *name
     return APR_ENOSHMAVAIL;
 }
 
-static apr_status_t slotmem_mem(ap_slotmem_instance_t *score, unsigned int id, void **mem)
+static apr_status_t slotmem_dptr(ap_slotmem_instance_t *score, unsigned int id, void **mem)
 {
 
     void *ptr;
@@ -150,7 +150,7 @@ static apr_status_t slotmem_get(ap_slotmem_instance_t *slot, unsigned int id, un
     void *ptr;
     apr_status_t ret;
 
-    ret = slotmem_mem(slot, id, &ptr);
+    ret = slotmem_dptr(slot, id, &ptr);
     if (ret != APR_SUCCESS) {
         return ret;
     }
@@ -164,7 +164,7 @@ static apr_status_t slotmem_put(ap_slotmem_instance_t *slot, unsigned int id, un
     void *ptr;
     apr_status_t ret;
 
-    ret = slotmem_mem(slot, id, &ptr);
+    ret = slotmem_dptr(slot, id, &ptr);
     if (ret != APR_SUCCESS) {
         return ret;
     }
@@ -187,7 +187,7 @@ static const ap_slotmem_provider_t storage = {
     &slotmem_do,
     &slotmem_create,
     &slotmem_attach,
-    &slotmem_mem,
+    &slotmem_dptr,
     &slotmem_get,
     &slotmem_put,
     &slotmem_num_slots,

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 87e538c25435ec81dbc33c041c47704d16bad75b..1a7a5129665ba43d67e41c5c9e9beeb0f10496cd 100644 (file)
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -198,7 +198,7 @@ static apr_status_t cleanup_slotmem(void *param)
     return APR_SUCCESS;
 }
 
-static apr_status_t slotmem_do(ap_slotmem_instance_t *mem, ap_slotmem_callback_fn_t *func, void *data, apr_pool_t *pool)
+static apr_status_t slotmem_doall(ap_slotmem_instance_t *mem, ap_slotmem_callback_fn_t *func, void *data, apr_pool_t *pool)
 {
     unsigned int i;
     void *ptr;
@@ -405,7 +405,7 @@ static apr_status_t slotmem_attach(ap_slotmem_instance_t **new, const char *name
     return APR_SUCCESS;
 }
 
-static apr_status_t slotmem_mem(ap_slotmem_instance_t *slot, unsigned int id, void **mem)
+static apr_status_t slotmem_dptr(ap_slotmem_instance_t *slot, unsigned int id, void **mem)
 {
     void *ptr;
 
@@ -438,7 +438,7 @@ static apr_status_t slotmem_get(ap_slotmem_instance_t *slot, unsigned int id, un
     if (id >= slot->num || (AP_SLOTMEM_IS_PREGRAB(slot) && !*inuse)) {
         return APR_NOTFOUND;
     }
-    ret = slotmem_mem(slot, id, &ptr);
+    ret = slotmem_dptr(slot, id, &ptr);
     if (ret != APR_SUCCESS) {
         return ret;
     }
@@ -460,7 +460,7 @@ static apr_status_t slotmem_put(ap_slotmem_instance_t *slot, unsigned int id, un
     if (id >= slot->num || (AP_SLOTMEM_IS_PREGRAB(slot) && !*inuse)) {
         return APR_NOTFOUND;
     }
-    ret = slotmem_mem(slot, id, &ptr);
+    ret = slotmem_dptr(slot, id, &ptr);
     if (ret != APR_SUCCESS) {
         return ret;
     }
@@ -506,7 +506,7 @@ static apr_status_t slotmem_grab(ap_slotmem_instance_t *slot, unsigned int *id)
     return APR_SUCCESS;
 }
 
-static apr_status_t slotmem_return(ap_slotmem_instance_t *slot, unsigned int id)
+static apr_status_t slotmem_release(ap_slotmem_instance_t *slot, unsigned int id)
 {
     char *inuse;
 
@@ -525,10 +525,10 @@ static apr_status_t slotmem_return(ap_slotmem_instance_t *slot, unsigned int id)
 
 static const ap_slotmem_provider_t storage = {
     "sharedmem",
-    &slotmem_do,
+    &slotmem_doall,
     &slotmem_create,
     &slotmem_attach,
-    &slotmem_mem,
+    &slotmem_dptr,
     &slotmem_get,
     &slotmem_put,
     &slotmem_num_slots,