summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-09-27 12:41:41 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-27 14:22:18 -0400
commitb49cf6a77a75051bcc5a0ed62d89d04abe3eb880 (patch)
treecc3f2271e314619a176ed398e5259fbf1bfba2c4 /src/common
parenta16ed90ec8abc329aafe0b893a7533fff480d2ff (diff)
downloadtor-b49cf6a77a75051bcc5a0ed62d89d04abe3eb880.tar.gz
tor-b49cf6a77a75051bcc5a0ed62d89d04abe3eb880.zip
Fix whitespace in bufferevents branch
Diffstat (limited to 'src/common')
-rw-r--r--src/common/compat_libevent.c4
-rw-r--r--src/common/tortls.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index ee8b5b561b..bbab06e8d4 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -558,9 +558,9 @@ static const struct timeval *one_tick = NULL;
* implementation should be used. Only use this when the timer is supposed
* to fire after 1 / TOR_LIBEVENT_TICKS_PER_SECOND seconds have passed.
*/
-const struct timeval *tor_libevent_get_one_tick_timeout(void)
+const struct timeval *
+tor_libevent_get_one_tick_timeout(void)
{
-
if (PREDICT_UNLIKELY(one_tick == NULL)) {
struct event_base *base = tor_libevent_get_base();
struct timeval tv;
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 318cb40887..d9f1d875d2 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1232,8 +1232,8 @@ tor_tls_finish_handshake(tor_tls_t *tls)
" get set. Fixing that.");
}
tls->wasV2Handshake = 1;
- log_debug(LD_HANDSHAKE, "Completed V2 TLS handshake with client; waiting "
- "for renegotiation.");
+ log_debug(LD_HANDSHAKE, "Completed V2 TLS handshake with client; waiting"
+ " for renegotiation.");
} else {
tls->wasV2Handshake = 0;
}
@@ -1273,7 +1273,8 @@ tor_tls_start_renegotiating(tor_tls_t *tls)
{
int r = SSL_renegotiate(tls->ssl);
if (r <= 0) {
- return tor_tls_get_error(tls, r, 0, "renegotiating", LOG_WARN, LD_HANDSHAKE);
+ return tor_tls_get_error(tls, r, 0, "renegotiating", LOG_WARN,
+ LD_HANDSHAKE);
}
return 0;
}