[tor-commits] [tor/master] s/channel_request_close()/channel_mark_for_close()/g for consistency

[andrea at torproject.org]

commit d61e58e1ba594c57afdb4bf49169f59b0a56a7f4
Author: Andrea Shepard <andrea at torproject.org>
Date:   Mon Oct 8 20:14:04 2012 -0700

    s/channel_request_close()/channel_mark_for_close()/g for consistency
---
 src/or/channel.c    |   12 ++++++------
 src/or/channel.h    |    2 +-
 src/or/channeltls.c |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/or/channel.c b/src/or/channel.c
index 469dc5d..5b40028 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -772,7 +772,7 @@ channel_force_free(channel_t *chan)
     if (chan->u.listener.incoming_list) {
       SMARTLIST_FOREACH_BEGIN(chan->u.listener.incoming_list,
                               channel_t *, qchan) {
-        channel_request_close(qchan);
+        channel_mark_for_close(qchan);
       } SMARTLIST_FOREACH_END(qchan);
 
       smartlist_free(chan->u.listener.incoming_list);
@@ -965,7 +965,7 @@ channel_set_cell_handlers(channel_t *chan,
 }
 
 /**
- * Request a channel be closed
+ * Mark a channel to be closed
  *
  * This function tries to close a channel_t; it will go into the CLOSING
  * state, and eventually the lower layer should put it into the CLOSED or
@@ -975,7 +975,7 @@ channel_set_cell_handlers(channel_t *chan,
  */
 
 void
-channel_request_close(channel_t *chan)
+channel_mark_for_close(channel_t *chan)
 {
   tor_assert(chan != NULL);
   tor_assert(chan->close != NULL);
@@ -2419,7 +2419,7 @@ channel_free_all(void)
        * and allocate that again on close.
        */
       channel_unregister(curr);
-      channel_request_close(curr);
+      channel_mark_for_close(curr);
       channel_force_free(curr);
     } SMARTLIST_FOREACH_END(curr);
 
@@ -2442,7 +2442,7 @@ channel_free_all(void)
        * and allocate that again on close.
        */
       channel_unregister(curr);
-      channel_request_close(curr);
+      channel_mark_for_close(curr);
       channel_force_free(curr);
     } SMARTLIST_FOREACH_END(curr);
 
@@ -2464,7 +2464,7 @@ channel_free_all(void)
       if (!(curr->state == CHANNEL_STATE_CLOSING ||
             curr->state == CHANNEL_STATE_CLOSED ||
             curr->state == CHANNEL_STATE_ERROR)) {
-        channel_request_close(curr);
+        channel_mark_for_close(curr);
       }
       channel_force_free(curr);
     } SMARTLIST_FOREACH_END(curr);
diff --git a/src/or/channel.h b/src/or/channel.h
index fac2b3b..182639e 100644
--- a/src/or/channel.h
+++ b/src/or/channel.h
@@ -230,7 +230,7 @@ const char * channel_state_to_string(channel_state_t state);
 
 /* Abstract channel operations */
 
-void channel_request_close(channel_t *chan);
+void channel_mark_for_close(channel_t *chan);
 void channel_write_cell(channel_t *chan, cell_t *cell);
 void channel_write_packed_cell(channel_t *chan, packed_cell_t *cell);
 void channel_write_var_cell(channel_t *chan, var_cell_t *cell);
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index 883aef1..bb6ef9b 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -224,7 +224,7 @@ channel_tls_free_all(void)
   if (channel_tls_listener) {
     base = TLS_CHAN_TO_BASE(channel_tls_listener);
     channel_unregister(base);
-    channel_request_close(base);
+    channel_mark_for_close(base);
     channel_free(base);
     channel_tls_listener = NULL;
   }
@@ -316,7 +316,7 @@ channel_tls_close_method(channel_t *chan)
     if (chan->u.listener.incoming_list) {
       SMARTLIST_FOREACH_BEGIN(chan->u.listener.incoming_list,
                               channel_t *, ichan) {
-        channel_request_close(ichan);
+        channel_mark_for_close(ichan);
       } SMARTLIST_FOREACH_END(ichan);
 
       smartlist_free(chan->u.listener.incoming_list);