Aftermath of isin->contains renaming

Fix wide lines and comments, and add a changes file

diff --git a/changes/rename5285 b/changes/rename5285
new file mode 100644 (file)
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 bd28a1b2c54921540b8c25956f8063745848326b..83734c9d6d439b646eb6dfb7c2be47c5977732aa 100644 (file)
--- 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 acab81565d83b22b827f5c8d742f7d8e3f8de2fd..a68a5cf42b811a8882f9ecdc49e12e34acddfa3b 100644 (file)
--- 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 80e7d8b0235061580bfc5ba4eb6f0c3730c834f7..68309a80df93595c4d1b9542ebca32f8104d1361 100644 (file)
--- 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 7d4f6fa5d499e35614cf61424e9aeb30442f9e0a..6ffa4f8f95ced4b67545c6171e049e1f9f0ec8b3 100644 (file)
--- 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 aec2cb7a65ff698a6d3d5cd3af0b74d29489299e..ca901624c239a0c66fa8cfe32c1574612690846a 100644 (file)
--- 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));