diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-08 15:22:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-05 13:57:51 -0400 |
| commit | d61da9e61fa0ea15789464c7c3754a9af30fcbb4 (patch) | |
| tree | 839c7d5e6cdf7a3ed9cb7d67edf1a7c5884e3c1a /src/or | |
| parent | 4a7e90adc5828263a5d2dc3744818f2189c04bc7 (diff) | |
| download | tor-d61da9e61fa0ea15789464c7c3754a9af30fcbb4.tar.gz tor-d61da9e61fa0ea15789464c7c3754a9af30fcbb4.zip | |
Repair wide lines from previous commit.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection.c | 10 | ||||
| -rw-r--r-- | src/or/main.c | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 1462bf4801..0a343108d7 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -127,8 +127,9 @@ static int connection_finished_flushing(connection_t *conn); static int connection_flushed_some(connection_t *conn); static int connection_finished_connecting(connection_t *conn); static int connection_reached_eof(connection_t *conn); -static int connection_buf_read_from_socket(connection_t *conn, ssize_t *max_to_read, - int *socket_error); +static int connection_buf_read_from_socket(connection_t *conn, + ssize_t *max_to_read, + int *socket_error); static int connection_process_inbuf(connection_t *conn, int package_partial); static void client_check_address_changed(tor_socket_t sock); static void set_constrained_socket_buffers(tor_socket_t sock, int size); @@ -3630,8 +3631,9 @@ connection_buf_read_from_socket(connection_t *conn, ssize_t *max_to_read, /* !connection_speaks_cells, !conn->linked_conn. */ int reached_eof = 0; CONN_LOG_PROTECT(conn, - result = buf_read_from_socket(conn->s, at_most, conn->inbuf, &reached_eof, - socket_error)); + result = buf_read_from_socket(conn->s, at_most, conn->inbuf, + &reached_eof, + socket_error)); if (reached_eof) conn->inbuf_reached_eof = 1; diff --git a/src/or/main.c b/src/or/main.c index 9dc84f7deb..e9b50763f3 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -855,7 +855,8 @@ conn_close_if_marked(int i) } else retval = -1; /* never flush non-open broken tls connections */ } else { - retval = buf_flush_to_socket(conn->s, conn->outbuf, sz, &conn->outbuf_flushlen); + retval = buf_flush_to_socket(conn->s, conn->outbuf, sz, + &conn->outbuf_flushlen); } if (retval >= 0 && /* Technically, we could survive things like TLS_WANT_WRITE here. But don't bother for now. */ |