diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:49:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:49:49 -0400 |
| commit | da7c60dcf310fb9914bfd1b84a34b440ab04900a (patch) | |
| tree | 1a30bd8ef9e3473a45a5c72c538afceae9233412 /src/or/buffers.h | |
| parent | 6802499413f8efd98ad4d578e5ef937cb55c1edc (diff) | |
| parent | cfeafe5e77c9dd5587b1ec553eb1065f0bf841fd (diff) | |
| download | tor-da7c60dcf310fb9914bfd1b84a34b440ab04900a.tar tor-da7c60dcf310fb9914bfd1b84a34b440ab04900a.tar.gz | |
Merge remote-tracking branch 'public/bug3270' into maint-0.2.2
Diffstat (limited to 'src/or/buffers.h')
| -rw-r--r-- | src/or/buffers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/buffers.h b/src/or/buffers.h index e50b9ff6f..63fab4957 100644 --- a/src/or/buffers.h +++ b/src/or/buffers.h @@ -24,11 +24,11 @@ size_t buf_datalen(const buf_t *buf); size_t buf_allocation(const buf_t *buf); size_t buf_slack(const buf_t *buf); -int read_to_buf(int s, size_t at_most, buf_t *buf, int *reached_eof, +int read_to_buf(tor_socket_t s, size_t at_most, buf_t *buf, int *reached_eof, int *socket_error); int read_to_buf_tls(tor_tls_t *tls, size_t at_most, buf_t *buf); -int flush_buf(int s, buf_t *buf, size_t sz, size_t *buf_flushlen); +int flush_buf(tor_socket_t s, buf_t *buf, size_t sz, size_t *buf_flushlen); int flush_buf_tls(tor_tls_t *tls, buf_t *buf, size_t sz, size_t *buf_flushlen); int write_to_buf(const char *string, size_t string_len, buf_t *buf); |