Commit bb9d4e26 authored by Joe Orton's avatar Joe Orton
Browse files

* 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
parent 1a728b69

modules/cache/cache_storage.c

+0 −1
Changes for modules/cache/cache_storage.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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) {

modules/cache/cache_util.c

+0 −1
Changes for modules/cache/cache_util.c: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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;

modules/cache/mod_disk_cache.c

+5 −4
Changes for modules/cache/mod_disk_cache.c: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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);