diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-05-01 00:54:14 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-05-01 00:54:14 +0000 |
| commit | e865eb938ca5614b1897f265f50587bc71f2c6b1 (patch) | |
| tree | 75be054bbd61bb479a041de1659c6db5471d1ce5 /buffer_iocp.c | |
| parent | b2e8fd0e41d3437d7214fb4604e22476ddc94e4d (diff) | |
| download | libevent-e865eb938ca5614b1897f265f50587bc71f2c6b1.tar.gz | |
More msvc build tweaks.
svn:r1262
Diffstat (limited to 'buffer_iocp.c')
| -rw-r--r-- | buffer_iocp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/buffer_iocp.c b/buffer_iocp.c index 8430f8d7..bae08434 100644 --- a/buffer_iocp.c +++ b/buffer_iocp.c @@ -31,10 +31,6 @@ objects on Windows. */ -#include <windows.h> -#include <assert.h> -#include <stdio.h> - #include "event2/buffer.h" #include "event2/buffer_compat.h" #include "event2/util.h" @@ -46,6 +42,10 @@ #include "iocp-internal.h" #include "mm-internal.h" +#include <windows.h> +#include <assert.h> +#include <stdio.h> + #define MAX_WSABUFS 16 /** Wrapper for an OVERLAPPED that holds the necessary info to notice @@ -123,7 +123,7 @@ read_completed(struct event_overlapped *eo, uintptr_t _, ssize_t nBytes) evbuffer_unfreeze(evbuf, 0); if (chain == evbuf->previous_to_last) { - size_t n = chain->buffer_len - (chain->misalign + chain->off); + ssize_t n = chain->buffer_len - (chain->misalign + chain->off); if (n>nBytes) n=nBytes; chain->off += n; @@ -197,7 +197,7 @@ evbuffer_launch_write(struct evbuffer *buf, ssize_t at_most) /* Nothing to write */ r = 0; goto done; - } else if (at_most > buf->total_len || at_most < 0) { + } else if (at_most < 0 || (size_t)at_most > buf->total_len) { at_most = buf->total_len; } evbuffer_freeze(buf, 1); @@ -213,7 +213,7 @@ evbuffer_launch_write(struct evbuffer *buf, ssize_t at_most) b->buf = chain->buffer + chain->misalign; _evbuffer_chain_pin(chain, EVBUFFER_MEM_PINNED_W); - if (at_most > chain->off) { + if ((size_t)at_most > chain->off) { b->len = chain->off; at_most -= chain->off; } else { |