mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-28 06:13:31 +01:00
Fix Snow Leopard compile and a codestyle violation
When calculating the current tick, cap (tv_sec / EWMA_TICK_LEN) to an unsigned int.
This commit is contained in:
parent
06e8370c33
commit
27b7746c51
@ -1817,7 +1817,7 @@ cell_ewma_to_circuit(cell_ewma_t *ewma)
|
||||
#define EWMA_DEFAULT_SCALE_FACTOR 0.9
|
||||
|
||||
/** Given a timeval 'now', compute the cell_ewma tick in which it occurs
|
||||
* and the fraction of the tick that has elapsed before
|
||||
* and the fraction of the tick that has elapsed before
|
||||
*
|
||||
* These tick values are not meant to be shared between Tor instances, or used
|
||||
* for other purposes. */
|
||||
@ -1825,7 +1825,7 @@ static unsigned
|
||||
cell_ewma_tick_from_timeval(const struct timeval *now,
|
||||
double *remainder_out)
|
||||
{
|
||||
unsigned res = now->tv_sec / EWMA_TICK_LEN;
|
||||
unsigned res = (unsigned) (now->tv_sec / EWMA_TICK_LEN);
|
||||
/* rem */
|
||||
double rem = (now->tv_sec % EWMA_TICK_LEN) +
|
||||
((double)(now->tv_usec)) / 1.0e6;
|
||||
|
Loading…
Reference in New Issue
Block a user