httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r153385 - in httpd/httpd/trunk/modules/cache: cache_storage.c cache_util.c mod_disk_cache.c
Date Fri, 11 Feb 2005 12:16:10 GMT
Author: jorton
Date: Fri Feb 11 04:16:06 2005
New Revision: 153385

URL: http://svn.apache.org/viewcvs?view=rev&rev=153385
Log:
* 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.

Modified:
    httpd/httpd/trunk/modules/cache/cache_storage.c
    httpd/httpd/trunk/modules/cache/cache_util.c
    httpd/httpd/trunk/modules/cache/mod_disk_cache.c

Modified: httpd/httpd/trunk/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_storage.c?view=diff&r1=153384&r2=153385
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_storage.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_storage.c Fri Feb 11 04:16:06 2005
@@ -188,7 +188,6 @@
         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) {

Modified: httpd/httpd/trunk/modules/cache/cache_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_util.c?view=diff&r1=153384&r2=153385
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Fri Feb 11 04:16:06 2005
@@ -126,7 +126,6 @@
 {
     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;

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?view=diff&r1=153384&r2=153385
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_disk_cache.c Fri Feb 11 04:16:06 2005
@@ -659,9 +659,9 @@
         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 @@
         }
         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);



Mime
View raw message