[tor-commits] [tor/master] Remove spurioius return in one out of four if-else clauses.

nickm at torproject.org nickm at torproject.org
Thu May 31 18:43:47 UTC 2012


commit c074562a17b54c5275f99465bc8e2f63c749cb4f
Author: Linus Nordberg <linus at nordberg.se>
Date:   Thu May 31 13:05:24 2012 +0200

    Remove spurioius return in one out of four if-else clauses.
    
    We do return right after the if-else.  This return (with its confusing
    comments) comes from before 6b7c3b42 but doesn't make sense now.
---
 src/or/connection_or.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index f206089..67d66fc 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1296,8 +1296,6 @@ connection_or_handle_event_cb(struct bufferevent *bufev, short event,
                                            connection_or_tls_renegotiated_cb,
                                            conn);
           conn->_base.state = OR_CONN_STATE_TLS_SERVER_RENEGOTIATING;
-          /* return 0; */
-          return; /* ???? */
         } else if (handshakes == 2) {
           /* v2 handshake, as a server.  Two handshakes happened already,
            * so we treat renegotiation as done.





More information about the tor-commits mailing list