From: Jim Jagielski <jim@apache.org>
Date: Tue, 16 Mar 2010 15:01:55 +0000 (+0000)
Subject: Align "hidden" function names with external... picky, but
X-Git-Tag: 2.3.6~334
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f90bc4f90019225db3c919362ccd302af33494d9;p=apache

Align "hidden" function names with external... picky, but
less confusing


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

diff --git a/modules/cache/mod_socache_dbm.c b/modules/cache/mod_socache_dbm.c
index 1f8a04fd19..2566074a08 100644
--- a/modules/cache/mod_socache_dbm.c
+++ b/modules/cache/mod_socache_dbm.c
@@ -167,7 +167,7 @@ static apr_status_t socache_dbm_init(ap_socache_instance_t *ctx,
     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 socache_dbm = {
     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,
diff --git a/modules/cache/mod_socache_dc.c b/modules/cache/mod_socache_dc.c
index 9b7edcce85..7982d69727 100644
--- a/modules/cache/mod_socache_dc.c
+++ b/modules/cache/mod_socache_dc.c
@@ -82,7 +82,7 @@ static apr_status_t socache_dc_init(ap_socache_instance_t *ctx,
     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 socache_dc = {
     0,
     socache_dc_create,
     socache_dc_init,
-    socache_dc_kill,
+    socache_dc_destroy,
     socache_dc_store,
     socache_dc_retrieve,
     socache_dc_remove,
diff --git a/modules/cache/mod_socache_memcache.c b/modules/cache/mod_socache_memcache.c
index 4f910be58f..349a786cc2 100644
--- a/modules/cache/mod_socache_memcache.c
+++ b/modules/cache/mod_socache_memcache.c
@@ -169,7 +169,7 @@ static apr_status_t socache_mc_init(ap_socache_instance_t *ctx,
     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 socache_mc = {
     0,
     socache_mc_create,
     socache_mc_init,
-    socache_mc_kill,
+    socache_mc_destroy,
     socache_mc_store,
     socache_mc_retrieve,
     socache_mc_remove,
diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c
index 5b8506e94f..1523cbb0c1 100644
--- a/modules/cache/mod_socache_shmcb.c
+++ b/modules/cache/mod_socache_shmcb.c
@@ -455,7 +455,7 @@ static apr_status_t socache_shmcb_init(ap_socache_instance_t *ctx,
     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 socache_shmcb = {
     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,