[or-cvs] Resolve FIXME items: make circuit_free_cpath_node static

Nick Mathewson nickm at seul.org
Wed Nov 10 14:28:07 UTC 2004


Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv32614/src/or

Modified Files:
	circuitlist.c or.h 
Log Message:
Resolve FIXME items: make circuit_free_cpath_node static

Index: circuitlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuitlist.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- circuitlist.c	7 Nov 2004 01:33:05 -0000	1.17
+++ circuitlist.c	10 Nov 2004 14:28:04 -0000	1.18
@@ -28,6 +28,7 @@
 
 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 @@
 }
 
 /** 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)

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -d -r1.475 -r1.476
--- or.h	10 Nov 2004 03:48:38 -0000	1.475
+++ or.h	10 Nov 2004 14:28:04 -0000	1.476
@@ -1034,7 +1034,6 @@
 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);



More information about the tor-commits mailing list