From 0a50eb7dec1b4a194f54a79d5194d0c254ade6f6 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Wed, 17 Jul 2002 14:52:36 +0000 Subject: [PATCH] axe an unused function fix some format strings used with apr_size_t and apr_ssize_t git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96097 13f79535-47bb-0310-9956-ffa450edef68 --- modules/experimental/cache_pqueue.c | 2 +- modules/experimental/mod_disk_cache.c | 5 ----- modules/experimental/mod_mem_cache.c | 8 ++++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/modules/experimental/cache_pqueue.c b/modules/experimental/cache_pqueue.c index 5bf677addc..0b458b79c6 100644 --- a/modules/experimental/cache_pqueue.c +++ b/modules/experimental/cache_pqueue.c @@ -303,7 +303,7 @@ void cache_pq_dump(cache_pqueue_t *q, fprintf(stdout,"posn\tleft\tright\tparent\tminchild\t...\n"); for (i = 1; i < q->size ;i++) { fprintf(stdout, - "%d\t%d\t%d\t%d\t%d\t", + "%d\t%d\t%d\t%d\t%" APR_SSIZE_T_FMT "\t", i, left(i), right(i), parent(i), minchild(q, i)); diff --git a/modules/experimental/mod_disk_cache.c b/modules/experimental/mod_disk_cache.c index dcc081eab3..38e5b448e8 100644 --- a/modules/experimental/mod_disk_cache.c +++ b/modules/experimental/mod_disk_cache.c @@ -427,11 +427,6 @@ static int open_entity(cache_handle_t *h, request_rec *r, const char *type, cons return OK; } -static int remove_url(const char *type, char *key) -{ - return OK; -} - static int remove_entity(cache_handle_t *h) { /* Null out the cache object pointer so next time we start from scratch */ diff --git a/modules/experimental/mod_mem_cache.c b/modules/experimental/mod_mem_cache.c index 8c9a203909..afd14e2bc0 100644 --- a/modules/experimental/mod_mem_cache.c +++ b/modules/experimental/mod_mem_cache.c @@ -1045,7 +1045,7 @@ static const char { apr_size_t val; - if (sscanf(arg, "%d", &val) != 1) { + if (sscanf(arg, "%" APR_SIZE_T_FMT, &val) != 1) { return "MCacheSize argument must be an integer representing the max cache size in KBytes."; } sconf->max_cache_size = val*1024; @@ -1056,7 +1056,7 @@ static const char { apr_size_t val; - if (sscanf(arg, "%d", &val) != 1) { + if (sscanf(arg, "%" APR_SIZE_T_FMT, &val) != 1) { return "MCacheMinObjectSize value must be an integer (bytes)"; } sconf->min_cache_object_size = val; @@ -1067,7 +1067,7 @@ static const char { apr_size_t val; - if (sscanf(arg, "%d", &val) != 1) { + if (sscanf(arg, "%" APR_SIZE_T_FMT, &val) != 1) { return "MCacheMaxObjectSize value must be an integer (bytes)"; } sconf->max_cache_object_size = val; @@ -1078,7 +1078,7 @@ static const char { apr_size_t val; - if (sscanf(arg, "%d", &val) != 1) { + if (sscanf(arg, "%" APR_SIZE_T_FMT, &val) != 1) { return "MCacheMaxObjectCount value must be an integer"; } sconf->max_object_cnt = val; -- 2.50.1