[tor-commits] [tor/master] Make channel_force_free() static

[andrea@xxxxxxxxxxxxxx]

commit 8a41dd20cb43b16548b49f9eff581dba0ed9a9a1
Author: Andrea Shepard <andrea@xxxxxxxxxxxxxx>
Date:   Mon Oct 8 20:10:13 2012 -0700

    Make channel_force_free() static
---
 src/or/channel.c |    4 +++-
 src/or/channel.h |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/channel.c b/src/or/channel.c
index 2ca9a13..469dc5d 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -86,6 +86,8 @@ static ssize_t
 channel_flush_some_cells_from_outgoing_queue(channel_t *chan,
                                              ssize_t num_cells);
 
+static void channel_force_free(channel_t *chan);
+
 /***********************************
  * Channel state utility functions *
  **********************************/
@@ -753,7 +755,7 @@ channel_free(channel_t *chan)
  * it should only be used from channel_free_all() when shutting down.
  */
 
-void
+static void
 channel_force_free(channel_t *chan)
 {
   tor_assert(chan);
diff --git a/src/or/channel.h b/src/or/channel.h
index fbcd38d..fac2b3b 100644
--- a/src/or/channel.h
+++ b/src/or/channel.h
@@ -285,7 +285,6 @@ void channel_closed(channel_t *chan);
 
 /* Free a channel */
 void channel_free(channel_t *chan);
-void channel_force_free(channel_t *chan);
 
 /* State/metadata setters */
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits