fix signedness warnings in code

diff --git a/src/admin.c b/src/admin.c
index 65d0e5fb8051ac29af9ccc1809f43ffee4551fae..715604dc7d8441e8d75a42a2d81db26d1f241983 100644 (file)
--- a/src/admin.c
+++ b/src/admin.c
@@ -198,7 +198,7 @@ static bool send_one_fd(PgSocket *admin,
        if (res < 0) {
                log_error("send_one_fd: sendmsg error: %s", strerror(errno));
                return false;
-       } else if (res != iovec.iov_len) {
+       } else if ((size_t)res != iovec.iov_len) {
                log_error("send_one_fd: partial sendmsg");
                return false;
        }
@@ -738,7 +738,7 @@ static bool admin_cmd_pause(PgSocket *admin, const char *arg)
 
 /* extract substring from regex group */
 static void copy_arg(const char *src, regmatch_t *glist,
-                    int gnum, char *dst, int dstmax)
+                    int gnum, char *dst, unsigned dstmax)
 {
        regmatch_t *g = &glist[gnum];
        unsigned len = g->rm_eo - g->rm_so;

diff --git a/src/mbuf.h b/src/mbuf.h
index 3142fea284afa361affd40e19b2eeba35599c3ee..bc1854000c7a990580b792b2167e4a288bb22993 100644 (file)
--- a/src/mbuf.h
+++ b/src/mbuf.h
@@ -80,7 +80,7 @@ static inline unsigned mbuf_get_uint64(MBuf *buf)
 static inline const uint8 * mbuf_get_bytes(MBuf *buf, unsigned len)
 {
        const uint8 *res = buf->pos;
-       if (len > buf->end - buf->pos)
+       if (buf->pos + len > buf->end)
                fatal("buffer overflow");
        buf->pos += len;
        return res;

diff --git a/src/proto.c b/src/proto.c
index 6a8106caed33971f7bafa384363b8de6fb65893b..fe0c53e14809af664d2a3386917d109b3103dbfc 100644 (file)
--- a/src/proto.c
+++ b/src/proto.c
@@ -317,9 +317,8 @@ int scan_text_result(MBuf *pkt, const char *tupdesc, ...)
 {
        char *val = NULL;
        int len;
-       unsigned ncol, i;
+       unsigned ncol, i, asked;
        va_list ap;
-       int asked;
        int *int_p;
        uint64 *long_p;
        char **str_p;

diff --git a/src/varcache.c b/src/varcache.c
index acf6001996a85ae87268faf30808bf829f1e7392..6276d82f74e46e541e77db63494c0cdd44ac2d2b 100644 (file)
--- a/src/varcache.c
+++ b/src/varcache.c
@@ -101,7 +101,7 @@ static int apply_var(PktBuf *pkt, const char *key,
 {
        char buf[128];
        char qbuf[128];
-       int len;
+       unsigned len;
 
        if (strcasecmp(cval, sval) == 0)
                return 0;