summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2012-05-31 13:05:24 +0200
committerLinus Nordberg <linus@nordberg.se>2012-05-31 13:05:24 +0200
commitc074562a17b54c5275f99465bc8e2f63c749cb4f (patch)
tree4c3b3eb00067139453ba7906f7041f23c612c086
parent6b7c3b42ee72cb2e7de443e8942ccc21a6304c59 (diff)
downloadtor-c074562a17b54c5275f99465bc8e2f63c749cb4f.tar.gz
tor-c074562a17b54c5275f99465bc8e2f63c749cb4f.zip
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.
-rw-r--r--src/or/connection_or.c2
1 files changed, 0 insertions, 2 deletions
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.