]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
make make check-spaces happier.
authorRoger Dingledine <arma@torproject.org>
Wed, 27 Apr 2011 19:18:34 +0000 (15:18 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 27 Apr 2011 19:18:34 +0000 (15:18 -0400)
(still not happy.)

src/or/circuituse.c
src/or/dirserv.h

index fd1cf6b9b715fbc8fed935d1e484b59564ffef4c..8503dae46cc72944f7827561d29b769db87bada7 100644 (file)
@@ -433,11 +433,11 @@ circuit_expire_building(void)
                      "Extremely large value for circuit build timeout: %lds. "
                      "Assuming clock jump. Purpose %d (%s)",
                      (long)(now.tv_sec - victim->timestamp_created.tv_sec),
-                     victim->purpose, 
+                     victim->purpose,
                      circuit_purpose_to_string(victim->purpose));
         } else if (circuit_build_times_count_close(&circ_times,
-                                            first_hop_succeeded,
-                                            victim->timestamp_created.tv_sec)) {
+                                         first_hop_succeeded,
+                                         victim->timestamp_created.tv_sec)) {
           circuit_build_times_set_timeout(&circ_times);
         }
       }
@@ -770,7 +770,8 @@ circuit_expire_old_circuits_clientside(void)
      * on it, mark it for close.
      */
     if (circ->timestamp_dirty &&
-        circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now.tv_sec &&
+        circ->timestamp_dirty + get_options()->MaxCircuitDirtiness <
+          now.tv_sec &&
         !TO_ORIGIN_CIRCUIT(circ)->p_streams /* nothing attached */ ) {
       log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %ld sec ago, "
                 "purpose %d)",
index a8a7060a3650115c6e470354aaddf6c7db65db61..569abfca2ee500736b17e4bfe0a68b96c7545eb1 100644 (file)
@@ -52,7 +52,7 @@
    MAX_V_LINE_LEN                                                       \
    )
 
-#define UNNAMED_ROUTER_NICKNAME "Unnamed" 
+#define UNNAMED_ROUTER_NICKNAME "Unnamed"
 
 int connection_dirserv_flushed_some(dir_connection_t *conn);