From ebeda08ca05c752d2c98237c01647981a16eb6bd Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Tue, 17 Aug 2004 16:34:51 +0000 Subject: [PATCH] Eliminate several unused variables, observe a file size -> cache entry size overflow, and reorder a few headers so we compile clean. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104688 13f79535-47bb-0310-9956-ffa450edef68 --- modules/experimental/mod_cache.c | 1 - modules/experimental/mod_disk_cache.c | 8 +++----- modules/experimental/mod_mem_cache.c | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c index 7fce0ee0fa..a4de02d5d1 100644 --- a/modules/experimental/mod_cache.c +++ b/modules/experimental/mod_cache.c @@ -51,7 +51,6 @@ static int cache_url_handler(request_rec *r, int lookup) const char *pragma, *auth; apr_uri_t uri; char *url; - apr_size_t urllen; char *path; cache_provider_list *providers; cache_info *info; diff --git a/modules/experimental/mod_disk_cache.c b/modules/experimental/mod_disk_cache.c index 9e54ef043b..a3efeee080 100644 --- a/modules/experimental/mod_disk_cache.c +++ b/modules/experimental/mod_disk_cache.c @@ -13,9 +13,10 @@ * limitations under the License. */ -#include "mod_cache.h" #include "apr_file_io.h" #include "apr_strings.h" +#include "mod_cache.h" +#include "ap_provider.h" #include "util_filter.h" #include "util_script.h" @@ -224,7 +225,6 @@ static int file_cache_recall_mydata(apr_file_t *fd, cache_info *info, { apr_status_t rv; char *urlbuff; - char * temp; disk_cache_info_t disk_info; apr_size_t len; @@ -424,7 +424,6 @@ static int remove_url(const char *key) */ static apr_status_t recall_headers(cache_handle_t *h, request_rec *r) { - apr_status_t rv; disk_cache_object_t *dobj = (disk_cache_object_t *) h->cache_obj->vobj; apr_table_t * tmp; @@ -520,8 +519,6 @@ static apr_status_t store_headers(cache_handle_t *h, request_rec *r, cache_info disk_cache_conf *conf = ap_get_module_config(r->server->module_config, &disk_cache_module); apr_status_t rv; - char *buf; - char statusbuf[8]; apr_size_t amt; disk_cache_object_t *dobj = (disk_cache_object_t*) h->cache_obj->vobj; apr_file_t *hfd = dobj->hfd; @@ -662,6 +659,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r, apr_bucket_bri /* Was this the final bucket? If yes, close the body file and make sanity checks */ if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(b))) { if (h->cache_obj->info.len <= 0) { + /* XXX Fixme: file_size isn't constrained by size_t. */ h->cache_obj->info.len = dobj->file_size; } else if (h->cache_obj->info.len != dobj->file_size) { diff --git a/modules/experimental/mod_mem_cache.c b/modules/experimental/mod_mem_cache.c index 03d1509aba..cb7094bf62 100644 --- a/modules/experimental/mod_mem_cache.c +++ b/modules/experimental/mod_mem_cache.c @@ -17,6 +17,7 @@ #include "mod_cache.h" #include "cache_pqueue.h" #include "cache_cache.h" +#include "ap_provider.h" #include "ap_mpm.h" #include "apr_thread_mutex.h" #if APR_HAVE_UNISTD_H -- 2.50.1