httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r759924 - in /httpd/httpd/trunk: include/ap_mmn.h include/http_config.h server/config.c server/mpm/event/event.c server/mpm/prefork/prefork.c server/mpm/simple/simple_core.c server/mpm/worker/worker.c
Date Mon, 30 Mar 2009 11:27:54 GMT
Author: trawick
Date: Mon Mar 30 11:27:53 2009
New Revision: 759924

URL: http://svn.apache.org/viewvc?rev=759924&view=rev
Log:
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

Modified:
    httpd/httpd/trunk/include/ap_mmn.h
    httpd/httpd/trunk/include/http_config.h
    httpd/httpd/trunk/server/config.c
    httpd/httpd/trunk/server/mpm/event/event.c
    httpd/httpd/trunk/server/mpm/prefork/prefork.c
    httpd/httpd/trunk/server/mpm/simple/simple_core.c
    httpd/httpd/trunk/server/mpm/worker/worker.c

Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=759924&r1=759923&r2=759924&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Mon Mar 30 11:27:53 2009
@@ -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" */

Modified: httpd/httpd/trunk/include/http_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_config.h?rev=759924&r1=759923&r2=759924&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_config.h (original)
+++ httpd/httpd/trunk/include/http_config.h Mon Mar 30 11:27:53 2009
@@ -921,14 +921,14 @@
  * @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 */
 /**

Modified: httpd/httpd/trunk/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=759924&r1=759923&r2=759924&view=diff
==============================================================================
--- httpd/httpd/trunk/server/config.c (original)
+++ httpd/httpd/trunk/server/config.c Mon Mar 30 11:27:53 2009
@@ -2194,7 +2194,7 @@
         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 @@
     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;
 

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=759924&r1=759923&r2=759924&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Mon Mar 30 11:27:53 2009
@@ -2438,9 +2438,9 @@
     }
 
     /* 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) {

Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=759924&r1=759923&r2=759924&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Mon Mar 30 11:27:53 2009
@@ -1277,9 +1277,9 @@
     }
 
     /* 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) {

Modified: httpd/httpd/trunk/server/mpm/simple/simple_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_core.c?rev=759924&r1=759923&r2=759924&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_core.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_core.c Mon Mar 30 11:27:53 2009
@@ -42,12 +42,12 @@
     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);
 

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=759924&r1=759923&r2=759924&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Mon Mar 30 11:27:53 2009
@@ -1947,9 +1947,9 @@
     }
 
     /* 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) {



Mime
View raw message