From fb6a306876ee8265da71c7a0bd69eb0040a04e84 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Mon, 30 Mar 2009 11:27:53 +0000 Subject: [PATCH] rename the new retained-data APIs to ap_retained_data_create()/ap_retained_data_get(), for better 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 --- include/ap_mmn.h | 2 +- include/http_config.h | 6 +++--- server/config.c | 4 ++-- server/mpm/event/event.c | 4 ++-- server/mpm/prefork/prefork.c | 4 ++-- server/mpm/simple/simple_core.c | 4 ++-- server/mpm/worker/worker.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/ap_mmn.h b/include/ap_mmn.h index aaaff2e456..a147528c6d 100644 --- 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 6ad9087046..a140fb7cb8 100644 --- 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 f87c44c384..fa14cf614f 100644 --- 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 e6299092d2..7671eb2181 100644 --- 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 9f65a754b7..7c1b1518c9 100644 --- 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 2fa5adb172..7b9d99c7cd 100644 --- 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 8f502b26e3..7777396ec6 100644 --- 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) { -- 2.40.0