commit d61da9e61fa0ea15789464c7c3754a9af30fcbb4 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 8 15:22:30 2017 -0400
Repair wide lines from previous commit. --- src/common/buffers.c | 8 +++++--- src/common/buffers.h | 8 +++++--- src/common/buffers_tls.c | 4 ++-- src/or/connection.c | 10 ++++++---- src/or/main.c | 3 ++- 5 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/common/buffers.c b/src/common/buffers.c index 683952ddf..bade1ce16 100644 --- a/src/common/buffers.c +++ b/src/common/buffers.c @@ -551,8 +551,9 @@ read_to_chunk(buf_t *buf, chunk_t *chunk, tor_socket_t fd, size_t at_most, */ /* XXXX indicate "read blocked" somehow? */ int -buf_read_from_socket(tor_socket_t s, size_t at_most, buf_t *buf, int *reached_eof, - int *socket_error) +buf_read_from_socket(tor_socket_t s, size_t at_most, buf_t *buf, + int *reached_eof, + int *socket_error) { /* XXXX It's stupid to overload the return values for these functions: * "error status" and "number of bytes read" are not mutually exclusive. @@ -637,7 +638,8 @@ flush_chunk(tor_socket_t s, buf_t *buf, chunk_t *chunk, size_t sz, * -1 on failure. Return 0 if write() would block. */ int -buf_flush_to_socket(tor_socket_t s, buf_t *buf, size_t sz, size_t *buf_flushlen) +buf_flush_to_socket(tor_socket_t s, buf_t *buf, size_t sz, + size_t *buf_flushlen) { /* XXXX It's stupid to overload the return values for these functions: * "error status" and "number of bytes flushed" are not mutually exclusive. diff --git a/src/common/buffers.h b/src/common/buffers.h index 73a688cff..7666f1895 100644 --- a/src/common/buffers.h +++ b/src/common/buffers.h @@ -35,10 +35,12 @@ size_t buf_slack(const buf_t *buf); uint32_t buf_get_oldest_chunk_timestamp(const buf_t *buf, uint32_t now); size_t buf_get_total_allocation(void);
-int buf_read_from_socket(tor_socket_t s, size_t at_most, buf_t *buf, int *reached_eof, - int *socket_error); +int buf_read_from_socket(tor_socket_t s, size_t at_most, buf_t *buf, + int *reached_eof, + int *socket_error);
-int buf_flush_to_socket(tor_socket_t s, buf_t *buf, size_t sz, size_t *buf_flushlen); +int buf_flush_to_socket(tor_socket_t s, buf_t *buf, size_t sz, + size_t *buf_flushlen);
int buf_add(const char *string, size_t string_len, buf_t *buf); int buf_add_compress(buf_t *buf, struct tor_compress_state_t *state, diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c index d22b56b63..13c9087db 100644 --- a/src/common/buffers_tls.c +++ b/src/common/buffers_tls.c @@ -131,8 +131,8 @@ flush_chunk_tls(tor_tls_t *tls, buf_t *buf, chunk_t *chunk, return r; }
-/** As buf_flush_to_socket(), but writes data to a TLS connection. Can write more than - * <b>flushlen</b> bytes. +/** As buf_flush_to_socket(), but writes data to a TLS connection. Can write + * more than <b>flushlen</b> bytes. */ int buf_flush_to_tls(tor_tls_t *tls, buf_t *buf, size_t flushlen, diff --git a/src/or/connection.c b/src/or/connection.c index 1462bf480..0a343108d 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 9dc84f7de..e9b50763f 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. */