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 b727cf34406e10dc68937f82ffc86d3a48635eca..9b3bd8f0cc1757b84edea0274be59fd45a6a9918 100644 (file)
--- 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 0c5a82113920399e203e2e5c84b14d3916bf776a..806d8836e5f11ec8c042e11bdf43779bc0a2cc24 100644 (file)
--- 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 3872670880dc9b3f2a048ed6dbf0c6f0fb95da66..dae92a5043ae2ead6851d9ab6d54f240eecba443 100644 (file)
--- 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 d0048c18220a6d640e3c58c077077f9ff2e96726..d0e424f562052348a05f0ebaf37bdc93df11b8d2 100644 (file)
--- 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 b3959576b5e2dd2850dae204511cd2e821a48231..da962f00a2cc7f1c80ca6c56c780b9779518f64c 100644 (file)
--- 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: