diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-02-22 19:09:45 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-02-22 19:09:45 +0000 |
| commit | e7db789e82a7a2edc5c7e8230265f8ec83021f69 (patch) | |
| tree | c8af0a1fe11383d565d916634a7c0d4c963ce4ec /src/or/dirvote.c | |
| parent | a20eda5669cc5ce8b8c02d16ea80f642b7de64f9 (diff) | |
| download | tor-e7db789e82a7a2edc5c7e8230265f8ec83021f69.tar tor-e7db789e82a7a2edc5c7e8230265f8ec83021f69.tar.gz | |
r14399@tombo: nickm | 2008-02-22 14:09:38 -0500
More 64-to-32 fixes. Partial backport candidate. still not done.
svn:r13680
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 50f856929..fbbd82ee2 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -283,7 +283,7 @@ compare_vote_rs(const vote_routerstatus_t *a, const vote_routerstatus_t *b) if ((r = memcmp(a->status.descriptor_digest, b->status.descriptor_digest, DIGEST_LEN))) return r; - if ((r = (b->status.published_on - a->status.published_on))) + if ((r = (int)(b->status.published_on - a->status.published_on))) return r; if ((r = strcmp(b->status.nickname, a->status.nickname))) return r; @@ -1220,7 +1220,7 @@ dirvote_recalculate_timing(or_options_t *options, time_t now) memset(&voting_schedule, 0, sizeof(voting_schedule)); if (consensus) { - interval = consensus->fresh_until - consensus->valid_after; + interval = (int)( consensus->fresh_until - consensus->valid_after ); vote_delay = consensus->vote_seconds; dist_delay = consensus->dist_seconds; } else { |