'generate_name' is too generic to be in the public symbols. Rename it to ap_cache_gen...

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

diff --git a/CHANGES b/CHANGES
index 8eda3ce82d34d69c2a992ff5da3295851ba2097a..309c8b1f811c7beb5b109d1bddaf65837ffc4de7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.5
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_cache: Rename 'generate_name' to 'ap_cache_generate_name'. 
+     [Paul Querna]
+
   *) SECURITY: CAN-2005-1268 (cve.mitre.org)
      mod_ssl: Fix possible crash on printing CRL details when
      debugging is enabled, if configured to use a CRL from

diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index d56f4aac0d540c4bccbbac247e1aacf31b2db303..21c6fee5bbe894794f72f49a7ed00070e8ab7bf3 100644 (file)
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -489,8 +489,8 @@ static void cache_hash(const char *it, char *val, int ndepth, int nlength)
     val[i + 22 - k] = '\0';
 }
 
-CACHE_DECLARE(char *)generate_name(apr_pool_t *p, int dirlevels,
-                                   int dirlength, const char *name)
+CACHE_DECLARE(char *)ap_cache_generate_name(apr_pool_t *p, int dirlevels,
+                                            int dirlength, const char *name)
 {
     char hashfile[66];
     cache_hash(name, hashfile, dirlevels, dirlength);

diff --git a/modules/cache/mod_cache.h b/modules/cache/mod_cache.h
index 5e72e903050f07927ace5134f039e57bc07a6643..26675e7805a8fc19a597251e55173fb4ef5eb0cf 100644 (file)
--- a/modules/cache/mod_cache.h
+++ b/modules/cache/mod_cache.h
@@ -253,9 +253,9 @@ CACHE_DECLARE(void) ap_cache_accept_headers(cache_handle_t *h, request_rec *r,
 
 CACHE_DECLARE(apr_time_t) ap_cache_hex2usec(const char *x);
 CACHE_DECLARE(void) ap_cache_usec2hex(apr_time_t j, char *y);
-CACHE_DECLARE(char *) generate_name(apr_pool_t *p, int dirlevels, 
-                                    int dirlength, 
-                                    const char *name);
+CACHE_DECLARE(char *) ap_cache_generate_name(apr_pool_t *p, int dirlevels, 
+                                             int dirlength, 
+                                             const char *name);
 CACHE_DECLARE(cache_provider_list *)ap_cache_get_providers(request_rec *r, cache_server_conf *conf, const char *url);
 CACHE_DECLARE(int) ap_cache_liststr(apr_pool_t *p, const char *list,
                                     const char *key, char **val);

diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index 64fe6d9c0a6d3752ffc46af9ac891cfeda2ac123..b7365c47422f1844ce86834d7396c0acdebfa8ea 100644 (file)
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -112,8 +112,8 @@ static char *header_file(apr_pool_t *p, disk_cache_conf *conf,
                          disk_cache_object_t *dobj, const char *name)
 {
     if (!dobj->hashfile) {
-        dobj->hashfile = generate_name(p, conf->dirlevels, conf->dirlength,
-                                       name);
+        dobj->hashfile = ap_cache_generate_name(p, conf->dirlevels, 
+                                                conf->dirlength, name);
     }
     return apr_pstrcat(p, conf->cache_root, "/", dobj->hashfile,
                        CACHE_HEADER_SUFFIX, NULL);
@@ -123,8 +123,8 @@ static char *data_file(apr_pool_t *p, disk_cache_conf *conf,
                        disk_cache_object_t *dobj, const char *name)
 {
     if (!dobj->hashfile) {
-        dobj->hashfile = generate_name(p, conf->dirlevels, conf->dirlength,
-                                       name);
+        dobj->hashfile = ap_cache_generate_name(p, conf->dirlevels, 
+                                                conf->dirlength, name);
     }
     return apr_pstrcat(p, conf->cache_root, "/", dobj->hashfile,
                        CACHE_DATA_SUFFIX, NULL);