httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r179877 - in /httpd/httpd/trunk: CHANGES modules/cache/cache_util.c modules/cache/mod_cache.h modules/cache/mod_disk_cache.c
Date Fri, 03 Jun 2005 20:19:09 GMT
Author: pquerna
Date: Fri Jun  3 13:19:08 2005
New Revision: 179877

URL: http://svn.apache.org/viewcvs?rev=179877&view=rev
Log:
'generate_name' is too generic to be in the public symbols. Rename it to ap_cache_generate_name.
No functional changes.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/cache/cache_util.c
    httpd/httpd/trunk/modules/cache/mod_cache.h
    httpd/httpd/trunk/modules/cache/mod_disk_cache.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=179877&r1=179876&r2=179877&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Fri Jun  3 13:19:08 2005
@@ -2,6 +2,9 @@
 
   [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

Modified: httpd/httpd/trunk/modules/cache/cache_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_util.c?rev=179877&r1=179876&r2=179877&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Fri Jun  3 13:19:08 2005
@@ -489,8 +489,8 @@
     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);

Modified: httpd/httpd/trunk/modules/cache/mod_cache.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_cache.h?rev=179877&r1=179876&r2=179877&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.h (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.h Fri Jun  3 13:19:08 2005
@@ -253,9 +253,9 @@
 
 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);

Modified: httpd/httpd/trunk/modules/cache/mod_disk_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_disk_cache.c?rev=179877&r1=179876&r2=179877&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Fri Jun  3 13:19:08 2005
@@ -112,8 +112,8 @@
                          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 @@
                        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);



Mime
View raw message