[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor/master] Replace accumulated C ;;s with ;s

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor/master] Replace accumulated C ;;s with ;s
From: nickm@xxxxxxxxxxxxxx
Date: Fri, 15 Sep 2017 20:43:37 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Fri, 15 Sep 2017 16:51:25 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit f4af1919abc0286514051fbbdd97f824879814bb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Sep 15 16:43:17 2017 -0400

    Replace accumulated C ;;s with ;s
    
    I don't know where these came from.
---
 src/or/addressmap.c            |  2 +-
 src/or/config.c                |  2 +-
 src/or/control.c               |  2 +-
 src/or/routerlist.c            |  2 +-
 src/test/test_config.c         | 34 +++++++++++++++++-----------------
 src/test/test_dir_handle_get.c |  2 +-
 src/test/test_entrynodes.c     |  2 +-
 src/test/test_hs_intropoint.c  | 16 ++++++++--------
 src/test/test_options.c        |  2 +-
 src/test/test_tortls.c         |  2 +-
 10 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/or/addressmap.c b/src/or/addressmap.c
index ebafc1cc0..7e9263360 100644
--- a/src/or/addressmap.c
+++ b/src/or/addressmap.c
@@ -213,7 +213,7 @@ addressmap_clear_excluded_trackexithosts(const or_options_t *options)
     while (dot > target && *dot != '.')
       dot--;
     if (*dot == '.') dot++;
