summaryrefslogtreecommitdiff
path: root/src/or/dirvote.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-15 20:06:36 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-15 20:06:36 -0400
commit00ff80e0ae3a07ff3e2148d66d59716bc4630096 (patch)
tree4d17d4f1bec1a50ac70579cffd720efdcea00e59 /src/or/dirvote.c
parent10d670674aa49ee6764cf93fe7d3f485a3f9ffd8 (diff)
downloadtor-00ff80e0ae3a07ff3e2148d66d59716bc4630096.tar.gz
tor-00ff80e0ae3a07ff3e2148d66d59716bc4630096.zip
Fixup whitespace issues from 3122 commit
Diffstat (limited to 'src/or/dirvote.c')
-rw-r--r--src/or/dirvote.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 9e763bdc91..f1381988c9 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -314,8 +314,9 @@ compare_vote_rs(const vote_routerstatus_t *a, const vote_routerstatus_t *b)
if ((r = fast_memcmp(a->status.identity_digest, b->status.identity_digest,
DIGEST_LEN)))
return r;
- if ((r = fast_memcmp(a->status.descriptor_digest, b->status.descriptor_digest,
- DIGEST_LEN)))
+ if ((r = fast_memcmp(a->status.descriptor_digest,
+ b->status.descriptor_digest,
+ DIGEST_LEN)))
return r;
if ((r = (int)(b->status.published_on - a->status.published_on)))
return r;
@@ -823,7 +824,8 @@ networkstatus_compute_consensus(smartlist_t *votes,
if (index[v_sl_idx] < size[v_sl_idx]) {
rs = smartlist_get(v->routerstatus_list, index[v_sl_idx]);
if (!lowest_id ||
- fast_memcmp(rs->status.identity_digest, lowest_id, DIGEST_LEN) < 0)
+ fast_memcmp(rs->status.identity_digest,
+ lowest_id, DIGEST_LEN) < 0)
lowest_id = rs->status.identity_digest;
}
});
@@ -881,7 +883,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
* routerinfo and its contents are. */
rs = compute_routerstatus_consensus(matching_descs);
/* Copy bits of that into rs_out. */
- tor_assert(fast_memeq(lowest_id, rs->status.identity_digest, DIGEST_LEN));
+ tor_assert(fast_memeq(lowest_id, rs->status.identity_digest,DIGEST_LEN));
memcpy(rs_out.identity_digest, lowest_id, DIGEST_LEN);
memcpy(rs_out.descriptor_digest, rs->status.descriptor_digest,
DIGEST_LEN);