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

diff --git a/support/htcacheclean.c b/support/htcacheclean.c
index 92984333a95929f2e3258322695d2ab37bdec04f..0ce21cdbc02d62c9d6fc4203f8c2f4aa29afd655 100644 (file)
--- 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);