summaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-03-15 16:59:58 -0400
committerRoger Dingledine <arma@torproject.org>2011-03-15 16:59:58 -0400
commitc2775196f79b9dba70d517663004e1783873f35c (patch)
tree599682127dddefcf88ef75020d7daea13109f23b /src/or/connection.c
parent6a97450cbd764998756386c9e84fa7b887400e74 (diff)
downloadtor-c2775196f79b9dba70d517663004e1783873f35c.tar.gz
tor-c2775196f79b9dba70d517663004e1783873f35c.zip
whitespace fixes to pass 'make check-spaces'
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index ff2364655a..b586b43b5a 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -3264,7 +3264,7 @@ _connection_write_to_buf_impl(const char *string, size_t len,
* conn->write_event won't be set yet. Otherwise, write data from
* this conn as the socket is available. */
if (conn->write_event) {
- connection_start_writing(conn);
+ connection_start_writing(conn);
}
if (zlib) {
conn->outbuf_flushlen += buf_datalen(conn->outbuf) - old_datalen;
@@ -3845,9 +3845,11 @@ assert_connection_ok(connection_t *conn, time_t now)
* EXIT_CONN_STATE_RESOLVING while the conn is not yet marked to writing.
* */
tor_assert((conn->type == CONN_TYPE_EXIT &&
- conn->state == EXIT_CONN_STATE_RESOLVING) ||
- connection_is_writing(conn) || conn->write_blocked_on_bw ||
- (CONN_IS_EDGE(conn) && TO_EDGE_CONN(conn)->edge_blocked_on_circ));
+ conn->state == EXIT_CONN_STATE_RESOLVING) ||
+ connection_is_writing(conn) ||
+ conn->write_blocked_on_bw ||
+ (CONN_IS_EDGE(conn) &&
+ TO_EDGE_CONN(conn)->edge_blocked_on_circ));
}
if (conn->hold_open_until_flushed)