From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 14 Oct 2010 17:16:41 +0000 (-0400)
Subject: Fix -Wsigned-compare warnings in test/*
X-Git-Tag: release-2.0.8-rc~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5c214a4235d77610ce19298d47b01b95c2fe4c9;p=libevent

Fix -Wsigned-compare warnings in test/*
---

diff --git a/test/bench_http.c b/test/bench_http.c
index 4b2eb3cd..2a365fee 100644
--- a/test/bench_http.c
+++ b/test/bench_http.c
@@ -150,7 +150,7 @@ main(int argc, char **argv)
 		exit(1);
 	} else {
 		int i = 0;
-		for (i = 0; i < content_len; ++i)
+		for (i = 0; i < (int)content_len; ++i)
 			content[i] = (i & 255);
 	}
 
diff --git a/test/regress.c b/test/regress.c
index 24a90e90..21c921b6 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -182,7 +182,7 @@ multiple_write_cb(evutil_socket_t fd, short event, void *arg)
 	int len;
 
 	len = 128;
-	if (woff + len >= sizeof(wbuf))
+	if (woff + len >= (int)sizeof(wbuf))
 		len = sizeof(wbuf) - woff;
 
 	len = write(fd, wbuf + woff, len);
@@ -195,7 +195,7 @@ multiple_write_cb(evutil_socket_t fd, short event, void *arg)
 
 	woff += len;
 
-	if (woff >= sizeof(wbuf)) {
+	if (woff >= (int)sizeof(wbuf)) {
 		shutdown(fd, SHUT_WR);
 		if (usepersist)
 			event_del(ev);
@@ -489,7 +489,7 @@ test_multiple(void)
 	/* Multiple read and write test */
 	setup_test("Multiple read/write: ");
 	memset(rbuf, 0, sizeof(rbuf));
-	for (i = 0; i < sizeof(wbuf); i++)
+	for (i = 0; i < (int)sizeof(wbuf); i++)
 		wbuf[i] = i;
 
 	roff = woff = 0;
@@ -518,7 +518,7 @@ test_persistent(void)
 	/* Multiple read and write test with persist */
 	setup_test("Persist read/write: ");
 	memset(rbuf, 0, sizeof(rbuf));
-	for (i = 0; i < sizeof(wbuf); i++)
+	for (i = 0; i < (int)sizeof(wbuf); i++)
 		wbuf[i] = i;
 
 	roff = woff = 0;
@@ -1681,7 +1681,7 @@ evtag_fuzz(void *ptr)
 	evtag_init();
 
 	for (j = 0; j < 100; j++) {
-		for (i = 0; i < sizeof(buffer); i++)
+		for (i = 0; i < (int)sizeof(buffer); i++)
 			buffer[i] = rand();
 		evbuffer_drain(tmp, -1);
 		evbuffer_add(tmp, buffer, sizeof(buffer));
diff --git a/test/regress_buffer.c b/test/regress_buffer.c
index 65802a25..44c16fdc 100644
--- a/test/regress_buffer.c
+++ b/test/regress_buffer.c
@@ -492,7 +492,7 @@ test_evbuffer_expand(void *ptr)
 	evbuffer_add(buf, data, 400);
 	{
 		int n = buf->first->buffer_len - buf->first->off - 1;
-		tt_assert(n < sizeof(data));
+		tt_assert(n < (int)sizeof(data));
 		evbuffer_add(buf, data, n);
 	}
 	tt_assert(buf->first == buf->last);
@@ -645,7 +645,7 @@ test_evbuffer_add_file(void *ptr)
 	tt_int_op(n_written, ==, datalen);
 
 	evbuffer_validate(src);
-	tt_assert(evbuffer_read(src, pair[1], strlen(data)) == datalen);
+	tt_int_op(evbuffer_read(src, pair[1], 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 de97909f..d12fe27e 100644
--- a/test/regress_bufferevent.c
+++ b/test/regress_bufferevent.c
@@ -152,7 +152,7 @@ test_bufferevent_impl(int use_pair)
 	tt_int_op(bufferevent_get_enabled(bev1), ==, EV_WRITE);
 	tt_int_op(bufferevent_get_enabled(bev2), ==, EV_WRITE|EV_READ);
 
-	for (i = 0; i < sizeof(buffer); i++)
+	for (i = 0; i < (int)sizeof(buffer); i++)
 		buffer[i] = i;
 
 	bufferevent_write(bev1, buffer, sizeof(buffer));
@@ -246,7 +246,7 @@ test_bufferevent_watermarks_impl(int use_pair)
 	bufferevent_disable(bev1, EV_READ);
 	bufferevent_enable(bev2, EV_READ);
 
-	for (i = 0; i < sizeof(buffer); i++)
+	for (i = 0; i < (int)sizeof(buffer); i++)
 		buffer[i] = (char)i;
 
 	/* limit the reading on the receiving bufferevent */
@@ -350,7 +350,7 @@ test_bufferevent_filters_impl(int use_pair)
 	bev1_base = bev1;
 	bev2_base = bev2;
 
-	for (i = 0; i < sizeof(buffer); i++)
+	for (i = 0; i < (int)sizeof(buffer); i++)
 		buffer[i] = i;
 
 	bev1 = bufferevent_filter_new(bev1, NULL, bufferevent_output_filter,
diff --git a/test/regress_http.c b/test/regress_http.c
index 5b899a23..05288824 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -290,7 +290,7 @@ http_chunked_trickle_cb(evutil_socket_t fd, short events, void *arg)
 	evhttp_send_reply_chunk(state->req, evb);
 	evbuffer_free(evb);
 
-	if (++state->i < sizeof(CHUNKS)/sizeof(CHUNKS[0])) {
+	if (++state->i < (int) (sizeof(CHUNKS)/sizeof(CHUNKS[0]))) {
 		event_once(-1, EV_TIMEOUT,
 		    http_chunked_trickle_cb, state, &when);
 	} else {
diff --git a/test/regress_main.c b/test/regress_main.c
index 3732f098..db95f305 100644
--- a/test/regress_main.c
+++ b/test/regress_main.c
@@ -117,7 +117,7 @@ regress_make_tmpfile(const void *data, size_t datalen)
 	fd = mkstemp(tmpfilename);
 	if (fd == -1)
 		return (-1);
-	if (write(fd, data, datalen) != datalen) {
+	if (write(fd, data, datalen) != (int)datalen) {
 		close(fd);
 		return (-1);
 	}
diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index bd66bde7..14585b4a 100644
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -845,7 +845,7 @@ rpc_test(void)
 		if (EVTAG_ARRAY_GET(attack, how_often, i, &res) == -1) {
 			TT_DIE(("Cannot get %dth how_often msg.", i));
 		}
-		if (res != i) {
+		if ((int)res != i) {
 			TT_DIE(("Wrong message encoded %d != %d", i, res));
 		}
 	}
diff --git a/test/regress_zlib.c b/test/regress_zlib.c
index 48354b44..58fc01fe 100644
--- a/test/regress_zlib.c
+++ b/test/regress_zlib.c
@@ -290,7 +290,7 @@ test_bufferevent_zlib(void *arg)
 
 	bufferevent_enable(bev2, EV_READ);
 
-	for (i = 0; i < sizeof(buffer); i++)
+	for (i = 0; i < (int)sizeof(buffer); i++)
 		buffer[i] = i;
 
 	/* break it up into multiple buffer chains */