more cleanups; getting closer

svn:r9655

6 files changed, 10 insertions, 9 deletions

diff --git a/src/common/compat.c b/src/common/compat.c
index c9f5e85aba..7cf99a67ca 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -990,7 +990,7 @@ typedef struct tor_pthread_data_t {
   void (*func)(void *);
   void *data;
 } tor_pthread_data_t;
-/** Given a tor_pthread_data_t <b>_data</b>, call _data-&gt;func(d-&gt;data);,
+/** Given a tor_pthread_data_t <b>_data</b>, call _data-&gt;func(d-&gt;data)
  * and free _data.  Used to make sure we can call functions the way pthread
  * expects. */
 static void *
diff --git a/src/common/container.h b/src/common/container.h
index fbd3c6c603..b07f92b636 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -157,7 +157,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join,
     } } while (0)
 
 /** Helper: While in a SMARTLIST_FOREACH loop over the list <b>sl</b> indexed
- * with the variable <b>var</b>, remover the current element in a way that
+ * with the variable <b>var</b>, remove the current element in a way that
  * won't confuse the loop. */
 #define SMARTLIST_DEL_CURRENT(sl, var)          \
   do {                                          \
diff --git a/src/or/directory.c b/src/or/directory.c
index 0dc2eccf0d..d3e582ce7b 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -712,7 +712,8 @@ http_set_address_origin(const char *headers, connection_t *conn)
   if (fwd) {
     struct in_addr in;
     if (!tor_inet_aton(fwd, &in) || is_internal_IP(ntohl(in.s_addr), 0)) {
-      log_debug(LD_DIR, "Ignoring unrecognized or internal IP '%s'", fwd);
+      log_debug(LD_DIR, "Ignoring unrecognized or internal IP %s",
+                escaped(fwd));
       tor_free(fwd);
       return;
     }
diff --git a/src/or/main.c b/src/or/main.c
index 551b3686b2..19e875c2c0 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -974,7 +974,8 @@ run_scheduled_events(time_t now)
   }
 }
 
-/** Libevent timer: used to invoke second_elapsed_callback() once per second. */
+/** Libevent timer: used to invoke second_elapsed_callback() once per
+ * second. */
 static struct event *timeout_event = NULL;
 /** Number of libevent errors in the last second: we die if we get too many. */
 static int n_libevent_errors = 0;
diff --git a/src/or/relay.c b/src/or/relay.c
index e89937f4f5..28d77cc4a5 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -829,9 +829,9 @@ connection_edge_process_end_not_open(
   return 0;
 }
 
-/** Helper: change the socks_request->address field on conn to the dotted-quad
- * representation of <b>new_addr</b> (given in host order), and send an
- * appropriate REMAP event. */
+/** Helper: change the socks_request-&gt;address field on conn to the
+ * dotted-quad representation of <b>new_addr</b> (given in host order),
+ * and send an appropriate REMAP event. */
 static void
 remap_event_helper(edge_connection_t *conn, uint32_t new_addr)
 {
@@ -873,7 +873,6 @@ connection_edge_process_relay_cell_not_open(
              "Got 'connected' while not in state connect_wait. Dropping.");
       return 0;
     }
-    // log_fn(LOG_INFO,"Connected! Notifying application.");
     conn->_base.state = AP_CONN_STATE_OPEN;
     log_info(LD_APP,"'connected' received after %d seconds.",
              (int)(time(NULL) - conn->_base.timestamp_lastread));
diff --git a/src/or/router.c b/src/or/router.c
index 17c7581853..0c0f4c986d 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -562,7 +562,7 @@ router_perform_bandwidth_test(int num_circs, time_t now)
   int cells_per_circuit = max_cells / num_circs;
   origin_circuit_t *circ = NULL;
 
-  log_notice(LD_OR,"Performing bandwidth self-test.");
+  log_notice(LD_OR,"Performing bandwidth self-test...done.");
   while ((circ = circuit_get_next_by_pk_and_purpose(circ, NULL,
                                               CIRCUIT_PURPOSE_TESTING))) {
     /* dump cells_per_circuit drop cells onto this circ */