nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2017-03-28 21:41:59 +02:00
parent 208c2a5c74
commit be778a65df
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/dirserv.c
View File

@ -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;
}

2
src/or/dirserv.h
View File

@ -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);