Fix signed/unsigned warnings on win32

diff --git a/buffer_iocp.c b/buffer_iocp.c
index b1c9ccfd70de629babb31cf7e037f2c62acf9121..ae57f222af8fa9b9652566344851fc39e7e13499 100644 (file)
--- a/buffer_iocp.c
+++ b/buffer_iocp.c
@@ -110,7 +110,7 @@ evbuffer_commit_read(struct evbuffer *evbuf, ev_ssize_t nBytes)
        if (!((*chainp)->flags & EVBUFFER_MEM_PINNED_R))
                chainp = &(*chainp)->next;
        remaining = nBytes;
-       for (i = 0; remaining > 0 && i < buf->n_buffers; ++i) {
+       for (i = 0; remaining > 0 && i < (unsigned)buf->n_buffers; ++i) {
                EVUTIL_ASSERT(*chainp);
                len = buf->buffers[i].len;
                if (remaining < len)

diff --git a/bufferevent_async.c b/bufferevent_async.c
index 640aeb13cf053689901a56426833009dae1bd30d..fb23d15a60dc40a72438d1b7bbc8871c47ccb456 100644 (file)
--- a/bufferevent_async.c
+++ b/bufferevent_async.c
@@ -195,7 +195,7 @@ bev_async_consider_writing(struct bufferevent_async *beva)
 
        /* XXXX This over-commits. */
        limit = _bufferevent_get_write_max(&beva->bev);
-       if (at_most >= limit)
+       if (at_most >= (size_t)limit && limit >= 0)
                at_most = limit;
 
        if (beva->bev.write_suspended) {
@@ -249,7 +249,7 @@ bev_async_consider_reading(struct bufferevent_async *beva)
 
        /* XXXX This over-commits. */
        limit = _bufferevent_get_read_max(&beva->bev);
-       if (at_most >= limit)
+       if (at_most >= (size_t)limit && limit >= 0)
                at_most = limit;
 
        if (beva->bev.read_suspended) {

diff --git a/test/regress_iocp.c b/test/regress_iocp.c
index a00ec08ff1846b35a54bd72a5762d4904776fe0c..f2f438a2cf273f50bf2221ff77ef9d4ecb3a1fc4 100644 (file)
--- a/test/regress_iocp.c
+++ b/test/regress_iocp.c
@@ -247,7 +247,7 @@ test_iocp_evbuffer(void *ptr)
        event_overlapped_init(&rol, read_complete);
        event_overlapped_init(&wol, write_complete);
 
-       for (i = 0; i < sizeof(junk); ++i)
+       for (i = 0; i < (int)sizeof(junk); ++i)
                junk[i] = (char)(i);
 
        rbuf = evbuffer_overlapped_new(data->pair[0]);

diff --git a/win32select.c b/win32select.c
index 26c107f280f51eeb4c34dbdb1da5f3bd585b2d06..af8c620677e2f27c087b4b1d94387d4de9b27357 100644 (file)
--- a/win32select.c
+++ b/win32select.c
@@ -126,7 +126,7 @@ do_fd_set(struct win32op *op, struct idx_info *ent, evutil_socket_t s, int read)
                if (ent->write_pos_plus1 > 0)
                        return (0);
        }
-       if (set->fd_count == op->fd_setsz) {
+       if ((int)set->fd_count == op->fd_setsz) {
                if (realloc_fd_sets(op, op->fd_setsz*2))
                        return (-1);
                /* set pointer will have changed and needs reiniting! */
@@ -155,7 +155,7 @@ do_fd_clear(struct event_base *base,
        }
        if (i < 0)
                return (0);
-       if (--set->fd_count != i) {
+       if (--set->fd_count != (unsigned)i) {
                struct idx_info *ent2;
                SOCKET s2;
                s2 = set->fd_array[i] = set->fd_array[set->fd_count];