diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-06-21 14:39:20 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2019-07-05 05:03:23 +0000 |
| commit | 5d8531b05c4112cd5d4f7d192d591fdb102241d6 (patch) | |
| tree | 1b76fb5179bce4ecbd17b712ac4aa5210a3e072e /ctdb | |
| parent | 68a4588a6fb4c77c6dd34f5d98643525e169c32c (diff) | |
| download | samba-5d8531b05c4112cd5d4f7d192d591fdb102241d6.tar.gz | |
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>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tests/src/conf_test.c | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/line_test.c | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/pkt_write_test.c | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/sock_io_test.c | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/system_socket_test.c | 4 |
5 files changed, 6 insertions, 6 deletions
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: |