nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix whitespace in bufferevents branch

Browse Source
This commit is contained in:
Nick Mathewson 2010-09-27 12:41:41 -04:00
parent a16ed90ec8
commit b49cf6a77a
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/compat_libevent.c
View File

@ -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;

7
src/common/tortls.c
View File

@ -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;
}

8
src/or/buffers.c
View File

@ -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;