diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
| commit | 21de9d46e264ceb14f3fe59d17210d82f2499637 (patch) | |
| tree | 225afa4993f268fc867d922e646f0449cedebf1c /src/or/buffers.h | |
| parent | 5dc3c462dcf42488055685e7f4fdb4a1a48003f1 (diff) | |
| parent | da7c60dcf310fb9914bfd1b84a34b440ab04900a (diff) | |
| download | tor-21de9d46e264ceb14f3fe59d17210d82f2499637.tar.gz tor-21de9d46e264ceb14f3fe59d17210d82f2499637.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/compat.c
src/or/main.c
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 ef64bcce5e..613001066c 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); |