httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r775256 - in /httpd/httpd/trunk/modules/slotmem: mod_slotmem_plain.c mod_slotmem_shm.c
Date Fri, 15 May 2009 17:45:28 GMT
Author: jim
Date: Fri May 15 17:45:27 2009
New Revision: 775256

URL: http://svn.apache.org/viewvc?rev=775256&view=rev
Log:
Align internal names with external... Note, rename
of return to release for obvious reserved keyword
reasons :)

Modified:
    httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
    httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c

Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c?rev=775256&r1=775255&r2=775256&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c Fri May 15 17:45:27 2009
@@ -127,7 +127,7 @@
     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 @@
     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 @@
     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 @@
     &slotmem_do,
     &slotmem_create,
     &slotmem_attach,
-    &slotmem_mem,
+    &slotmem_dptr,
     &slotmem_get,
     &slotmem_put,
     &slotmem_num_slots,

Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=775256&r1=775255&r2=775256&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Fri May 15 17:45:27 2009
@@ -198,7 +198,7 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 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,



Mime
View raw message