summaryrefslogtreecommitdiff
path: root/src/common/buffers_tls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-08 15:16:39 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-05 13:57:51 -0400
commit4a7e90adc5828263a5d2dc3744818f2189c04bc7 (patch)
tree62cac4a9acefb41d9e3b9b6ee7d6501ee64efc01 /src/common/buffers_tls.c
parent336aa21e37b6c5bd4f1215ceba27c21f6c43dce7 (diff)
downloadtor-4a7e90adc5828263a5d2dc3744818f2189c04bc7.tar.gz
tor-4a7e90adc5828263a5d2dc3744818f2189c04bc7.zip
Repair buffer API so everything starts with buf_.
Our convention is that functions which manipulate a type T should be named T_foo. But the buffer functions were super old, and followed all kinds of conventions. Now they're uniform. Here's the perl I used to do this: \#!/usr/bin/perl -w -i -p s/read_to_buf\(/buf_read_from_socket\(/; s/flush_buf\(/buf_flush_to_socket\(/; s/read_to_buf_tls\(/buf_read_from_tls\(/; s/flush_buf_tls\(/buf_flush_to_tls\(/; s/write_to_buf\(/buf_add\(/; s/write_to_buf_compress\(/buf_add_compress\(/; s/move_buf_to_buf\(/buf_move_to_buf\(/; s/peek_from_buf\(/buf_peek\(/; s/fetch_from_buf\(/buf_get_bytes\(/; s/fetch_from_buf_line\(/buf_get_line\(/; s/fetch_from_buf_line\(/buf_get_line\(/; s/buf_remove_from_front\(/buf_drain\(/; s/peek_buf_startswith\(/buf_peek_startswith\(/; s/assert_buf_ok\(/buf_assert_ok\(/;
Diffstat (limited to 'src/common/buffers_tls.c')
-rw-r--r--src/common/buffers_tls.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index e470738698..d22b56b639 100644
--- a/src/common/buffers_tls.c
+++ b/src/common/buffers_tls.c
@@ -57,7 +57,7 @@ read_to_chunk_tls(buf_t *buf, chunk_t *chunk, tor_tls_t *tls,
* ready to write -- or vice versa.
*/
int
-read_to_buf_tls(tor_tls_t *tls, size_t at_most, buf_t *buf)
+buf_read_from_tls(tor_tls_t *tls, size_t at_most, buf_t *buf)
{
int r = 0;
size_t total_read = 0;
@@ -94,7 +94,7 @@ read_to_buf_tls(tor_tls_t *tls, size_t at_most, buf_t *buf)
return (int)total_read;
}
-/** Helper for flush_buf_tls(): try to write <b>sz</b> bytes from chunk
+/** Helper for buf_flush_to_tls(): try to write <b>sz</b> bytes from chunk
* <b>chunk</b> of buffer <b>buf</b> onto socket <b>s</b>. (Tries to write
* more if there is a forced pending write size.) On success, deduct the
* bytes written from *<b>buf_flushlen</b>. Return the number of bytes
@@ -125,17 +125,17 @@ flush_chunk_tls(tor_tls_t *tls, buf_t *buf, chunk_t *chunk,
*buf_flushlen -= r;
else
*buf_flushlen = 0;
- buf_remove_from_front(buf, r);
+ buf_drain(buf, r);
log_debug(LD_NET,"flushed %d bytes, %d ready to flush, %d remain.",
r,(int)*buf_flushlen,(int)buf->datalen);
return r;
}
-/** As flush_buf(), but writes data to a TLS connection. Can write more than
+/** As buf_flush_to_socket(), but writes data to a TLS connection. Can write more than
* <b>flushlen</b> bytes.
*/
int
-flush_buf_tls(tor_tls_t *tls, buf_t *buf, size_t flushlen,
+buf_flush_to_tls(tor_tls_t *tls, buf_t *buf, size_t flushlen,
size_t *buf_flushlen)
{
int r;