diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-10-27 22:57:53 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-10-27 22:57:53 -0400 |
commit | 598d13360918e557d1ce5e37078364f4ddd24e36 (patch) | |
tree | d6f3178fa63499e8305a76e7db639715f919443c /bufferevent_ratelim.c | |
parent | b81217f78dc511782451e793b0505624d8159499 (diff) | |
download | libevent-598d13360918e557d1ce5e37078364f4ddd24e36.tar.gz |
Try to clear up more size_t vs int/long issues.
Diffstat (limited to 'bufferevent_ratelim.c')
-rw-r--r-- | bufferevent_ratelim.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bufferevent_ratelim.c b/bufferevent_ratelim.c index 1f3b4175..85904e82 100644 --- a/bufferevent_ratelim.c +++ b/bufferevent_ratelim.c @@ -192,11 +192,11 @@ static int _bev_group_suspend_writing(struct bufferevent_rate_limit_group *g); the maximum amount we should read if is_read. Return that maximum, or 0 if our bucket is wholly exhausted. */ -static inline int +static inline ev_ssize_t _bufferevent_get_rlim_max(struct bufferevent_private *bev, int is_write) { /* needs lock on bev. */ - int max_so_far = is_write?MAX_TO_WRITE_EVER:MAX_TO_READ_EVER; + ev_ssize_t max_so_far = is_write?MAX_TO_WRITE_EVER:MAX_TO_READ_EVER; #define LIM(x) \ (is_write ? (x).write_limit : (x).read_limit) @@ -255,20 +255,20 @@ _bufferevent_get_rlim_max(struct bufferevent_private *bev, int is_write) return max_so_far; } -int +ev_ssize_t _bufferevent_get_read_max(struct bufferevent_private *bev) { return _bufferevent_get_rlim_max(bev, 0); } -int +ev_ssize_t _bufferevent_get_write_max(struct bufferevent_private *bev) { return _bufferevent_get_rlim_max(bev, 1); } int -_bufferevent_decrement_read_buckets(struct bufferevent_private *bev, int bytes) +_bufferevent_decrement_read_buckets(struct bufferevent_private *bev, ev_ssize_t bytes) { /* XXXXX Make sure all users of this function check its return value */ int r = 0; @@ -300,7 +300,7 @@ _bufferevent_decrement_read_buckets(struct bufferevent_private *bev, int bytes) } int -_bufferevent_decrement_write_buckets(struct bufferevent_private *bev, int bytes) +_bufferevent_decrement_write_buckets(struct bufferevent_private *bev, ev_ssize_t bytes) { /* XXXXX Make sure all users of this function check its return value */ int r = 0; |