summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2010-11-30 22:59:01 +0100
committerGuenter Knauf <fuankg@apache.org>2010-11-30 22:59:01 +0100
commit922ce7603794296ace341c92ad519ba8ebe32e1b (patch)
treed03dc2d69bb90220cba2087bb410adbb9128e539
parentPR50388: the hijacking domain needs to be first if you're going to cause (diff)
downloadapache2-922ce7603794296ace341c92ad519ba8ebe32e1b.tar.xz
apache2-922ce7603794296ace341c92ad519ba8ebe32e1b.zip
Some more casts to make MSVC calm ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040791 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--support/htcacheclean.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/support/htcacheclean.c b/support/htcacheclean.c
index 92984333a9..0ce21cdbc0 100644
--- a/support/htcacheclean.c
+++ b/support/htcacheclean.c
@@ -508,9 +508,9 @@ static int list_urls(char *path, apr_pool_t *pool, apr_off_t round)
" %" APR_TIME_T_FMT
" %d %d\n",
url,
- round_up(hinfo.size, round),
+ round_up((apr_size_t)hinfo.size, round),
round_up(
- disk_info.has_body ? dinfo.size
+ disk_info.has_body ? (apr_size_t)dinfo.size
: 0, round),
disk_info.status,
disk_info.entity_version,
@@ -981,8 +981,8 @@ static void purge(char *path, apr_pool_t *pool, apr_off_t max,
for (e = APR_RING_FIRST(&root);
e != APR_RING_SENTINEL(&root, _entry, link);
e = APR_RING_NEXT(e, link)) {
- s.sum += round_up(e->hsize, round);
- s.sum += round_up(e->dsize, round);
+ s.sum += round_up((apr_size_t)e->hsize, round);
+ s.sum += round_up((apr_size_t)e->dsize, round);
s.entries++;
}
@@ -1003,8 +1003,8 @@ static void purge(char *path, apr_pool_t *pool, apr_off_t max,
n = APR_RING_NEXT(e, link);
if (e->response_time > now || e->htime > now || e->dtime > now) {
delete_entry(path, e->basename, &s.nodes, pool);
- s.sum -= round_up(e->hsize, round);
- s.sum -= round_up(e->dsize, round);
+ s.sum -= round_up((apr_size_t)e->hsize, round);
+ s.sum -= round_up((apr_size_t)e->dsize, round);
s.entries--;
s.dfuture++;
APR_RING_REMOVE(e, link);
@@ -1028,8 +1028,8 @@ static void purge(char *path, apr_pool_t *pool, apr_off_t max,
n = APR_RING_NEXT(e, link);
if (e->expire != APR_DATE_BAD && e->expire < now) {
delete_entry(path, e->basename, &s.nodes, pool);
- s.sum -= round_up(e->hsize, round);
- s.sum -= round_up(e->dsize, round);
+ s.sum -= round_up((apr_size_t)e->hsize, round);
+ s.sum -= round_up((apr_size_t)e->dsize, round);
s.entries--;
s.dexpired++;
APR_RING_REMOVE(e, link);
@@ -1065,8 +1065,8 @@ static void purge(char *path, apr_pool_t *pool, apr_off_t max,
}
delete_entry(path, oldest->basename, &s.nodes, pool);
- s.sum -= round_up(oldest->hsize, round);
- s.sum -= round_up(oldest->dsize, round);
+ s.sum -= round_up((apr_size_t)oldest->hsize, round);
+ s.sum -= round_up((apr_size_t)oldest->dsize, round);
s.entries--;
s.dfresh++;
APR_RING_REMOVE(oldest, link);