remove some unused variables and re-name cache_select_url() to simply

cache_select()

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

diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index e949847fe81b0406f01850736ebe2edc58972652..46387c27dc90fa2e243b9f86c88f4955c61ed6a0 100644 (file)
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -169,7 +169,7 @@ CACHE_DECLARE(void) ap_cache_accept_headers(cache_handle_t *h, request_rec *r,
  * This function returns OK if successful, DECLINED if no
  * cached entity fits the bill.
  */
-int cache_select_url(request_rec *r, char *url)
+int cache_select(request_rec *r)
 {
     cache_provider_list *list;
     apr_status_t rv;

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index ff0074c07d8c6172d9db76eefd963c10b268aa61..6362ee0000f997cd474f263ccee52453db19eaf0 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -51,10 +51,8 @@ static int cache_url_handler(request_rec *r, int lookup)
     apr_status_t rv;
     const char *auth;
     apr_uri_t uri;
-    char *url;
     char *path;
     cache_provider_list *providers;
-    cache_info *info;
     cache_request_rec *cache;
     cache_server_conf *conf;
     apr_bucket_brigade *out;
@@ -65,9 +63,7 @@ static int cache_url_handler(request_rec *r, int lookup)
     }
 
     uri = r->parsed_uri;
-    url = r->unparsed_uri;
     path = uri.path;
-    info = NULL;
 
     conf = (cache_server_conf *) ap_get_module_config(r->server->module_config,
                                                       &cache_module);
@@ -114,7 +110,7 @@ static int cache_url_handler(request_rec *r, int lookup)
      *   add cache_out filter
      *   return OK
      */
-    rv = cache_select_url(r, url);
+    rv = cache_select(r);
     if (rv != OK) {
         if (rv == DECLINED) {
             if (!lookup) {
@@ -219,7 +215,7 @@ static int cache_out_filter(ap_filter_t *f, apr_bucket_brigade *bb)
      * restore the status into it's handle. */
     r->status = cache->handle->cache_obj->info.status;
 
-    /* recall_headers() was called in cache_select_url() */
+    /* recall_headers() was called in cache_select() */
     cache->provider->recall_body(cache->handle, r->pool, bb);
 
     /* This filter is done once it has served up its content */

diff --git a/modules/cache/mod_cache.h b/modules/cache/mod_cache.h
index 2e6fcf1d20d23cf93c45f4e5c03a8903333a24e7..0da7724fcfb5f5551490b052b3c28db7820380ec 100644 (file)
--- a/modules/cache/mod_cache.h
+++ b/modules/cache/mod_cache.h
@@ -274,7 +274,7 @@ CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_hdrs_out(apr_pool_t *pool,
  */
 int cache_remove_url(cache_request_rec *cache, apr_pool_t *p);
 int cache_create_entity(request_rec *r, char *url, apr_off_t size);
-int cache_select_url(request_rec *r, char *url);
+int cache_select(request_rec *r);
 apr_status_t cache_generate_key_default( request_rec *r, apr_pool_t*p, char**key );
 /**
  * create a key for the cache based on the request record

diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index e3d24dfdee3a786911cb596956c96f3c562144da..7c33c02febc3d9493b7d1af6ebb4766c6364b5d7 100644 (file)
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -918,7 +918,7 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info
     }
 
     /* Parse the vary header and dump those fields from the headers_in. */
-    /* FIXME: Make call to the same thing cache_select_url calls to crack Vary. */
+    /* FIXME: Make call to the same thing cache_select calls to crack Vary. */
     if (r->headers_in) {
         apr_table_t *headers_in;