From: Andrea Shepard Date: Wed, 26 Sep 2012 22:05:10 +0000 (-0700) Subject: Eliminate linked list helper functions in relay.c which are no longer used X-Git-Tag: tor-0.2.4.4-alpha~37^2~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35f5259df4feacbb77b14c6da30ec137a21763bb;p=thirdparty%2Ftor.git Eliminate linked list helper functions in relay.c which are no longer used --- diff --git a/src/or/relay.c b/src/or/relay.c index f0792437c3..e3b383ba76 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1972,38 +1972,6 @@ cell_queue_pop(cell_queue_t *queue) return cell; } -/** Return a pointer to the "next_active_on_{n,p}_chan" pointer of circ, - * depending on whether chan matches n_chan or p_chan. */ -static INLINE circuit_t ** -next_circ_on_chan_p(circuit_t *circ, channel_t *chan) -{ - tor_assert(circ); - tor_assert(chan); - if (chan == circ->n_chan) { - return &circ->next_active_on_n_chan; - } else { - or_circuit_t *orcirc = TO_OR_CIRCUIT(circ); - tor_assert(chan == orcirc->p_chan); - return &orcirc->next_active_on_p_chan; - } -} - -/** Return a pointer to the "prev_active_on_{n,p}_chan" pointer of circ, - * depending on whether chan matches n_chan or p_chan. */ -static INLINE circuit_t ** -prev_circ_on_chan_p(circuit_t *circ, channel_t *chan) -{ - tor_assert(circ); - tor_assert(chan); - if (chan == circ->n_chan) { - return &circ->prev_active_on_n_chan; - } else { - or_circuit_t *orcirc = TO_OR_CIRCUIT(circ); - tor_assert(chan == orcirc->p_chan); - return &orcirc->prev_active_on_p_chan; - } -} - #if 0 /** Helper for sorting cell_ewma_t values in their priority queue. */ static int