diff options
Diffstat (limited to 'src/lib/buf/buffers.c')
| -rw-r--r-- | src/lib/buf/buffers.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c index a5031a47a6..e9d5f7f031 100644 --- a/src/lib/buf/buffers.c +++ b/src/lib/buf/buffers.c @@ -14,7 +14,7 @@ * * All socket-backed and TLS-based connection_t objects have a pair of * buffers: one for incoming data, and one for outcoming data. These are fed - * and drained from functions in connection.c, trigged by events that are + * and drained from functions in connection.c, triggered by events that are * monitored in main.c. * * This module only handles the buffer implementation itself. To use a buffer @@ -685,19 +685,22 @@ buf_move_to_buf(buf_t *buf_out, buf_t *buf_in, size_t *buf_flushlen) } /** Moves all data from <b>buf_in</b> to <b>buf_out</b>, without copying. + * Return the number of bytes that were moved. */ -void +size_t buf_move_all(buf_t *buf_out, buf_t *buf_in) { tor_assert(buf_out); if (!buf_in) - return; + return 0; if (buf_datalen(buf_in) == 0) - return; + return 0; if (BUG(buf_out->datalen > BUF_MAX_LEN || buf_in->datalen > BUF_MAX_LEN)) - return; + return 0; if (BUG(buf_out->datalen > BUF_MAX_LEN - buf_in->datalen)) - return; + return 0; + + size_t n_bytes_moved = buf_in->datalen; if (buf_out->head == NULL) { buf_out->head = buf_in->head; @@ -710,6 +713,8 @@ buf_move_all(buf_t *buf_out, buf_t *buf_in) buf_out->datalen += buf_in->datalen; buf_in->head = buf_in->tail = NULL; buf_in->datalen = 0; + + return n_bytes_moved; } /** Internal structure: represents a position in a buffer. */ |