From: Martin Schwenke <martin@meltin.net>
Date: Fri, 21 Jun 2019 04:39:20 +0000 (+1000)
Subject: ctdb-tests: Fix signed/unsigned comparisons by casting
X-Git-Tag: samba-4.11.0rc1~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d8531b05c4112cd5d4f7d192d591fdb102241d6;p=thirdparty%2Fsamba.git

ctdb-tests: Fix signed/unsigned comparisons by casting

These are all cases comparing a number of bytes written (int or
ssize_t) with a size_t, so casting to size_t is appropriate.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tests/src/conf_test.c b/ctdb/tests/src/conf_test.c
index b727cf34406..9b3bd8f0cc1 100644
--- a/ctdb/tests/src/conf_test.c
+++ b/ctdb/tests/src/conf_test.c
@@ -418,7 +418,7 @@ static void test11(const char *filename)
 	bool status;
 
 	ret = snprintf(reload, sizeof(reload), "%s.reload", filename);
-	assert(ret < sizeof(reload));
+	assert((size_t)ret < sizeof(reload));
 
 	ret = conf_init(mem_ctx, &conf);
 	assert(ret == 0);
diff --git a/ctdb/tests/src/line_test.c b/ctdb/tests/src/line_test.c
index 0c5a8211392..806d8836e5f 100644
--- a/ctdb/tests/src/line_test.c
+++ b/ctdb/tests/src/line_test.c
@@ -72,7 +72,7 @@ int main(int argc, const char **argv)
 
 		while (1) {
 			n = read(fd, buffer, sizeof(buffer));
-			assert(n >= 0 && n <= sizeof(buffer));
+			assert(n >= 0 && (size_t)n <= sizeof(buffer));
 
 			if (n == 0) {
 				break;
diff --git a/ctdb/tests/src/pkt_write_test.c b/ctdb/tests/src/pkt_write_test.c
index 3872670880d..dae92a5043a 100644
--- a/ctdb/tests/src/pkt_write_test.c
+++ b/ctdb/tests/src/pkt_write_test.c
@@ -84,7 +84,7 @@ static void writer_next(struct tevent_req *subreq)
 		return;
 	}
 
-	if (nwritten != state->buflen) {
+	if ((size_t)nwritten != state->buflen) {
 		tevent_req_error(req, EIO);
 		return;
 	}
diff --git a/ctdb/tests/src/sock_io_test.c b/ctdb/tests/src/sock_io_test.c
index d0048c18220..d0e424f5620 100644
--- a/ctdb/tests/src/sock_io_test.c
+++ b/ctdb/tests/src/sock_io_test.c
@@ -170,7 +170,7 @@ static void test2_reader(int fd)
 			return;
 		}
 
-		assert(n == pkt_len);
+		assert((size_t)n == pkt_len);
 		pkt_len += 10;
 	}
 }
diff --git a/ctdb/tests/src/system_socket_test.c b/ctdb/tests/src/system_socket_test.c
index b3959576b5e..da962f00a2c 100644
--- a/ctdb/tests/src/system_socket_test.c
+++ b/ctdb/tests/src/system_socket_test.c
@@ -82,7 +82,7 @@ static void test_arp(const char *addr_str, const char *hwaddr_str, bool reply)
 	assert(ret == 0);
 
 	num_written = write(STDOUT_FILENO, buf, len);
-	assert(num_written == len);
+	assert(num_written != -1 && (size_t)num_written == len);
 }
 
 #else /* HAVE_PACKETSOCKET  */
@@ -162,7 +162,7 @@ static void test_tcp(const char *src_str,
 	num_written = write(STDOUT_FILENO,
 			    buf + sizeof(struct ether_header),
 			    len);
-	assert(num_written == len);
+	assert(num_written != -1 && (size_t)num_written == len);
 
 	switch (ntohs(eth->ether_type)) {
 	case ETHERTYPE_IP: