Loading src/or/circuitmux.h +2 −1 Original line number Diff line number Diff line Loading @@ -128,7 +128,8 @@ void circuitmux_notify_xmit_cells(circuitmux_t *cmux, circuit_t *circ, void circuitmux_notify_xmit_destroy(circuitmux_t *cmux); /* Circuit interface */ MOCK_DECL(void, circuitmux_attach_circuit, (circuitmux_t *cmux, circuit_t *circ, MOCK_DECL(void, circuitmux_attach_circuit, (circuitmux_t *cmux, circuit_t *circ, cell_direction_t direction)); MOCK_DECL(void, circuitmux_detach_circuit, (circuitmux_t *cmux, circuit_t *circ)); Loading src/test/test_circuitlist.c +2 −4 Original line number Diff line number Diff line Loading @@ -62,7 +62,6 @@ circuitmux_detach_mock(circuitmux_t *cmux, circuit_t *circ) memset(&cdm, 0, sizeof(cdm)); \ } while (0) static void test_clist_maps(void *arg) { Loading Loading @@ -150,7 +149,6 @@ test_clist_maps(void *arg) tt_assert(! circuit_id_in_use_on_channel(200, ch2)); tt_assert(! circuit_id_in_use_on_channel(100, ch1)); done: tor_free(ch1); tor_free(ch2); Loading @@ -163,8 +161,8 @@ done: UNMOCK(circuitmux_detach_circuit); } struct testcase_t circuitlist_tests[] = { { "maps", test_clist_maps, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; Loading
src/or/circuitmux.h +2 −1 Original line number Diff line number Diff line Loading @@ -128,7 +128,8 @@ void circuitmux_notify_xmit_cells(circuitmux_t *cmux, circuit_t *circ, void circuitmux_notify_xmit_destroy(circuitmux_t *cmux); /* Circuit interface */ MOCK_DECL(void, circuitmux_attach_circuit, (circuitmux_t *cmux, circuit_t *circ, MOCK_DECL(void, circuitmux_attach_circuit, (circuitmux_t *cmux, circuit_t *circ, cell_direction_t direction)); MOCK_DECL(void, circuitmux_detach_circuit, (circuitmux_t *cmux, circuit_t *circ)); Loading
src/test/test_circuitlist.c +2 −4 Original line number Diff line number Diff line Loading @@ -62,7 +62,6 @@ circuitmux_detach_mock(circuitmux_t *cmux, circuit_t *circ) memset(&cdm, 0, sizeof(cdm)); \ } while (0) static void test_clist_maps(void *arg) { Loading Loading @@ -150,7 +149,6 @@ test_clist_maps(void *arg) tt_assert(! circuit_id_in_use_on_channel(200, ch2)); tt_assert(! circuit_id_in_use_on_channel(100, ch1)); done: tor_free(ch1); tor_free(ch2); Loading @@ -163,8 +161,8 @@ done: UNMOCK(circuitmux_detach_circuit); } struct testcase_t circuitlist_tests[] = { { "maps", test_clist_maps, TT_FORK, NULL, NULL }, END_OF_TESTCASES };