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/common | |
| parent | 4a7e90adc5828263a5d2dc3744818f2189c04bc7 (diff) | |
| download | tor-d61da9e61fa0ea15789464c7c3754a9af30fcbb4.tar.gz tor-d61da9e61fa0ea15789464c7c3754a9af30fcbb4.zip | |
Repair wide lines from previous commit.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/buffers.c | 8 | ||||
| -rw-r--r-- | src/common/buffers.h | 8 | ||||
| -rw-r--r-- | src/common/buffers_tls.c | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/src/common/buffers.c b/src/common/buffers.c index 683952ddf2..bade1ce166 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 73a688cff9..7666f1895a 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 d22b56b639..13c9087db7 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, |