ctdb-protocol: Avoid signed/unsigned comparison by casting

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

diff --git a/ctdb/protocol/protocol_types.c b/ctdb/protocol/protocol_types.c
index 5fb8f201e5d480509c2f10289bd56eb913ef7775..d9388b74b1ef542541ce853480bc04660be32342 100644 (file)
--- a/ctdb/protocol/protocol_types.c
+++ b/ctdb/protocol/protocol_types.c
@@ -1680,19 +1680,19 @@ int ctdb_rec_buffer_write(struct ctdb_rec_buffer *recbuf, int fd)
        ssize_t n;
 
        n = write(fd, &recbuf->db_id, sizeof(uint32_t));
-       if (n == -1 || n != sizeof(uint32_t)) {
+       if (n == -1 || (size_t)n != sizeof(uint32_t)) {
                return (errno != 0 ? errno : EIO);
        }
        n = write(fd, &recbuf->count, sizeof(uint32_t));
-       if (n == -1 || n != sizeof(uint32_t)) {
+       if (n == -1 || (size_t)n != sizeof(uint32_t)) {
                return (errno != 0 ? errno : EIO);
        }
        n = write(fd, &recbuf->buflen, sizeof(size_t));
-       if (n == -1 || n != sizeof(size_t)) {
+       if (n == -1 || (size_t)n != sizeof(size_t)) {
                return (errno != 0 ? errno : EIO);
        }
        n = write(fd, recbuf->buf, recbuf->buflen);
-       if (n == -1 || n != recbuf->buflen) {
+       if (n == -1 || (size_t)n != recbuf->buflen) {
                return (errno != 0 ? errno : EIO);
        }
 
@@ -1711,15 +1711,15 @@ int ctdb_rec_buffer_read(int fd, TALLOC_CTX *mem_ctx,
        }
 
        n = read(fd, &recbuf->db_id, sizeof(uint32_t));
-       if (n == -1 || n != sizeof(uint32_t)) {
+       if (n == -1 || (size_t)n != sizeof(uint32_t)) {
                return (errno != 0 ? errno : EIO);
        }
        n = read(fd, &recbuf->count, sizeof(uint32_t));
-       if (n == -1 || n != sizeof(uint32_t)) {
+       if (n == -1 || (size_t)n != sizeof(uint32_t)) {
                return (errno != 0 ? errno : EIO);
        }
        n = read(fd, &recbuf->buflen, sizeof(size_t));
-       if (n == -1 || n != sizeof(size_t)) {
+       if (n == -1 || (size_t)n != sizeof(size_t)) {
                return (errno != 0 ? errno : EIO);
        }
 
@@ -1729,7 +1729,7 @@ int ctdb_rec_buffer_read(int fd, TALLOC_CTX *mem_ctx,
        }
 
        n = read(fd, recbuf->buf, recbuf->buflen);
-       if (n == -1 || n != recbuf->buflen) {
+       if (n == -1 || (size_t)n != recbuf->buflen) {
                return (errno != 0 ? errno : EIO);
        }
 

diff --git a/ctdb/protocol/protocol_util.c b/ctdb/protocol/protocol_util.c
index 026f342bd7d2fb3f23f277bbf2589a55c9df211d..c67aa2e056f60dc67ffb7e3b67612704c85c5a8c 100644 (file)
--- a/ctdb/protocol/protocol_util.c
+++ b/ctdb/protocol/protocol_util.c
@@ -147,7 +147,7 @@ int ctdb_sock_addr_to_buf(char *buf, socklen_t buflen,
 
                ret = snprintf(buf+len, buflen-len,
                               ":%u", ctdb_sock_addr_port(addr));
-               if (ret >= buflen-len) {
+               if (ret < 0 || (size_t)ret >= buflen-len) {
                        return ENOSPC;
                }
        }
@@ -485,7 +485,7 @@ int ctdb_connection_to_buf(char *buf, size_t buflen,
        } else {
                ret = snprintf(buf, buflen, "%s %s", client, server);
        }
-       if (ret >= buflen) {
+       if (ret < 0 || (size_t)ret >= buflen) {
                return ENOSPC;
        }