[or-cvs] r9933: Clean up crap from 9930. I can hardly wait till I trust SVK (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-04-09 17:36:45 -0400 (Mon, 09 Apr 2007)
New Revision: 9933

Modified:
   tor/trunk/
   tor/trunk/src/or/circuitlist.c
   tor/trunk/src/or/connection_or.c
Log:
 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.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12326] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/circuitlist.c
===================================================================
--- tor/trunk/src/or/circuitlist.c	2007-04-09 21:34:13 UTC (rev 9932)
+++ tor/trunk/src/or/circuitlist.c	2007-04-09 21:36:45 UTC (rev 9933)
@@ -157,12 +157,9 @@
 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 @@
 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);

Modified: tor/trunk/src/or/connection_or.c
===================================================================
--- tor/trunk/src/or/connection_or.c	2007-04-09 21:34:13 UTC (rev 9932)
+++ tor/trunk/src/or/connection_or.c	2007-04-09 21:36:45 UTC (rev 9933)
@@ -792,7 +792,6 @@
 connection_or_send_destroy(uint16_t circ_id, or_connection_t *conn, int reason)
 {
   cell_t cell;
-  circuit_t *circ;
 
   tor_assert(conn);