diff options
| author | teor <teor@torproject.org> | 2019-03-08 19:37:18 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-03-08 19:37:18 +1000 |
| commit | e91b999cf2dfbb250cbf6c674ea01d7cee518092 (patch) | |
| tree | 10a32ea7b53341af913ed7989dfe6a4a0ec9d2f8 | |
| parent | ad10cafd9f0157e6aaa6f1f68ab7d3ef9b8b1b2e (diff) | |
| parent | 72e30f26ec291baba202b71e121c3211af2db371 (diff) | |
| download | tor-e91b999cf2dfbb250cbf6c674ea01d7cee518092.tar.gz tor-e91b999cf2dfbb250cbf6c674ea01d7cee518092.zip | |
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
| -rw-r--r-- | src/or/rephist.c | 5 | ||||
| -rw-r--r-- | 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 230d697a54..9d7baf0765 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -984,7 +984,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]; @@ -1011,7 +1011,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 @@ -3210,4 +3210,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 ffb0134426..a64d9af5b9 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -110,7 +110,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); @@ -119,7 +119,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)); @@ -229,4 +229,3 @@ struct testcase_t relay_tests[] = { TT_FORK, NULL, NULL }, END_OF_TESTCASES }; - |