[tor-commits] [tor/master] whitespace fixes

[nickm at torproject.org]

commit fb97f76e71ab06abe4b4927f743f6683e7aaedab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 8 13:57:08 2017 -0400

    whitespace fixes
---
 src/or/channel.c        | 1 -
 src/or/channelpadding.c | 2 +-
 src/or/channeltls.c     | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/channel.c b/src/or/channel.c
index 599b00a..5b184f1 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -86,7 +86,6 @@ static smartlist_t *active_listeners = NULL;
 /* All channel_listener_t instances in LISTENING state */
 static smartlist_t *finished_listeners = NULL;
 
-
 /** Map from channel->global_identifier to channel.  Contains the same
  * elements as all_channels. */
 HT_HEAD(channel_gid_map, channel_s) channel_gid_map = HT_INITIALIZER();
diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c
index 2370827..e57408a 100644
--- a/src/or/channelpadding.c
+++ b/src/or/channelpadding.c
@@ -564,7 +564,7 @@ channelpadding_get_channel_idle_timeout(const channel_t *chan,
   unsigned int timeout;
 
   /* Non-canonical and client channels only last for 3-4.5 min when idle */
-  if (!is_canonical || CHANNEL_IS_CLIENT(chan, options)) { 
+  if (!is_canonical || CHANNEL_IS_CLIENT(chan, options)) {
 #define CONNTIMEOUT_CLIENTS_BASE 180 // 3 to 4.5 min
     timeout = CONNTIMEOUT_CLIENTS_BASE
         + crypto_rand_int(CONNTIMEOUT_CLIENTS_BASE/2);
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index 4cdd554..f44e4fc 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -1806,12 +1806,13 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan)
 
   if (me && !TLS_CHAN_TO_BASE(chan)->is_canonical_to_peer &&
       channel_is_canonical(TLS_CHAN_TO_BASE(chan))) {
+    const char *descr =
+      TLS_CHAN_TO_BASE(chan)->get_remote_descr(TLS_CHAN_TO_BASE(chan), 0);
     log_info(LD_OR,
              "We made a connection to a relay at %s (fp=%s) but we think "
              "they will not consider this connection canonical. They "
              "think we are at %s, but we think its %s.",
-             safe_str(TLS_CHAN_TO_BASE(chan)->get_remote_descr(TLS_CHAN_TO_BASE(chan),
-                      0)),
+             safe_str(descr),
              safe_str(hex_str(chan->conn->identity_digest, DIGEST_LEN)),
              safe_str(tor_addr_is_null(&my_apparent_addr) ?
              "<none>" : fmt_and_decorate_addr(&my_apparent_addr)),