diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-28 01:55:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-28 01:55:34 -0400 |
| commit | 42b15a0aaa6e00c2ce0ce030abdb87e787f27fe4 (patch) | |
| tree | 2461a1a5f1660e0e4f3bc1aed52d3fc80c968f1b /src/or/dirvote.c | |
| parent | 6f200b61b7effe811809fe60459b0b5b58cb3dbb (diff) | |
| parent | a5232e0c4c572cdff85701f698b8b90c9443d7e4 (diff) | |
| download | tor-42b15a0aaa6e00c2ce0ce030abdb87e787f27fe4.tar.gz tor-42b15a0aaa6e00c2ce0ce030abdb87e787f27fe4.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 15174c1dc3..e77b4feb48 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1585,7 +1585,7 @@ networkstatus_compute_consensus(smartlist_t *votes, * is the same flag as votes[j]->known_flags[b]. */ int *named_flag; /* Index of the flag "Named" for votes[j] */ int *unnamed_flag; /* Index of the flag "Unnamed" for votes[j] */ - int chosen_named_idx, chosen_unnamed_idx; + int chosen_named_idx; strmap_t *name_to_id_map = strmap_new(); char conflict[DIGEST_LEN]; @@ -1603,7 +1603,6 @@ networkstatus_compute_consensus(smartlist_t *votes, for (i = 0; i < smartlist_len(votes); ++i) unnamed_flag[i] = named_flag[i] = -1; chosen_named_idx = smartlist_string_pos(flags, "Named"); - chosen_unnamed_idx = smartlist_string_pos(flags, "Unnamed"); /* Build the flag index. */ SMARTLIST_FOREACH(votes, networkstatus_t *, v, |