remove some old debugging code

svn:r8657

3 files changed, 1 insertions, 18 deletions

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index a4cf8a284e..4cf0e23140 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -87,7 +87,7 @@ get_unique_circ_id_by_conn(or_connection_t *conn)
       return 0;
     }
     test_circ_id |= high_bit;
-  } while (circuit_id_used_on_conn(test_circ_id, conn));
+  } while (circuit_get_by_circid_orconn(test_circ_id, conn));
   return test_circ_id;
 }
 
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 8efe199f70..38adadf0b4 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -571,22 +571,6 @@ circuit_get_by_circid_orconn(uint16_t circ_id, or_connection_t *conn)
     return circ;
 }
 
-/** Return true iff there is a circ such that
- *  - circ-\>n_circ_id or circ-\>p_circ_id is equal to <b>circ_id</b>, and
- *  - circ is attached to <b>conn</b>, either as p_conn or n_conn.
- * Return NULL if no such circuit exists.
- */
-int
-circuit_id_used_on_conn(uint16_t circ_id, or_connection_t *conn)
-{
-  circuit_t *circ = circuit_get_by_circid_orconn_impl(circ_id, conn);
-  if (circ && circ->marked_for_close)
-    log_fn(LOG_NOTICE, LD_CIRC,
-           "I was about to re-use a circuit ID that had been marked."
-           " Good thing we fixed that bug!");
-  return circ != NULL;
-}
-
 /** Return the circuit that a given edge connection is using. */
 circuit_t *
 circuit_get_by_edge_conn(edge_connection_t *conn)
diff --git a/src/or/or.h b/src/or/or.h
index 2a169b508b..56aba99c6d 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1750,7 +1750,6 @@ origin_circuit_t *origin_circuit_new(void);
 or_circuit_t *or_circuit_new(uint16_t p_circ_id, or_connection_t *p_conn);
 circuit_t *circuit_get_by_circid_orconn(uint16_t circ_id,
                                         or_connection_t *conn);
-int circuit_id_used_on_conn(uint16_t circ_id, or_connection_t *conn);
 circuit_t *circuit_get_by_edge_conn(edge_connection_t *conn);
 void circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason);
 origin_circuit_t *circuit_get_by_global_id(uint32_t id);