Commit 2a079191 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

r12326@catbus: nickm | 2007-04-09 17:36:41 -0400 

 Clean up crap from 9930.  I can hardly wait till I trust SVK 2.x enough to upgrade.


svn:r9933
parent 2dc6019e

src/or/circuitlist.c

+2 −8
Original line number Diff line number Diff line
@@ -157,12 +157,9 @@ void 
circuit_set_p_circid_orconn(or_circuit_t *circ, uint16_t id,

                            or_connection_t *conn)

{

  int active;

  int active;

  int active = circ->p_conn_cells.n > 0;



  active = circ->p_conn_cells.n > 0;

  tor_assert(bool_eq(active, circ->next_active_on_p_conn));

  active = circ->p_conn_cells.n > 0;



  circuit_set_circid_orconn_helper(TO_CIRCUIT(circ), CELL_DIRECTION_IN,

                                   id, conn, active);
@@ -178,12 +175,9 @@ void 
circuit_set_n_circid_orconn(circuit_t *circ, uint16_t id,

                            or_connection_t *conn)

{

  int active;

  int active;

  int active = circ->n_conn_cells.n > 0;



  active = circ->n_conn_cells.n > 0;

  tor_assert(bool_eq(active, circ->next_active_on_n_conn));

  active = circ->n_conn_cells.n > 0;



  circuit_set_circid_orconn_helper(circ, CELL_DIRECTION_OUT,

                                   id, conn, active);

src/or/connection_or.c

+0 −1
Original line number Diff line number Diff line
@@ -792,7 +792,6 @@ int 
connection_or_send_destroy(uint16_t circ_id, or_connection_t *conn, int reason)

{

  cell_t cell;

  circuit_t *circ;



  tor_assert(conn);