rename the new retained-data APIs to ap_retained_data_create()/ap_retained_data_get...

consistency with existing APIs (e.g., slotmem)

don't bother changing the MMN, which doesn't reflect recent -dev changes anyway

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

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index aaaff2e456c5a10cf02a33864661f80caecedde6..a147528c6d0590c4b7a6280d56cdcddb74ed0ad2 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -189,7 +189,7 @@
  * 20090130.0 (2.3.2-dev)  Add ap_ prefix to unixd_setup_child().
  * 20090131.0 (2.3.2-dev)  Remove ap_default_type(), disable DefaultType
  * 20090208.0 (2.3.2-dev)  Add conn_rec::current_thread.
- * 20090208.1 (2.3.3-dev)  Add ap_set_retained_data()/ap_get_retained_data()
+ * 20090208.1 (2.3.3-dev)  Add ap_retained_data_create()/ap_retained_data_get()
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */

diff --git a/include/http_config.h b/include/http_config.h
index 6ad90870461fbaf6407f3e0a62440773c12bd455..a140fb7cb861b95013d6e9922791e5ce6cfda629 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -921,14 +921,14 @@ AP_DECLARE(int) ap_process_config_tree(server_rec *s,
  * @param Size in bytes of the retained data (to be allocated)
  * @return Address of new retained data structure, initially cleared
  */
-AP_DECLARE(void *) ap_set_retained_data(const char *key, apr_size_t size);
+AP_DECLARE(void *) ap_retained_data_create(const char *key, apr_size_t size);
 
 /**
- * Retrieve data which was stored by ap_set_retained_data()
+ * Retrieve data which was stored by ap_retained_data_create()
  * @param key The unique key associated with this module's retained data
  * @return Address of previously retained data structure, or NULL if not yet saved
  */
-AP_DECLARE(void *) ap_get_retained_data(const char *key);
+AP_DECLARE(void *) ap_retained_data_get(const char *key);
     
 /* Module-method dispatchers, also for http_request.c */
 /**

diff --git a/server/config.c b/server/config.c
index f87c44c384248bc069987bbd75f52c8f61f0cb6f..fa14cf614fc317e47f23167f8355ab1bf0a0dc26 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -2194,7 +2194,7 @@ AP_DECLARE(void) ap_show_modules(void)
         printf("  %s\n", ap_loaded_modules[n]->name);
 }
 
-AP_DECLARE(void *) ap_get_retained_data(const char *key)
+AP_DECLARE(void *) ap_retained_data_get(const char *key)
 {
     void *retained;
 
@@ -2202,7 +2202,7 @@ AP_DECLARE(void *) ap_get_retained_data(const char *key)
     return retained;
 }
 
-AP_DECLARE(void *) ap_set_retained_data(const char *key, apr_size_t size)
+AP_DECLARE(void *) ap_retained_data_create(const char *key, apr_size_t size)
 {
     void *retained;
 

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index e6299092d21f1cd607bc26dabcaad3931841e78b..7671eb2181dc7bad38b4e8af674f6249ceeba1c1 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -2438,9 +2438,9 @@ static int event_pre_config(apr_pool_t * pconf, apr_pool_t * plog,
     }
 
     /* sigh, want this only the second time around */
-    retained = ap_get_retained_data(userdata_key);
+    retained = ap_retained_data_get(userdata_key);
     if (!retained) {
-        retained = ap_set_retained_data(userdata_key, sizeof(*retained));
+        retained = ap_retained_data_create(userdata_key, sizeof(*retained));
     }
     ++retained->module_loads;
     if (retained->module_loads == 2) {

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 9f65a754b7f0bf9ab25c2956b397b4bacb2805a8..7c1b1518c94880ea252e90f36df71edc9eca43c2 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1277,9 +1277,9 @@ static int prefork_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp
     }
 
     /* sigh, want this only the second time around */
-    retained = ap_get_retained_data(userdata_key);
+    retained = ap_retained_data_get(userdata_key);
     if (!retained) {
-        retained = ap_set_retained_data(userdata_key, sizeof(*retained));
+        retained = ap_retained_data_create(userdata_key, sizeof(*retained));
     }
     ++retained->module_loads;
     if (retained->module_loads == 2) {

diff --git a/server/mpm/simple/simple_core.c b/server/mpm/simple/simple_core.c
index 2fa5adb1727e7297f097b1e6eecc0f67980c1b90..7b9d99c7cd52b8adf7306e8139fb36f049794197 100644 (file)
--- a/server/mpm/simple/simple_core.c
+++ b/server/mpm/simple/simple_core.c
@@ -42,12 +42,12 @@ apr_status_t simple_core_init_once(void)
     const char *userdata_key = "mpm_simple_module";
     simple_core_t *sc;
 
-    g_simple_core = ap_get_retained_data(userdata_key);
+    g_simple_core = ap_retained_data_get(userdata_key);
     if (g_simple_core) {
         return APR_SUCCESS;
     }
     
-    sc = g_simple_core = ap_set_retained_data(userdata_key, sizeof(*g_simple_core));
+    sc = g_simple_core = ap_retained_data_create(userdata_key, sizeof(*g_simple_core));
 
     apr_pool_create(&sc->pool, ap_pglobal);
 

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 8f502b26e35d4d5aba4078a22229e70a224445c9..7777396ec65576df69518bf3933e41893f5b2614 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1947,9 +1947,9 @@ static int worker_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
     }
 
     /* sigh, want this only the second time around */
-    retained = ap_get_retained_data(userdata_key);
+    retained = ap_retained_data_get(userdata_key);
     if (!retained) {
-        retained = ap_set_retained_data(userdata_key, sizeof(*retained));
+        retained = ap_retained_data_create(userdata_key, sizeof(*retained));
     }
     ++retained->module_loads;
     if (retained->module_loads == 2) {