From: Linus Nordberg <linus@nordberg.se>
Date: Thu, 31 May 2012 11:05:24 +0000 (+0200)
Subject: Remove spurioius return in one out of four if-else clauses.
X-Git-Tag: tor-0.2.3.16-alpha~28^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c074562a17b54c5275f99465bc8e2f63c749cb4f;p=thirdparty%2Ftor.git

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.
---

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index f206089416..67d66fcd07 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.