httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1040791 - /httpd/httpd/trunk/support/htcacheclean.c
Date Tue, 30 Nov 2010 21:59:02 GMT
Author: fuankg
Date: Tue Nov 30 21:59:01 2010
New Revision: 1040791

URL: http://svn.apache.org/viewvc?rev=1040791&view=rev
Log:
Some more casts to make MSVC calm ...

Modified:
    httpd/httpd/trunk/support/htcacheclean.c

Modified: httpd/httpd/trunk/support/htcacheclean.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/htcacheclean.c?rev=1040791&r1=1040790&r2=1040791&view=diff
==============================================================================
--- httpd/httpd/trunk/support/htcacheclean.c (original)
+++ httpd/httpd/trunk/support/htcacheclean.c Tue Nov 30 21:59:01 2010
@@ -508,9 +508,9 @@ static int list_urls(char *path, apr_poo
                                                     " %" 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
     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
         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
         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
         }
 
         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);



Mime
View raw message