Resolve FIXME items: make circuit_free_cpath_node static

svn:r2792

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 7b9833bd2f3897180b034d664b4351bfe03776f7..e93c390afdcc5cccebc731242cd7bbd1d0a577d9 100644 (file)
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -28,6 +28,7 @@ const char *circuit_state_to_string[] = {
 
 static void circuit_free(circuit_t *circ);
 static void circuit_free_cpath(crypt_path_t *cpath);
+static void circuit_free_cpath_node(crypt_path_t *victim);
 
 /** Add <b>circ</b> to the global list of circuits. This is called only from
  * within circuit_new.
@@ -148,8 +149,8 @@ static void circuit_free_cpath(crypt_path_t *cpath) {
 }
 
 /** Deallocate space associated with the cpath node <b>victim</b>. */
-/* XXX rewrite so the call from circuitbuild isn't necessary */
-void circuit_free_cpath_node(crypt_path_t *victim) {
+static void
+circuit_free_cpath_node(crypt_path_t *victim) {
   if(victim->f_crypto)
     crypto_free_cipher_env(victim->f_crypto);
   if(victim->b_crypto)

diff --git a/src/or/or.h b/src/or/or.h
index fdf6eb793868e96aaa9f820c93f4462fd39517cb..f8eb0ab94a309b8d53d72a3e99817175b2e91fe9 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1034,7 +1034,6 @@ void onion_append_to_cpath(crypt_path_t **head_ptr, crypt_path_t *new_hop);
 extern const char *circuit_state_to_string[];
 void circuit_close_all_marked(void);
 circuit_t *circuit_new(uint16_t p_circ_id, connection_t *p_conn);
-void circuit_free_cpath_node(crypt_path_t *victim);
 circuit_t *circuit_get_by_circ_id_conn(uint16_t circ_id, connection_t *conn);
 circuit_t *circuit_get_by_conn(connection_t *conn);
 circuit_t *circuit_get_by_rend_query_and_purpose(const char *rend_query, uint8_t purpose);