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

Fix an OSX/clang compilation warning

Browse Source
This commit is contained in:
Nick Mathewson 2016-04-14 20:13:34 -04:00
parent 118556e4b3
commit 10fd4535c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ext/timeouts/timeout.c
View File

@ -300,7 +300,7 @@ TIMEOUT_PUBLIC void timeouts_del(struct timeouts *T, struct timeout *to) {
if (to->pending != &T->expired && TAILQ_EMPTY(to->pending)) { if (to->pending != &T->expired && TAILQ_EMPTY(to->pending)) {
ptrdiff_t index = to->pending - &T->wheel[0][0]; ptrdiff_t index = to->pending - &T->wheel[0][0];
int wheel = index / WHEEL_LEN; int wheel = (int) (index / WHEEL_LEN);
int slot = index % WHEEL_LEN; int slot = index % WHEEL_LEN;
T->pending[wheel] &= ~(WHEEL_C(1) << slot); T->pending[wheel] &= ~(WHEEL_C(1) << slot);
@ -435,7 +435,7 @@ TIMEOUT_PUBLIC void timeouts_update(struct timeouts *T, abstime_t curtime) {
pending = rotl(((UINT64_C(1) << _elapsed) - 1), oslot); pending = rotl(((UINT64_C(1) << _elapsed) - 1), oslot);
nslot = WHEEL_MASK & (curtime >> (wheel * WHEEL_BIT)); nslot = WHEEL_MASK & (curtime >> (wheel * WHEEL_BIT));
pending |= rotr(rotl(((WHEEL_C(1) << _elapsed) - 1), nslot), _elapsed); pending |= rotr(rotl(((WHEEL_C(1) << _elapsed) - 1), nslot), (int)_elapsed);
pending |= WHEEL_C(1) << nslot; pending |= WHEEL_C(1) << nslot;
} }