svn commit: r923791 - in /httpd/httpd/trunk/modules/cache: mod_socache_dbm.c mod_socache_dc.c mod_socache_memcache.c mod_socache_shmcb.c

[ji...@apache.org]

Author: jim
Date: Tue Mar 16 15:01:55 2010
New Revision: 923791

URL: http://svn.apache.org/viewvc?rev=923791&view=rev
Log:
Align "hidden" function names with external... picky, but
less confusing

Modified:
    httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
    httpd/httpd/trunk/modules/cache/mod_socache_dc.c
    httpd/httpd/trunk/modules/cache/mod_socache_memcache.c
    httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dbm.c?rev=923791&r1=923790&r2=923791&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dbm.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dbm.c Tue Mar 16 15:01:55 2010
@@ -167,7 +167,7 @@ static apr_status_t socache_dbm_init(ap_
     return APR_SUCCESS;
 }
 
-static void socache_dbm_kill(ap_socache_instance_t *ctx, server_rec *s)
+static void socache_dbm_destroy(ap_socache_instance_t *ctx, server_rec *s)
 {
     /* the correct way */
     unlink(apr_pstrcat(ctx->pool, ctx->data_file, DBM_FILE_SUFFIX_DIR, NULL));
@@ -515,7 +515,7 @@ static const ap_socache_provider_t socac
     AP_SOCACHE_FLAG_NOTMPSAFE,
     socache_dbm_create,
     socache_dbm_init,
-    socache_dbm_kill,
+    socache_dbm_destroy,
     socache_dbm_store,
     socache_dbm_retrieve,
     socache_dbm_remove,

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dc.c?rev=923791&r1=923790&r2=923791&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dc.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dc.c Tue Mar 16 15:01:55 2010
@@ -82,7 +82,7 @@ static apr_status_t socache_dc_init(ap_s
     return APR_SUCCESS;
 }
 
-static void socache_dc_kill(ap_socache_instance_t *ctx, server_rec *s)
+static void socache_dc_destroy(ap_socache_instance_t *ctx, server_rec *s)
 {
     if (ctx && ctx->dc) {
         DC_CTX_free(ctx->dc);
@@ -167,7 +167,7 @@ static const ap_socache_provider_t socac
     0,
     socache_dc_create,
     socache_dc_init,
-    socache_dc_kill,
+    socache_dc_destroy,
     socache_dc_store,
     socache_dc_retrieve,
     socache_dc_remove,

Modified: httpd/httpd/trunk/modules/cache/mod_socache_memcache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_memcache.c?rev=923791&r1=923790&r2=923791&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_memcache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_memcache.c Tue Mar 16 15:01:55 2010
@@ -169,7 +169,7 @@ static apr_status_t socache_mc_init(ap_s
     return APR_SUCCESS;
 }
 
-static void socache_mc_kill(ap_socache_instance_t *context, server_rec *s)
+static void socache_mc_destroy(ap_socache_instance_t *context, server_rec *s)
 {
     /* noop. */
 }
@@ -300,7 +300,7 @@ static const ap_socache_provider_t socac
     0,
     socache_mc_create,
     socache_mc_init,
-    socache_mc_kill,
+    socache_mc_destroy,
     socache_mc_store,
     socache_mc_retrieve,
     socache_mc_remove,

Modified: httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c?rev=923791&r1=923790&r2=923791&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c Tue Mar 16 15:01:55 2010
@@ -455,7 +455,7 @@ static apr_status_t socache_shmcb_init(a
     return APR_SUCCESS;
 }
 
-static void socache_shmcb_kill(ap_socache_instance_t *ctx, server_rec *s)
+static void socache_shmcb_destroy(ap_socache_instance_t *ctx, server_rec *s)
 {
     if (ctx && ctx->shm) {
         apr_shm_destroy(ctx->shm);
@@ -977,7 +977,7 @@ static const ap_socache_provider_t socac
     AP_SOCACHE_FLAG_NOTMPSAFE,
     socache_shmcb_create,
     socache_shmcb_init,
-    socache_shmcb_kill,
+    socache_shmcb_destroy,
     socache_shmcb_store,
     socache_shmcb_retrieve,
     socache_shmcb_remove,