commit be78e9ff3782639b9fa72dcfa9bda559cfc83f17 Author: Andrea Shepard andrea@torproject.org Date: Fri Jul 1 21:52:32 2016 +0000
Keep make check-spaces happy --- src/or/dirvote.c | 3 ++- src/or/shared_random.c | 8 +++++--- src/or/shared_random.h | 1 + src/or/shared_random_state.c | 1 + src/or/shared_random_state.h | 1 + src/test/test_dir.c | 6 ++++-- src/test/test_shared_random.c | 1 + 7 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 4399bad..c31894a 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2648,7 +2648,8 @@ get_voting_schedule(const or_options_t *options, time_t now, int severity)
new_voting_schedule->fetch_missing_signatures = start - (dist_delay/2); new_voting_schedule->voting_ends = start - dist_delay; - new_voting_schedule->fetch_missing_votes = start - dist_delay - (vote_delay/2); + new_voting_schedule->fetch_missing_votes = + start - dist_delay - (vote_delay/2); new_voting_schedule->voting_starts = start - dist_delay - vote_delay;
{ diff --git a/src/or/shared_random.c b/src/or/shared_random.c index a7a2238..e9e6cbc 100644 --- a/src/or/shared_random.c +++ b/src/or/shared_random.c @@ -327,7 +327,6 @@ reveal_decode(const char *encoded, sr_commit_t *commit) return -1; }
- /* Encode a reveal element using a given commit object to dst which is a * buffer large enough to put the base64-encoded reveal construction. The * format is as follow: @@ -629,7 +628,8 @@ should_keep_commit(const sr_commit_t *commit, const char *voter_key, lasts multiple rounds. However if the commitment value changes during commit phase, it might be a bug so log more loudly. */ if (!commitments_are_the_same(commit, saved_commit)) { - log_info(LD_DIR, "SR: Received altered commit from %s in commit phase.", + log_info(LD_DIR, + "SR: Received altered commit from %s in commit phase.", sr_commit_get_rsa_fpr(commit)); } else { log_debug(LD_DIR, "SR: Ignoring known commit during commit phase."); @@ -1348,9 +1348,11 @@ sr_save_and_cleanup(void) /* Set the global value of number of SRV agreements so the test can play * along by calling specific functions that don't parse the votes prior for * the AuthDirNumSRVAgreements value. */ -void set_num_srv_agreements(int32_t value) +void +set_num_srv_agreements(int32_t value) { num_srv_agreements_from_vote = value; }
#endif /* TOR_UNIT_TESTS */ + diff --git a/src/or/shared_random.h b/src/or/shared_random.h index 3922f33..51f3b55 100644 --- a/src/or/shared_random.h +++ b/src/or/shared_random.h @@ -164,3 +164,4 @@ void set_num_srv_agreements(int32_t value); #endif /* TOR_UNIT_TESTS */
#endif /* TOR_SHARED_RANDOM_H */ + diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index d0cd460..73df9c4 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -1351,3 +1351,4 @@ get_sr_state(void) }
#endif /* TOR_UNIT_TESTS */ + diff --git a/src/or/shared_random_state.h b/src/or/shared_random_state.h index e0b6e46..43a7f1d 100644 --- a/src/or/shared_random_state.h +++ b/src/or/shared_random_state.h @@ -144,3 +144,4 @@ STATIC sr_state_t *get_sr_state(void); #endif /* TOR_UNIT_TESTS */
#endif /* TOR_SHARED_RANDOM_STATE_H */ + diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 200cddd..8889ccc 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1438,7 +1438,8 @@ test_dir_measured_bw_kb_cache(void *arg) }
static char * -my_dirvote_compute_params(smartlist_t *votes, int method, int total_authorities) +my_dirvote_compute_params(smartlist_t *votes, int method, + int total_authorities) { smartlist_t *s = dirvote_compute_params(votes, method, total_authorities); tor_assert(s); @@ -1573,7 +1574,8 @@ test_dir_param_voting_lookup(void *arg) tt_int_op(1000, OP_EQ, dirvote_get_intermediate_param_value(lst, "ab", 1000)); tt_int_op(9, OP_EQ, dirvote_get_intermediate_param_value(lst, "abc", 1000)); - tt_int_op(99, OP_EQ, dirvote_get_intermediate_param_value(lst, "abcd", 1000)); + tt_int_op(99, OP_EQ, + dirvote_get_intermediate_param_value(lst, "abcd", 1000));
/* moomin appears twice. */ tt_int_op(-100, OP_EQ, diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 95f8198..d001785 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -1263,3 +1263,4 @@ struct testcase_t sr_tests[] = { NULL, NULL }, END_OF_TESTCASES }; +