diff --git a/test/regress.c b/test/regress.c index 71327559..01adaa33 100644 --- a/test/regress.c +++ b/test/regress.c @@ -94,8 +94,8 @@ static struct timeval tcalled; #endif #ifdef WIN32 -#define write(fd,buf,len) send((fd),(buf),(len),0) -#define read(fd,buf,len) recv((fd),(buf),(len),0) +#define write(fd,buf,len) send((fd),(buf),(int)(len),0) +#define read(fd,buf,len) recv((fd),(buf),(int)(len),0) #endif struct basic_cb_args @@ -1272,7 +1272,7 @@ test_event_base_new(void *ptr) struct event ev1; struct basic_cb_args args; - int towrite = strlen(TEST1)+1; + int towrite = (int)strlen(TEST1)+1; int len = write(data->pair[0], TEST1, towrite); if (len < 0) @@ -1646,9 +1646,9 @@ evtag_int_test(void *ptr) for (i = 0; i < TEST_MAX_INT; i++) { int oldlen, newlen; - oldlen = EVBUFFER_LENGTH(tmp); + oldlen = (int)EVBUFFER_LENGTH(tmp); evtag_encode_int(tmp, integers[i]); - newlen = EVBUFFER_LENGTH(tmp); + newlen = (int)EVBUFFER_LENGTH(tmp); TT_BLATHER(("encoded 0x%08x with %d bytes", (unsigned)integers[i], newlen - oldlen)); big_int = integers[i]; @@ -1723,9 +1723,9 @@ evtag_tag_encoding(void *ptr) for (i = 0; i < TEST_MAX_INT; i++) { int oldlen, newlen; - oldlen = EVBUFFER_LENGTH(tmp); + oldlen = (int)EVBUFFER_LENGTH(tmp); evtag_encode_tag(tmp, integers[i]); - newlen = EVBUFFER_LENGTH(tmp); + newlen = (int)EVBUFFER_LENGTH(tmp); TT_BLATHER(("encoded 0x%08x with %d bytes", (unsigned)integers[i], newlen - oldlen)); } diff --git a/test/regress.h b/test/regress.h index ddaadec7..3cbd7cd2 100644 --- a/test/regress.h +++ b/test/regress.h @@ -62,7 +62,7 @@ extern int called; extern struct event_base *global_base; extern int in_legacy_test_wrapper; -evutil_socket_t regress_make_tmpfile(const void *data, size_t datalen); +int regress_make_tmpfile(const void *data, size_t datalen); struct basic_test_data { struct event_base *base; diff --git a/test/regress_buffer.c b/test/regress_buffer.c index a4b9b31f..4f4a8303 100644 --- a/test/regress_buffer.c +++ b/test/regress_buffer.c @@ -491,7 +491,7 @@ test_evbuffer_expand(void *ptr) buf = evbuffer_new(); evbuffer_add(buf, data, 400); { - int n = buf->first->buffer_len - buf->first->off - 1; + int n = (int)(buf->first->buffer_len - buf->first->off - 1); tt_assert(n < (int)sizeof(data)); evbuffer_add(buf, data, n); } @@ -595,7 +595,8 @@ test_evbuffer_add_file(void *ptr) const char *data = "this is what we add as file system data."; size_t datalen; const char *compare; - evutil_socket_t fd = -1, pair[2] = {-1, -1}; + int fd = -1; + evutil_socket_t pair[2] = {-1, -1}; int r=0, n_written=0; /* Add a test for a big file. XXXX */ @@ -645,7 +646,7 @@ test_evbuffer_add_file(void *ptr) tt_int_op(n_written, ==, datalen); evbuffer_validate(src); - tt_int_op(evbuffer_read(src, pair[1], strlen(data)), ==, datalen); + tt_int_op(evbuffer_read(src, pair[1], (int)strlen(data)), ==, datalen); evbuffer_validate(src); compare = (char *)evbuffer_pullup(src, datalen); tt_assert(compare != NULL); diff --git a/test/regress_bufferevent.c b/test/regress_bufferevent.c index d12fe27e..a120e516 100644 --- a/test/regress_bufferevent.c +++ b/test/regress_bufferevent.c @@ -189,7 +189,7 @@ static void wm_readcb(struct bufferevent *bev, void *arg) { struct evbuffer *evbuf = evbuffer_new(); - int len = evbuffer_get_length(bev->input); + int len = (int)evbuffer_get_length(bev->input); static int nread; assert(len >= 10 && len <= 20); diff --git a/test/regress_et.c b/test/regress_et.c index 94123499..1ab92313 100644 --- a/test/regress_et.c +++ b/test/regress_et.c @@ -97,7 +97,7 @@ test_edgetriggered(void *et) called = was_et = 0; - send(pair[0], test, strlen(test)+1, 0); + send(pair[0], test, (int)strlen(test)+1, 0); shutdown(pair[0], SHUT_WR); /* Initalize the event library */ diff --git a/test/regress_http.c b/test/regress_http.c index e9e9e654..96ad5103 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -127,7 +127,7 @@ http_setup(ev_uint16_t *pport, struct event_base *base) #define NI_MAXSERV 1024 #endif -static int +static evutil_socket_t http_connect(const char *address, u_short port) { /* Stupid code for connecting */ diff --git a/test/regress_main.c b/test/regress_main.c index ca41333a..d4265dbb 100644 --- a/test/regress_main.c +++ b/test/regress_main.c @@ -107,7 +107,7 @@ static void dnslogcb(int w, const char *m) } /* creates a temporary file with the data in it */ -evutil_socket_t +int regress_make_tmpfile(const void *data, size_t datalen) { #ifndef WIN32 @@ -147,7 +147,7 @@ regress_make_tmpfile(const void *data, size_t datalen) if (tries == 0) return (-1); written = 0; - WriteFile(h, data, datalen, &written, NULL); + WriteFile(h, data, (DWORD)datalen, &written, NULL); /* Closing the fd returned by this function will indeed close h. */ return _open_osfhandle((intptr_t)h,_O_RDONLY); #endif diff --git a/test/test-changelist.c b/test/test-changelist.c index 7a328f20..f854a2d3 100644 --- a/test/test-changelist.c +++ b/test/test-changelist.c @@ -143,7 +143,7 @@ main(int argc, char **argv) struct event* timeout; struct event_base* base; - int pair[2]; + evutil_socket_t pair[2]; int res; struct timeval tv; struct cpu_usage_timer timer; diff --git a/test/test-eof.c b/test/test-eof.c index 3d4be93d..90b40938 100644 --- a/test/test-eof.c +++ b/test/test-eof.c @@ -78,7 +78,7 @@ main(int argc, char **argv) return (1); - send(pair[0], test, strlen(test)+1, 0); + send(pair[0], test, (int)strlen(test)+1, 0); shutdown(pair[0], SHUT_WR); /* Initalize the event library */ diff --git a/test/test-weof.c b/test/test-weof.c index 2423d217..0ea4d971 100644 --- a/test/test-weof.c +++ b/test/test-weof.c @@ -43,7 +43,7 @@ write_cb(evutil_socket_t fd, short event, void *arg) const char *test = "test string"; int len; - len = send(fd, test, strlen(test) + 1, 0); + len = send(fd, test, (int)strlen(test) + 1, 0); printf("%s: write %d%s\n", __func__, len, len ? "" : " - means EOF");