cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-09 20:41:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some build warnings on MSVC, mostly related to signed/unsigned comparisons.

Browse Source 
svn:r1510
This commit is contained in:
Nick Mathewson 2009-11-05 21:22:23 +00:00
parent 43ba66936a
commit ac633aebdf
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buffer.c
View File

@ -2051,7 +2051,7 @@ evbuffer_peek(struct evbuffer *buffer, ev_ssize_t len,
{ {
struct evbuffer_chain *chain; struct evbuffer_chain *chain;
int idx = 0; int idx = 0;
size_t len_so_far = 0; ev_ssize_t len_so_far = 0;
EVBUFFER_LOCK(buffer, EVTHREAD_READ); EVBUFFER_LOCK(buffer, EVTHREAD_READ);

3
buffer_iocp.c
View File

@ -121,13 +121,14 @@ read_completed(struct event_overlapped *eo, uintptr_t _, ev_ssize_t nBytes, int
int n_vec; int n_vec;
// XXXX use ok // XXXX use ok
EVUTIL_ASSERT(nBytes >= 0); // XXXX Can this be false?
EVBUFFER_LOCK(evbuf, EVTHREAD_WRITE); EVBUFFER_LOCK(evbuf, EVTHREAD_WRITE);
buf->read_in_progress = 0; buf->read_in_progress = 0;
evbuffer_unfreeze(evbuf, 0); evbuffer_unfreeze(evbuf, 0);
iov[0].iov_base = buf_o->buffers[0].buf; iov[0].iov_base = buf_o->buffers[0].buf;
if (nBytes <= buf_o->buffers[0].len) { if ((size_t)nBytes <= buf_o->buffers[0].len) {
iov[0].iov_len = nBytes; iov[0].iov_len = nBytes;
n_vec = 1; n_vec = 1;
} else { } else {

8
http.c
View File

@ -781,12 +781,12 @@ evhttp_handle_chunked_read(struct evhttp_request *req, struct evbuffer *buf)
/* could not get chunk size */ /* could not get chunk size */
return (DATA_CORRUPTED); return (DATA_CORRUPTED);
} }
if (req->body_size + ntoread > req->evcon->max_body_size) { if (req->body_size + (size_t)ntoread > req->evcon->max_body_size) {
/* failed body length test */ /* failed body length test */
event_debug(("Request body is too long")); event_debug(("Request body is too long"));
return (DATA_TOO_LONG); return (DATA_TOO_LONG);
} }
req->body_size += ntoread; req->body_size += (size_t)ntoread;
req->ntoread = ntoread; req->ntoread = ntoread;
if (req->ntoread == 0) { if (req->ntoread == 0) {
/* Last chunk */ /* Last chunk */
@ -2910,8 +2910,8 @@ evhttp_get_request_connection(
if (evcon == NULL) if (evcon == NULL)
return (NULL); return (NULL);
evhttp_connection_set_max_headers_size(evcon, http->default_max_headers_size); evcon->max_headers_size = http->default_max_headers_size;
evhttp_connection_set_max_body_size(evcon, http->default_max_body_size); evcon->max_body_size = http->default_max_body_size;
evcon->flags |= EVHTTP_CON_INCOMING; evcon->flags |= EVHTTP_CON_INCOMING;
evcon->state = EVCON_READING_FIRSTLINE; evcon->state = EVCON_READING_FIRSTLINE;

6
test/regress_buffer.c
View File

@ -172,7 +172,7 @@ test_evbuffer(void *ptr)
tt_assert(evbuffer_get_length(evb) == i * sizeof(buffer)); tt_assert(evbuffer_get_length(evb) == i * sizeof(buffer));
/* test remove buffer */ /* test remove buffer */
sz_tmp = sizeof(buffer)*2.5; sz_tmp = (size_t)(sizeof(buffer)*2.5);
evbuffer_remove_buffer(evb, evb_two, sz_tmp); evbuffer_remove_buffer(evb, evb_two, sz_tmp);
tt_assert(evbuffer_get_length(evb_two) == sz_tmp); tt_assert(evbuffer_get_length(evb_two) == sz_tmp);
tt_assert(evbuffer_get_length(evb) == sizeof(buffer) / 2); tt_assert(evbuffer_get_length(evb) == sizeof(buffer) / 2);
@ -630,14 +630,14 @@ test_evbuffer_iterative(void *ptr)
{ {
struct evbuffer *buf = evbuffer_new(); struct evbuffer *buf = evbuffer_new();
const char *abc = "abcdefghijklmnopqrstvuwxyzabcdefghijklmnopqrstvuwxyzabcdefghijklmnopqrstvuwxyzabcdefghijklmnopqrstvuwxyz"; const char *abc = "abcdefghijklmnopqrstvuwxyzabcdefghijklmnopqrstvuwxyzabcdefghijklmnopqrstvuwxyzabcdefghijklmnopqrstvuwxyz";
int i, j, sum; unsigned i, j, sum;
sum = 0; sum = 0;
for (i = 0; i < 1000; ++i) { for (i = 0; i < 1000; ++i) {
for (j = 1; j < strlen(abc); ++j) { for (j = 1; j < strlen(abc); ++j) {
char format[32]; char format[32];
evutil_snprintf(format, sizeof(format), "%%%d.%ds", j, j); evutil_snprintf(format, sizeof(format), "%%%u.%us", j, j);
evbuffer_add_printf(buf, format, abc); evbuffer_add_printf(buf, format, abc);
evbuffer_validate(buf); evbuffer_validate(buf);

4
test/regress_bufferevent.c
View File

@ -287,7 +287,7 @@ bufferevent_input_filter(struct evbuffer *src, struct evbuffer *dst,
ev_ssize_t lim, enum bufferevent_flush_mode state, void *ctx) ev_ssize_t lim, enum bufferevent_flush_mode state, void *ctx)
{ {
const unsigned char *buffer; const unsigned char *buffer;
int i; unsigned i;
buffer = evbuffer_pullup(src, evbuffer_get_length(src)); buffer = evbuffer_pullup(src, evbuffer_get_length(src));
for (i = 0; i < evbuffer_get_length(src); i += 2) { for (i = 0; i < evbuffer_get_length(src); i += 2) {
@ -309,7 +309,7 @@ bufferevent_output_filter(struct evbuffer *src, struct evbuffer *dst,
ev_ssize_t lim, enum bufferevent_flush_mode state, void *ctx) ev_ssize_t lim, enum bufferevent_flush_mode state, void *ctx)
{ {
const unsigned char *buffer; const unsigned char *buffer;
int i; unsigned i;
buffer = evbuffer_pullup(src, evbuffer_get_length(src)); buffer = evbuffer_pullup(src, evbuffer_get_length(src));
for (i = 0; i < evbuffer_get_length(src); ++i) { for (i = 0; i < evbuffer_get_length(src); ++i) {

2
test/regress_dns.c
View File

@ -482,7 +482,7 @@ end:
static struct evdns_server_port * static struct evdns_server_port *
get_generic_server(struct event_base *base, get_generic_server(struct event_base *base,
ev_uint64_t portnum, ev_uint16_t portnum,
evdns_request_callback_fn_type cb, evdns_request_callback_fn_type cb,
void *arg) void *arg)
{ {