diff options
| -rw-r--r-- | bufferevent-internal.h | 8 | ||||
| -rw-r--r-- | bufferevent_ratelim.c | 12 | ||||
| -rw-r--r-- | bufferevent_sock.c | 4 | ||||
| -rw-r--r-- | evutil_rand.c | 5 | ||||
| -rw-r--r-- | win32select.c | 2 |
5 files changed, 17 insertions, 14 deletions
diff --git a/bufferevent-internal.h b/bufferevent-internal.h index b7b598fa..c2b9643e 100644 --- a/bufferevent-internal.h +++ b/bufferevent-internal.h @@ -378,11 +378,11 @@ int _bufferevent_generic_adj_timeouts(struct bufferevent *bev); /* ==== For rate-limiting. */ int _bufferevent_decrement_write_buckets(struct bufferevent_private *bev, - int bytes); + ev_ssize_t bytes); int _bufferevent_decrement_read_buckets(struct bufferevent_private *bev, - int bytes); -int _bufferevent_get_read_max(struct bufferevent_private *bev); -int _bufferevent_get_write_max(struct bufferevent_private *bev); + ev_ssize_t bytes); +ev_ssize_t _bufferevent_get_read_max(struct bufferevent_private *bev); +ev_ssize_t _bufferevent_get_write_max(struct bufferevent_private *bev); #ifdef __cplusplus } 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; diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 70902524..43768110 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -127,7 +127,7 @@ bufferevent_readcb(evutil_socket_t fd, short event, void *arg) struct evbuffer *input; int res = 0; short what = BEV_EVENT_READING; - int howmuch = -1, readmax=-1; + ev_ssize_t howmuch = -1, readmax=-1; _bufferevent_incref_and_lock(bufev); @@ -449,7 +449,7 @@ bufferevent_connect_getaddrinfo_cb(int result, struct evutil_addrinfo *ai, } /* XXX use the other addrinfos? */ - r = bufferevent_socket_connect(bev, ai->ai_addr, ai->ai_addrlen); + r = bufferevent_socket_connect(bev, ai->ai_addr, (int)ai->ai_addrlen); _bufferevent_decref_and_unlock(bev); evutil_freeaddrinfo(ai); } diff --git a/evutil_rand.c b/evutil_rand.c index 4e3485c2..15e4850d 100644 --- a/evutil_rand.c +++ b/evutil_rand.c @@ -34,6 +34,8 @@ #include "event2/event-config.h" +#include <limits.h> + #include "util-internal.h" #include "evthread-internal.h" @@ -118,6 +120,7 @@ evutil_secure_rng_get_bytes(void *buf, size_t n) void evutil_secure_rng_add_bytes(const char *buf, size_t n) { - arc4random_addrandom((unsigned char*)buf, n); + arc4random_addrandom((unsigned char*)buf, + n>(size_t)INT_MAX ? INT_MAX : n); } diff --git a/win32select.c b/win32select.c index af8c6206..98734b41 100644 --- a/win32select.c +++ b/win32select.c @@ -97,7 +97,7 @@ struct eventop win32ops = { #define FD_SET_ALLOC_SIZE(n) ((sizeof(struct win_fd_set) + ((n)-1)*sizeof(SOCKET))) static int -realloc_fd_sets(struct win32op *op, size_t new_size) +realloc_fd_sets(struct win32op *op, int new_size) { size_t size; |