Browse Source

Fix i386 compilation from spooling patch. I seem to be good at breaking that.

Nick Mathewson 7 years ago
parent
commit
be778a65df
2 changed files with 5 additions and 4 deletions
  1. 4 3
      src/or/dirserv.c
  2. 1 1
      src/or/dirserv.h

+ 4 - 3
src/or/dirserv.c

@@ -3661,7 +3661,7 @@ void
 dirserv_spool_remove_missing_and_guess_size(dir_connection_t *conn,
                                             time_t cutoff,
                                             int compression,
-                                            uint64_t *size_out,
+                                            size_t *size_out,
                                             int *n_expired_out)
 {
   if (BUG(!conn))
@@ -3693,8 +3693,9 @@ dirserv_spool_remove_missing_and_guess_size(dir_connection_t *conn,
     }
   } SMARTLIST_FOREACH_END(spooled);
 
-  if (size_out)
-    *size_out = total;
+  if (size_out) {
+    *size_out = (total > SIZE_MAX) ? SIZE_MAX : (size_t)total;
+  }
   if (n_expired_out)
     *n_expired_out = n_expired;
 }

+ 1 - 1
src/or/dirserv.h

@@ -188,7 +188,7 @@ void spooled_resource_free(spooled_resource_t *spooled);
 void dirserv_spool_remove_missing_and_guess_size(dir_connection_t *conn,
                                                  time_t cutoff,
                                                  int compression,
-                                                 uint64_t *size_out,
+                                                 size_t *size_out,
                                                  int *n_expired_out);
 void dirserv_spool_sort(dir_connection_t *conn);
 void dir_conn_clear_spool(dir_connection_t *conn);