commit ca18768fb2d178052fbf1207075406673f422c8a Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 11 12:59:57 2012 -0400
Aftermath of isin->contains renaming
Fix wide lines and comments, and add a changes file --- changes/rename5285 | 2 ++ src/or/circuituse.c | 3 ++- src/or/connection_edge.c | 3 ++- src/or/dns.c | 3 ++- src/or/rendservice.c | 3 ++- src/test/test_containers.c | 4 ++-- 6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/changes/rename5285 b/changes/rename5285 new file mode 100644 index 0000000..26ec976 --- /dev/null +++ b/changes/rename5285 @@ -0,0 +1,2 @@ + o Code simplifications and refactoring: + - Rename "isin" functions to "contains", for grammar. Fixes ticket 5285. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bd28a1b..83734c9 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -804,7 +804,8 @@ circuit_stream_is_being_handled(entry_connection_t *conn, const node_t *exitnode; int num=0; time_t now = time(NULL); - int need_uptime = smartlist_contains_int_as_string(get_options()->LongLivedPorts, + int need_uptime = smartlist_contains_int_as_string( + get_options()->LongLivedPorts, conn ? conn->socks_request->port : port);
for (circ=global_circuitlist;circ;circ = circ->next) { diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index acab815..a68a5cf 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -829,7 +829,8 @@ static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port) { const or_options_t *options = get_options(); - int reject = smartlist_contains_int_as_string(options->RejectPlaintextPorts, port); + int reject = smartlist_contains_int_as_string( + options->RejectPlaintextPorts, port);
if (smartlist_contains_int_as_string(options->WarnPlaintextPorts, port)) { log_warn(LD_APP, "Application request to port %d: this port is " diff --git a/src/or/dns.c b/src/or/dns.c index 80e7d8b..68309a8 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1866,7 +1866,8 @@ add_wildcarded_test_address(const char *address) if (!dns_wildcarded_test_address_list) dns_wildcarded_test_address_list = smartlist_new();
- if (smartlist_contains_string_case(dns_wildcarded_test_address_list, address)) + if (smartlist_contains_string_case(dns_wildcarded_test_address_list, + address)) return;
n_test_addrs = get_options()->ServerDNSTestAddresses ? diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 7d4f6fa..6ffa4f8 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2809,7 +2809,8 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, hs_dir->or_port); tor_free(hs_dir_ip); /* Remember successful upload to this router for next time. */ - if (!smartlist_contains_digest(successful_uploads, hs_dir->identity_digest)) + if (!smartlist_contains_digest(successful_uploads, + hs_dir->identity_digest)) smartlist_add(successful_uploads, hs_dir->identity_digest); } smartlist_clear(responsible_dirs); diff --git a/src/test/test_containers.c b/src/test/test_containers.c index aec2cb7..ca90162 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -278,7 +278,7 @@ test_container_smartlist_strings(void) test_streq(cp_alloc, "50,a,canal,man,noon,panama,plan,radar"); tor_free(cp_alloc);
- /* Test string_isin and isin_case and num_isin */ + /* Test contains_string, contains_string_case and contains_int_as_string */ test_assert(smartlist_contains_string(sl, "noon")); test_assert(!smartlist_contains_string(sl, "noonoon")); test_assert(smartlist_contains_string_case(sl, "nOOn")); @@ -389,7 +389,7 @@ test_container_smartlist_digests(void) { smartlist_t *sl = smartlist_new();
- /* digest_isin. */ + /* contains_digest */ smartlist_add(sl, tor_memdup("AAAAAAAAAAAAAAAAAAAA", DIGEST_LEN)); smartlist_add(sl, tor_memdup("\00090AAB2AAAAaasdAAAAA", DIGEST_LEN)); smartlist_add(sl, tor_memdup("\00090AAB2AAAAaasdAAAAA", DIGEST_LEN));