-    nodename = tor_strndup(dot, len-5-(dot-target));;
+    nodename = tor_strndup(dot, len-5-(dot-target));
     node = node_get_by_nickname(nodename, NNF_NO_WARN_UNNAMED);
     tor_free(nodename);
     if (!node ||
diff --git a/src/or/config.c b/src/or/config.c
index 6badb4e68..4ee140381 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3485,7 +3485,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
   if (options->RendPostPeriod < min_rendpostperiod) {
     log_warn(LD_CONFIG, "RendPostPeriod option is too short; "
              "raising to %d seconds.", min_rendpostperiod);
-    options->RendPostPeriod = min_rendpostperiod;;
+    options->RendPostPeriod = min_rendpostperiod;
   }
 
   if (options->RendPostPeriod > MAX_DIR_PERIOD) {
diff --git a/src/or/control.c b/src/or/control.c
index bd5f01a04..8173cb1e5 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -5846,7 +5846,7 @@ control_event_circuit_cell_stats(void)
   if (!get_options()->TestingEnableCellStatsEvent ||
       !EVENT_IS_INTERESTING(EVENT_CELL_STATS))
     return 0;
-  cell_stats = tor_malloc(sizeof(cell_stats_t));;
+  cell_stats = tor_malloc(sizeof(cell_stats_t));
   SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) {
     if (!circ->testing_cell_stats)
       continue;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9b056e80a..c7c109253 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2306,7 +2306,7 @@ routerlist_add_node_and_family(smartlist_t *sl, const routerinfo_t *router)
 {
   /* XXXX MOVE ? */
   node_t fake_node;
-  const node_t *node = node_get_by_id(router->cache_info.identity_digest);;
+  const node_t *node = node_get_by_id(router->cache_info.identity_digest);
   if (node == NULL) {
     memset(&fake_node, 0, sizeof(fake_node));
     fake_node.ri = (routerinfo_t *)router;
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 9351f4165..39f9e3ba9 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -3745,119 +3745,119 @@ test_config_port_cfg_line_extract_addrport(void *arg)
 
   tt_int_op(port_cfg_line_extract_addrport("", &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 0);
-  tt_str_op(a, OP_EQ, "");;
+  tt_str_op(a, OP_EQ, "");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("hello", &a, &unixy, &rest),
             OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 0);
-  tt_str_op(a, OP_EQ, "hello");;
+  tt_str_op(a, OP_EQ, "hello");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport(" flipperwalt gersplut",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 0);
-  tt_str_op(a, OP_EQ, "flipperwalt");;
+  tt_str_op(a, OP_EQ, "flipperwalt");
   tt_str_op(rest, OP_EQ, "gersplut");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport(" flipperwalt \t gersplut",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 0);
-  tt_str_op(a, OP_EQ, "flipperwalt");;
+  tt_str_op(a, OP_EQ, "flipperwalt");
   tt_str_op(rest, OP_EQ, "gersplut");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("flipperwalt \t gersplut",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 0);
-  tt_str_op(a, OP_EQ, "flipperwalt");;
+  tt_str_op(a, OP_EQ, "flipperwalt");
   tt_str_op(rest, OP_EQ, "gersplut");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("unix:flipperwalt \t gersplut",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 1);
-  tt_str_op(a, OP_EQ, "flipperwalt");;
+  tt_str_op(a, OP_EQ, "flipperwalt");
   tt_str_op(rest, OP_EQ, "gersplut");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("lolol",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 0);
-  tt_str_op(a, OP_EQ, "lolol");;
+  tt_str_op(a, OP_EQ, "lolol");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("unix:lolol",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 1);
-  tt_str_op(a, OP_EQ, "lolol");;
+  tt_str_op(a, OP_EQ, "lolol");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("unix:lolol ",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 1);
-  tt_str_op(a, OP_EQ, "lolol");;
+  tt_str_op(a, OP_EQ, "lolol");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport(" unix:lolol",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 1);
-  tt_str_op(a, OP_EQ, "lolol");;
+  tt_str_op(a, OP_EQ, "lolol");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("foobar:lolol",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 0);
-  tt_str_op(a, OP_EQ, "foobar:lolol");;
+  tt_str_op(a, OP_EQ, "foobar:lolol");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport(":lolol",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 0);
-  tt_str_op(a, OP_EQ, ":lolol");;
+  tt_str_op(a, OP_EQ, ":lolol");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("unix:\"lolol\"",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 1);
-  tt_str_op(a, OP_EQ, "lolol");;
+  tt_str_op(a, OP_EQ, "lolol");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("unix:\"lolol\" ",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 1);
-  tt_str_op(a, OP_EQ, "lolol");;
+  tt_str_op(a, OP_EQ, "lolol");
   tt_str_op(rest, OP_EQ, "");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("unix:\"lolol\" foo ",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 1);
-  tt_str_op(a, OP_EQ, "lolol");;
+  tt_str_op(a, OP_EQ, "lolol");
   tt_str_op(rest, OP_EQ, "foo ");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("unix:\"lol ol\" foo ",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 1);
-  tt_str_op(a, OP_EQ, "lol ol");;
+  tt_str_op(a, OP_EQ, "lol ol");
   tt_str_op(rest, OP_EQ, "foo ");
   tor_free(a);
 
   tt_int_op(port_cfg_line_extract_addrport("unix:\"lol\\\" ol\" foo ",
                                            &a, &unixy, &rest), OP_EQ, 0);
   tt_int_op(unixy, OP_EQ, 1);
-  tt_str_op(a, OP_EQ, "lol\" ol");;
+  tt_str_op(a, OP_EQ, "lol\" ol");
   tt_str_op(rest, OP_EQ, "foo ");
   tor_free(a);
 
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index e60884c86..fe26657ad 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -870,7 +870,7 @@ test_dir_handle_get_server_descriptors_authority(void* data)
   mock_routerinfo->cache_info.signed_descriptor_body =
     tor_strdup(TEST_DESCRIPTOR);
   mock_routerinfo->cache_info.signed_descriptor_len =
-    strlen(TEST_DESCRIPTOR) - annotation_len;;
+    strlen(TEST_DESCRIPTOR) - annotation_len;
   mock_routerinfo->cache_info.annotations_len = annotation_len;
   mock_routerinfo->cache_info.published_on = time(NULL);
 
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index d87670d82..1e008c3a2 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -1522,7 +1522,7 @@ test_entry_guard_retry_unreachable(void *arg)
   entry_guards_expand_sample(gs);
   /* Let's say that we have two guards, and they're down.
    */
-  time_t start = approx_time();;
+  time_t start = approx_time();
   entry_guard_t *g1 = smartlist_get(gs->sampled_entry_guards, 0);
   entry_guard_t *g2 = smartlist_get(gs->sampled_entry_guards, 1);
   entry_guard_t *g3 = smartlist_get(gs->sampled_entry_guards, 2);
diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c
index 1e570630c..0cae2de7e 100644
--- a/src/test/test_hs_intropoint.c
+++ b/src/test/test_hs_intropoint.c
@@ -170,7 +170,7 @@ test_establish_intro_wrong_purpose(void *arg)
   ssize_t cell_len = 0;
   char circ_nonce[DIGEST_LEN] = {0};
   uint8_t cell_body[RELAY_PAYLOAD_SIZE];
-  or_circuit_t *intro_circ = or_circuit_new(0,NULL);;
+  or_circuit_t *intro_circ = or_circuit_new(0,NULL);
 
   (void)arg;
 
@@ -211,7 +211,7 @@ static void
 test_establish_intro_wrong_keytype(void *arg)
 {
   int retval;
-  or_circuit_t *intro_circ = or_circuit_new(0,NULL);;
+  or_circuit_t *intro_circ = or_circuit_new(0,NULL);
   char circ_nonce[DIGEST_LEN] = {0};
 
   (void) arg;
@@ -239,7 +239,7 @@ test_establish_intro_wrong_keytype2(void *arg)
   char circ_nonce[DIGEST_LEN] = {0};
   uint8_t cell_body[RELAY_PAYLOAD_SIZE];
   ssize_t cell_len = 0;
-  or_circuit_t *intro_circ = or_circuit_new(0,NULL);;
+  or_circuit_t *intro_circ = or_circuit_new(0,NULL);
 
   (void) arg;
 
@@ -275,7 +275,7 @@ test_establish_intro_wrong_mac(void *arg)
   ssize_t cell_len = 0;
   uint8_t cell_body[RELAY_PAYLOAD_SIZE];
   trn_cell_establish_intro_t *cell = NULL;
-  or_circuit_t *intro_circ = or_circuit_new(0,NULL);;
+  or_circuit_t *intro_circ = or_circuit_new(0,NULL);
 
   (void) arg;
 
@@ -347,7 +347,7 @@ test_establish_intro_wrong_auth_key_len(void *arg)
   ssize_t cell_len = 0;
   size_t bad_auth_key_len = ED25519_PUBKEY_LEN - 1;
   trn_cell_establish_intro_t *cell = NULL;
-  or_circuit_t *intro_circ = or_circuit_new(0,NULL);;
+  or_circuit_t *intro_circ = or_circuit_new(0,NULL);
 
   (void) arg;
 
@@ -392,7 +392,7 @@ test_establish_intro_wrong_sig_len(void *arg)
   ssize_t cell_len = 0;
   size_t bad_sig_len = ED25519_SIG_LEN - 1;
   trn_cell_establish_intro_t *cell = NULL;
-  or_circuit_t *intro_circ = or_circuit_new(0,NULL);;
+  or_circuit_t *intro_circ = or_circuit_new(0,NULL);
 
   (void) arg;
 
@@ -435,7 +435,7 @@ test_establish_intro_wrong_sig(void *arg)
   char circ_nonce[DIGEST_LEN] = {0};
   uint8_t cell_body[RELAY_PAYLOAD_SIZE];
   ssize_t cell_len = 0;
-  or_circuit_t *intro_circ = or_circuit_new(0,NULL);;
+  or_circuit_t *intro_circ = or_circuit_new(0,NULL);
 
   (void) arg;
 
@@ -783,7 +783,7 @@ static void
 test_received_introduce1_handling(void *arg)
 {
   int ret;
-  uint8_t *request = NULL, buf[128];;
+  uint8_t *request = NULL, buf[128];
   trn_cell_introduce1_t *cell = NULL;
   or_circuit_t *circ = NULL;
 
diff --git a/src/test/test_options.c b/src/test/test_options.c
index bb5cf685d..94a5a034d 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -282,7 +282,7 @@ test_have_enough_mem_for_dircache(void *arg)
   or_options_t *opt=NULL;
   or_options_t *dflt=NULL;
   config_line_t *cl=NULL;
-  char *msg=NULL;;
+  char *msg=NULL;
   int r;
   const char *configuration = "ORPort 8080\nDirCache 1", *expect_errmsg;
 
diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index d04a76717..29f7cc9c3 100644
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -1290,7 +1290,7 @@ test_tortls_get_tlssecrets(void *ignored)
 {
   (void)ignored;
   int ret;
-  uint8_t *secret_out = tor_malloc_zero(DIGEST256_LEN);;
+  uint8_t *secret_out = tor_malloc_zero(DIGEST256_LEN);
   tor_tls_t *tls;
   tls = tor_malloc_zero(sizeof(tor_tls_t));
   tls->ssl = tor_malloc_zero(sizeof(SSL));

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket23310_032_02'
Next by Author: [tor-commits] [tor/maint-0.2.9] Merge branch 'bug15582_029' into maint-0.2.9
Previous by thread: [tor-commits] [tor/master] Merge branch 'scan-build-032'
Next by thread: [tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
Index(es):
- Author
- Thread