From: Joe Orton <jorton@apache.org>
Date: Fri, 11 Feb 2005 12:16:06 +0000 (+0000)
Subject: * modules/cache/mod_disk_cache.c (store_body): Fix format string
X-Git-Tag: 2.1.3~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=519b48fce1de6cc6432e39dcb44746d4dabf9d43;p=thirdparty%2Fapache%2Fhttpd.git

* modules/cache/mod_disk_cache.c (store_body): Fix format string
warnings; print integers using _FMT strings.

* modules/cache/cache_util.c (ap_cache_check_freshness): Remove unused
variable.

* modules/cache/cache_storage.c (cache_select_url): Remove unused
variable.


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

diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index de091bca1e0..b3489803c47 100644
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -188,7 +188,6 @@ int cache_select_url(request_rec *r, char *url)
         switch ((rv = list->provider->open_entity(h, r, key))) {
         case OK: {
             char *vary = NULL;
-            const char *varyhdr = NULL;
             int fresh;
 
             if (list->provider->recall_headers(h, r) != APR_SUCCESS) {
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index 5598ae91864..dc03017efb2 100644
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -126,7 +126,6 @@ CACHE_DECLARE(int) ap_cache_check_freshness(cache_handle_t *h,
 {
     apr_int64_t age, maxage_req, maxage_cresp, maxage, smaxage, maxstale;
     apr_int64_t minfresh;
-    int age_in_errhdr = 0;
     const char *cc_cresp, *cc_req;
     const char *agestr = NULL;
     const char *expstr = NULL;
diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index efdb4a6d374..bfe343b24ad 100644
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -659,9 +659,9 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
         dobj->file_size += written;
         if (dobj->file_size > conf->maxfs) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
-                         "cache_disk: URL %s failed the size check (%lu>%lu)",
-                         h->cache_obj->key, (unsigned long)dobj->file_size,
-                         (unsigned long)conf->maxfs);
+                         "cache_disk: URL %s failed the size check "
+                         "(%" APR_OFF_T_FMT ">%" APR_SIZE_T_FMT ")",
+                         h->cache_obj->key, dobj->file_size, conf->maxfs);
             /* Remove the intermediate cache file and return non-APR_SUCCESS */
             file_cache_errorcleanup(dobj, r);
             return APR_EGENERAL;
@@ -683,7 +683,8 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
         }
         if (dobj->file_size < conf->minfs) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
-                         "cache_disk: URL %s failed the size check (%lu<%lu)",
+                         "cache_disk: URL %s failed the size check "
+                         "(%" APR_OFF_T_FMT "<%" APR_SIZE_T_FMT ")",
                          h->cache_obj->key, dobj->file_size, conf->minfs);
             /* Remove the intermediate cache file and return non-APR_SUCCESS */
             file_cache_errorcleanup(dobj, r);