commit 0e0dc7d787ef867a24b2e630bf1db72227b24fef Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 27 22:42:03 2014 -0500

Fix a 64-bit clang warning --- src/or/channeltls.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 719a153..90ad1e6 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -741,7 +741,7 @@ static int channel_tls_num_cells_writeable_method(channel_t *chan) { size_t outbuf_len; - int n; + ssize_t n; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); size_t cell_network_size;

@@ -753,8 +753,11 @@ channel_tls_num_cells_writeable_method(channel_t *chan) /* Get the number of cells */ n = CEIL_DIV(OR_CONN_HIGHWATER - outbuf_len, cell_network_size); if (n < 0) n = 0; +#if SIZEOF_SIZE_T > SIZEOF_INT + if (n > INT_MAX) n = INT_MAX; +#endif

- return n; + return (int)n; }

/**