You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2002/07/17 16:52:36 UTC
cvs commit: httpd-2.0/modules/experimental cache_pqueue.c mod_disk_cache.c mod_mem_cache.c
trawick 2002/07/17 07:52:36
Modified: modules/experimental cache_pqueue.c mod_disk_cache.c
mod_mem_cache.c
Log:
axe an unused function
fix some format strings used with apr_size_t and apr_ssize_t
Revision Changes Path
1.6 +1 -1 httpd-2.0/modules/experimental/cache_pqueue.c
Index: cache_pqueue.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/cache_pqueue.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cache_pqueue.c 17 Jul 2002 00:04:51 -0000 1.5
+++ cache_pqueue.c 17 Jul 2002 14:52:36 -0000 1.6
@@ -303,7 +303,7 @@
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));
1.36 +0 -5 httpd-2.0/modules/experimental/mod_disk_cache.c
Index: mod_disk_cache.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_disk_cache.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- mod_disk_cache.c 30 May 2002 16:34:38 -0000 1.35
+++ mod_disk_cache.c 17 Jul 2002 14:52:36 -0000 1.36
@@ -427,11 +427,6 @@
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 */
1.75 +4 -4 httpd-2.0/modules/experimental/mod_mem_cache.c
Index: mod_mem_cache.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_mem_cache.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mod_mem_cache.c 6 Jul 2002 02:49:59 -0000 1.74
+++ mod_mem_cache.c 17 Jul 2002 14:52:36 -0000 1.75
@@ -1045,7 +1045,7 @@
{
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 @@
{
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 @@
{
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 @@
{
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;