Fix a 64-bit clang warning

This commit is contained in:
Nick Mathewson 2014-11-27 22:42:03 -05:00
parent a28df3fb67
commit 0e0dc7d787

View File

@ -741,7 +741,7 @@ static int
channel_tls_num_cells_writeable_method(channel_t *chan) channel_tls_num_cells_writeable_method(channel_t *chan)
{ {
size_t outbuf_len; size_t outbuf_len;
int n; ssize_t n;
channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);
size_t cell_network_size; size_t cell_network_size;
@ -753,8 +753,11 @@ channel_tls_num_cells_writeable_method(channel_t *chan)
/* Get the number of cells */ /* Get the number of cells */
n = CEIL_DIV(OR_CONN_HIGHWATER - outbuf_len, cell_network_size); n = CEIL_DIV(OR_CONN_HIGHWATER - outbuf_len, cell_network_size);
if (n < 0) n = 0; if (n < 0) n = 0;
#if SIZEOF_SIZE_T > SIZEOF_INT
if (n > INT_MAX) n = INT_MAX;
#endif
return n; return (int)n;
} }
/** /**