[tor-commits] [tor/maint-0.2.9] Fix a pair of errors in bug23512

[teor at torproject.org]

commit 72e30f26ec291baba202b71e121c3211af2db371
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 20 14:18:09 2018 -0400

    Fix a pair of errors in bug23512
---
 src/or/rephist.c      | 5 ++---
 src/test/test_relay.c | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/or/rephist.c b/src/or/rephist.c
index 211480284..20f9148f0 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1211,7 +1211,7 @@ rep_hist_load_mtbf_data(time_t now)
 /** Structure to track bandwidth use, and remember the maxima for a given
  * time period.
  */
-typedef struct bw_array_t {
+struct bw_array_t {
   /** Observation array: Total number of bytes transferred in each of the last
    * NUM_SECS_ROLLING_MEASURE seconds. This is used as a circular array. */
   uint64_t obs[NUM_SECS_ROLLING_MEASURE];
@@ -1238,7 +1238,7 @@ typedef struct bw_array_t {
   /** Circular array of the total bandwidth usage for the last NUM_TOTALS
    * periods */
   uint64_t totals[NUM_TOTALS];
-} bw_array_t;
+};
 
 /** Shift the current period of b forward by one. */
 STATIC void
@@ -3297,4 +3297,3 @@ rep_hist_free_all(void)
   tor_assert_nonfatal(rephist_total_alloc == 0);
   tor_assert_nonfatal_once(rephist_total_num == 0);
 }
-
diff --git a/src/test/test_relay.c b/src/test/test_relay.c
index 1ec538395..57dcb2406 100644
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -111,7 +111,7 @@ test_relay_close_circuit(void *arg)
   tt_int_op(new_count, OP_EQ, old_count + 1);
 
   /* Ensure our write totals are 0 */
-  tt_int_op(find_largest_max(write_array), OP_EQ, 0);
+  tt_u64_op(find_largest_max(write_array), OP_EQ, 0);
 
   /* Mark the circuit for close */
   circuit_mark_for_close(TO_CIRCUIT(orcirc), 0);
@@ -120,7 +120,7 @@ test_relay_close_circuit(void *arg)
   advance_obs(write_array);
   commit_max(write_array);
   /* Check for two cells plus overhead */
-  tt_int_op(find_largest_max(write_array), OP_EQ,
+  tt_u64_op(find_largest_max(write_array), OP_EQ,
                              2*(get_cell_network_size(nchan->wide_circ_ids)
                                 +TLS_PER_CELL_OVERHEAD));
 
@@ -233,4 +233,3 @@ struct testcase_t relay_tests[] = {
     TT_FORK, NULL, NULL },
   END_OF_TESTCASES
 };
-