diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-09-27 12:41:41 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 14:22:18 -0400 |
commit | b49cf6a77a75051bcc5a0ed62d89d04abe3eb880 (patch) | |
tree | cc3f2271e314619a176ed398e5259fbf1bfba2c4 /src | |
parent | a16ed90ec8abc329aafe0b893a7533fff480d2ff (diff) | |
download | tor-b49cf6a77a75051bcc5a0ed62d89d04abe3eb880.tar.gz tor-b49cf6a77a75051bcc5a0ed62d89d04abe3eb880.zip |
Fix whitespace in bufferevents branch
Diffstat (limited to 'src')
-rw-r--r-- | src/common/compat_libevent.c | 4 | ||||
-rw-r--r-- | src/common/tortls.c | 7 | ||||
-rw-r--r-- | src/or/buffers.c | 8 |
3 files changed, 10 insertions, 9 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; } diff --git a/src/or/buffers.c b/src/or/buffers.c index 75afbfded8..11c656f23a 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1516,7 +1516,8 @@ fetch_from_evbuffer_socks(struct evbuffer *buf, socks_request_t *req, return 0; { - /* See if we can find the socks request in the first chunk of the buffer. */ + /* See if we can find the socks request in the first chunk of the buffer. + */ struct evbuffer_iovec v; int i; want_length = evbuffer_get_contiguous_space(buf); @@ -1573,9 +1574,8 @@ fetch_from_evbuffer_socks(struct evbuffer *buf, socks_request_t *req, break; /* Otherwise, it wants more data than we gave it. If we can provide more * data than we gave it, we'll try to do so in the next iteration of the - * loop. If we can't, the while() condition will exit. It's okay if it - * asked for more than we have total; maybe it doesn't really need so - * much. */ + * loop. If we can't, the while loop will exit. It's okay if it asked for + * more than we have total; maybe it doesn't really need so much. */ } return res; |