Merge remote-tracking branch 'linus/unused_param'

This commit is contained in:
Nick Mathewson 2013-07-15 12:02:46 -04:00
commit 1556b0cb12

View File

@ -71,6 +71,8 @@ test_clist_maps(void *arg)
channel_t *ch3 = new_fake_channel(); channel_t *ch3 = new_fake_channel();
or_circuit_t *or_c1=NULL, *or_c2=NULL; or_circuit_t *or_c1=NULL, *or_c2=NULL;
(void) arg;
MOCK(circuitmux_attach_circuit, circuitmux_attach_mock); MOCK(circuitmux_attach_circuit, circuitmux_attach_mock);
MOCK(circuitmux_detach_circuit, circuitmux_detach_mock); MOCK(circuitmux_detach_circuit, circuitmux_detach_mock);
memset(&cam, 0, sizeof(cam)); memset(&cam, 0, sizeof(cam));