Fix issues found by arma in review.

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 50faac17021e530b24f5220c140d0755bb6f07b6..a140f0ae67d974e5664fd269dbe9e7d924a8483c 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -306,8 +306,7 @@ circuit_build_times_parse_state(circuit_build_times_t *cbt,
   int tot_values = 0, N = 0;
   config_line_t *line;
   int i;
-  msg = NULL; /* XXX is this a bug? should be *msg, or we'll seg fault
-               * if we try to set it */
+  *msg = NULL;
   circuit_build_times_init(cbt);
 
   /* We don't support decreasing the table size yet */

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index f6a41665d13538bbfffbb6e0ff0e20f352465609..7ca65bcc536274bbe4ad5eeb50da27c948f67edd 100644 (file)
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -858,10 +858,8 @@ circuit_build_failed(origin_circuit_t *circ)
       break;
     case CIRCUIT_PURPOSE_C_INTRODUCING:
       /* at Alice, connecting to intro point */
-      circuit_increment_failure_count();
       /* Don't increment failure count, since Bob may have picked
        * the introduction point maliciously */
-      /* XXX Mike, you didn't read my comment above! :) -RD */
       /* Alice will pick a new intro point when this one dies, if
        * the stream in question still cares. No need to act here. */
       break;
@@ -873,10 +871,8 @@ circuit_build_failed(origin_circuit_t *circ)
       break;
     case CIRCUIT_PURPOSE_S_CONNECT_REND:
       /* at Bob, connecting to rend point */
-      circuit_increment_failure_count();
       /* Don't increment failure count, since Alice may have picked
        * the rendezvous point maliciously */
-      /* XXX Mike, you didn't read my comment above! :) -RD */
       log_info(LD_REND,
                "Couldn't connect to Alice's chosen rend point %s "
                "(%s hop failed).",

diff --git a/src/or/config.c b/src/or/config.c
index cd222595b54dfb58c5068b4ef1f176527b1c9172..7c2623eee9b1fe3e57b664acc01195bde61d2c50 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -409,7 +409,7 @@ static config_var_t _state_vars[] = {
   V(LastRotatedOnionKey,              ISOTIME,  NULL),
   V(LastWritten,                      ISOTIME,  NULL),
 
-  V("TotalBuildTimes",                UINT,     NULL),
+  V(TotalBuildTimes,                  UINT,     NULL),
   VAR("CircuitBuildTimeBin",          LINELIST_S, BuildtimeHistogram, NULL),
   VAR("BuildtimeHistogram",           LINELIST_V, BuildtimeHistogram, NULL),