ap_slotmem_mem no longer exists. We never provide the ptr to

the actual mem. Instead, we rely solely on getter/setter

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

diff --git a/include/ap_slotmem.h b/include/ap_slotmem.h
index e59ef72096c8c970229cd4204a379f3bc410736e..aac7ea046ff719516df628f1bc793cac5ad67e74 100644 (file)
--- a/include/ap_slotmem.h
+++ b/include/ap_slotmem.h
@@ -100,14 +100,6 @@ struct ap_slotmem_storage_method {
      * @return APR_SUCCESS if all went well
      */
     apr_status_t (* slotmem_attach)(ap_slotmem_t **new, const char *name, apr_size_t *item_size, unsigned int *item_num, apr_pool_t *pool);
-    /**
-     * get the memory ptr associated with this worker slot.
-     * @param s ap_slotmem_t to use.
-     * @param item_id item to return for 0 to item_num
-     * @param mem address to store the pointer to the slot
-     * @return APR_SUCCESS if all went well
-     */
-    apr_status_t (* slotmem_mem)(ap_slotmem_t *s, unsigned int item_id, void**mem);
     /**
      * retrieve the memory associated with this worker slot.
      * @param s ap_slotmem_t to use.
@@ -197,15 +189,6 @@ AP_DECLARE(apr_status_t) ap_slotmem_create(ap_slotmem_storage_method *sm, ap_slo
  * @return APR_SUCCESS if all went well
  */
 AP_DECLARE(apr_status_t) ap_slotmem_attach(ap_slotmem_storage_method *sm, ap_slotmem_t **new, const char *name, apr_size_t *item_size, unsigned int *item_num, apr_pool_t *pool);
-/**
- * get the memory associated with this worker slot.
- * @param sm ap_slotmem_storage_method provider obtained
- * @param s ap_slotmem_t to use.
- * @param item_id item to return for 0 to item_num
- * @param mem address to store the pointer to the slot
- * @return APR_SUCCESS if all went well
- */
-AP_DECLARE(apr_status_t) ap_slotmem_mem(ap_slotmem_storage_method *sm, ap_slotmem_t *s, unsigned int item_id, void**mem);
 /**
  * retrieve the memory associated with this worker slot.
  * @param sm ap_slotmem_storage_method provider obtained

diff --git a/modules/mem/mod_plainmem.c b/modules/mem/mod_plainmem.c
index c087908169ddb5e5990271f48b2b3257836fa71c..33e63eb0b8979b15dce2fa6648735c3e06a2a947 100644 (file)
--- a/modules/mem/mod_plainmem.c
+++ b/modules/mem/mod_plainmem.c
@@ -192,7 +192,6 @@ static const ap_slotmem_storage_method storage = {
     &slotmem_do,
     &slotmem_create,
     &slotmem_attach,
-    &slotmem_mem,
     &slotmem_get,
     &slotmem_put,
     &slotmem_num_slots,

diff --git a/modules/mem/mod_sharedmem.c b/modules/mem/mod_sharedmem.c
index 1b83ea8ee8731fc93f11816d202319b6fc107e53..f66eff8e4f25e0138e5a9d8dc05d2de29d44a5e3 100644 (file)
--- a/modules/mem/mod_sharedmem.c
+++ b/modules/mem/mod_sharedmem.c
@@ -492,7 +492,6 @@ static const ap_slotmem_storage_method storage = {
     &slotmem_do,
     &slotmem_create,
     &slotmem_attach,
-    &slotmem_mem,
     &slotmem_get,
     &slotmem_put,
     &slotmem_num_slots,

diff --git a/server/slotmem.c b/server/slotmem.c
index 2517e2f934851ff56664458ee37bb28cf8cf320f..d7ddd06760e86176867872c8deb49ebcd91da03c 100644 (file)
--- a/server/slotmem.c
+++ b/server/slotmem.c
@@ -56,12 +56,6 @@ AP_DECLARE(apr_status_t) ap_slotmem_attach(ap_slotmem_storage_method *sm,
     return (sm->slotmem_attach(new, name, item_size, item_num, pool));
 }
 
-AP_DECLARE(apr_status_t) ap_slotmem_mem(ap_slotmem_storage_method *sm,
-                                        ap_slotmem_t *s, unsigned int item_id, void**mem)
-{
-    return (sm->slotmem_mem(s, item_id, mem));
-}
-
 AP_DECLARE(apr_status_t) ap_slotmem_get(ap_slotmem_storage_method *sm,
                                         ap_slotmem_t *s, unsigned int item_id,
                                         unsigned char *dest, apr_size_t dest_len)