sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

32-bit compilation warnings

This commit is contained in:
Nick Mathewson 2018-04-13 17:00:51 -04:00
parent c2f83746f4
commit 4b58b97c68
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/connection.c
View File

@ -2975,9 +2975,9 @@ global_write_bucket_low(connection_t *conn, size_t attempt, int priority)
if (priority == 1) { /* old-style v1 query */
/* Could we handle *two* of these requests within the next two seconds? */
const or_options_t *options = get_options();
size_t can_write = smaller_bucket
size_t can_write = (size_t) (smaller_bucket
+ 2*(options->RelayBandwidthRate ? options->RelayBandwidthRate :
options->BandwidthRate);
options->BandwidthRate));
if (can_write < 2*attempt)
return 1;
} else { /* v2 query */

4
src/test/test_util.c
View File

@ -5910,8 +5910,8 @@ test_util_monotonic_time(void *arg)
{
uint64_t units = monotime_msec_to_approx_coarse_stamp_units(5000);
uint64_t ms = monotime_coarse_stamp_units_to_approx_msec(units);
tt_int_op(ms, OP_GE, 4950);
tt_int_op(ms, OP_LT, 5050);
tt_u64_op(ms, OP_GE, 4950);
tt_u64_op(ms, OP_LT, 5050);
}
done: