commit 3a3120819c8f600ef7d22ddf3f5476791c7e1d9b Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 12 14:11:44 2016 -0400
Rename compute_protover_vote to protover_compute_vote --- src/or/dirvote.c | 2 +- src/or/protover.c | 2 +- src/or/protover.h | 2 +- src/test/test_protover.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index f606b07..c65243c 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1256,7 +1256,7 @@ compute_nth_protocol_set(int n, int n_voters, const smartlist_t *votes) smartlist_add(proto_votes, (void*)v); } SMARTLIST_FOREACH_END(ns);
- char *protocols = compute_protover_vote(proto_votes, threshold); + char *protocols = protover_compute_vote(proto_votes, threshold); smartlist_free(proto_votes);
char *result = NULL; diff --git a/src/or/protover.c b/src/or/protover.c index d29cdba..434d3f3 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -520,7 +520,7 @@ contract_protocol_list(const smartlist_t *proto_strings) * contract_protocol_list above. */ char * -compute_protover_vote(const smartlist_t *list_of_proto_strings, +protover_compute_vote(const smartlist_t *list_of_proto_strings, int threshold) { smartlist_t *all_entries = smartlist_new(); diff --git a/src/or/protover.h b/src/or/protover.h index 520db37..654127e 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -27,7 +27,7 @@ int protover_all_supported(const char *s, char **missing); int protover_is_supported_here(protocol_type_t pr, uint32_t ver); const char *get_supported_protocols(void);
-char *compute_protover_vote(const smartlist_t *list_of_proto_strings, +char *protover_compute_vote(const smartlist_t *list_of_proto_strings, int threshold); const char *protover_compute_for_old_tor(const char *version); int protocol_list_supports_protocol(const char *list, protocol_type_t tp, diff --git a/src/test/test_protover.c b/src/test/test_protover.c index eacbbcb..f00955d 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -120,22 +120,22 @@ test_protover_vote(void *arg) (void) arg;
smartlist_t *lst = smartlist_new(); - char *result = compute_protover_vote(lst, 1); + char *result = protover_compute_vote(lst, 1);
tt_str_op(result, OP_EQ, ""); tor_free(result);
smartlist_add(lst, (void*) "Foo=1-10,500 Bar=1,3-7,8"); - result = compute_protover_vote(lst, 1); + result = protover_compute_vote(lst, 1); tt_str_op(result, OP_EQ, "Bar=1,3-8 Foo=1-10,500"); tor_free(result);
smartlist_add(lst, (void*) "Quux=123-456,78 Bar=2-6,8 Foo=9"); - result = compute_protover_vote(lst, 1); + result = protover_compute_vote(lst, 1); tt_str_op(result, OP_EQ, "Bar=1-8 Foo=1-10,500 Quux=78,123-456"); tor_free(result);
- result = compute_protover_vote(lst, 2); + result = protover_compute_vote(lst, 2); tt_str_op(result, OP_EQ, "Bar=3-6,8 Foo=9"); tor_free(result);