Commit 8907554c authored by Andrea Shepard's avatar Andrea Shepard
Browse files

Make channel_note_destroy_not_pending() mockable

parent dabf4c33

src/or/circuitlist.c

+2 −2
Original line number Diff line number Diff line
@@ -302,8 +302,8 @@ channel_note_destroy_pending(channel_t *chan, circid_t id) 


/** Called to indicate that a DESTROY is no longer pending on <b>chan</b> with

 * circuit ID <b>id</b> -- typically, because it has been sent. */

void

channel_note_destroy_not_pending(channel_t *chan, circid_t id)

MOCK_IMPL(void, channel_note_destroy_not_pending,

          (channel_t *chan, circid_t id))

{

  circuit_t *circ = circuit_get_by_circid_channel_even_if_marked(id,chan);

  if (circ) {

src/or/circuitlist.h

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ void circuit_free_all(void); 
void circuits_handle_oom(size_t current_allocation);



void channel_note_destroy_pending(channel_t *chan, circid_t id);

void channel_note_destroy_not_pending(channel_t *chan, circid_t id);

MOCK_DECL(void, channel_note_destroy_not_pending,

          (channel_t *chan, circid_t id));



#ifdef CIRCUITLIST_PRIVATE

STATIC void circuit_free(circuit_t *circ);