ctdb-client: Fix signed/unsigned comparisons by declaring as unsigned
authorMartin Schwenke <martin@meltin.net>
Wed, 22 May 2019 11:55:56 +0000 (21:55 +1000)
committerAmitay Isaacs <amitay@samba.org>
Wed, 5 Jun 2019 10:25:50 +0000 (10:25 +0000)
Simple cases where a variables and function parameters need to be
declared as an unsigned type instead of an int.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/client/client.h
ctdb/client/client_db.c
ctdb/client/client_tunnel.c
ctdb/client/client_util.c

index d4d145045e070d73fbba78719e48943cddfb493d..0df76a66e46ab3f7541cf9334f103d0ae8ab4bb6 100644 (file)
@@ -691,7 +691,7 @@ int ctdb_tunnel_destroy(struct tevent_context *ev,
 struct tevent_req *ctdb_tunnel_request_send(TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
                                            struct ctdb_tunnel_context *tctx,
-                                           int destnode,
+                                           uint32_t destnode,
                                            struct timeval timeout,
                                            uint8_t *buf, size_t buflen,
                                            bool wait_for_reply);
@@ -724,7 +724,7 @@ bool ctdb_tunnel_request_recv(struct tevent_req *req, int *perr,
  * @return 0 on success, errno on failure
  */
 int ctdb_tunnel_request(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                       struct ctdb_tunnel_context *tctx, int destnode,
+                       struct ctdb_tunnel_context *tctx, uint32_t destnode,
                        struct timeval timeout, uint8_t *buf, size_t buflen,
                        bool wait_for_reply);
 
@@ -744,7 +744,7 @@ int ctdb_tunnel_request(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
 struct tevent_req *ctdb_tunnel_reply_send(TALLOC_CTX *mem_ctx,
                                          struct tevent_context *ev,
                                          struct ctdb_tunnel_context *tctx,
-                                         int destnode, uint32_t reqid,
+                                         uint32_t destnode, uint32_t reqid,
                                          struct timeval timeout,
                                          uint8_t *buf, size_t buflen);
 
@@ -771,7 +771,7 @@ bool ctdb_tunnel_reply_recv(struct tevent_req *req, int *perr);
  * @return 0 on success, errno on failure
  */
 int ctdb_tunnel_reply(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                     struct ctdb_tunnel_context *tctx, int destnode,
+                     struct ctdb_tunnel_context *tctx, uint32_t destnode,
                      uint32_t reqid, struct timeval timeout,
                      uint8_t *buf, size_t buflen);
 
index c0ecdeb2d307dc57b2be5ca29e71e1421b6215fb..c9ddde3d422ce718eddda4a00408be088bfbef66 100644 (file)
@@ -2018,7 +2018,8 @@ static int ctdb_g_lock_unlock_update(struct tevent_req *req)
        struct ctdb_g_lock_unlock_state *state = tevent_req_data(
                req, struct ctdb_g_lock_unlock_state);
        struct ctdb_g_lock *lock;
-       int ret, i;
+       unsigned int i;
+       int ret;
 
        for (i=0; i<state->lock_list->num; i++) {
                lock = &state->lock_list->lock[i];
index a783afe47c86fa88067df1de5b51d4e676c22adb..13c35fb61bea72b87486f5b9fa8e1ce47c2a4b45 100644 (file)
@@ -392,7 +392,7 @@ static void ctdb_tunnel_request_done(struct tevent_req *subreq);
 struct tevent_req *ctdb_tunnel_request_send(TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
                                            struct ctdb_tunnel_context *tctx,
-                                           int destnode,
+                                           uint32_t destnode,
                                            struct timeval timeout,
                                            uint8_t *buf, size_t buflen,
                                            bool wait_for_reply)
@@ -544,7 +544,7 @@ bool ctdb_tunnel_request_recv(struct tevent_req *req, int *perr,
 }
 
 int ctdb_tunnel_request(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                       struct ctdb_tunnel_context *tctx, int destnode,
+                       struct ctdb_tunnel_context *tctx, uint32_t destnode,
                        struct timeval timeout, uint8_t *buf, size_t buflen,
                        bool wait_for_reply)
 {
@@ -577,7 +577,7 @@ static void ctdb_tunnel_reply_done(struct tevent_req *subreq);
 struct tevent_req *ctdb_tunnel_reply_send(TALLOC_CTX *mem_ctx,
                                          struct tevent_context *ev,
                                          struct ctdb_tunnel_context *tctx,
-                                         int destnode, uint32_t reqid,
+                                         uint32_t destnode, uint32_t reqid,
                                          struct timeval timeout,
                                          uint8_t *buf, size_t buflen)
 {
@@ -667,7 +667,7 @@ bool ctdb_tunnel_reply_recv(struct tevent_req *req, int *perr)
 }
 
 int ctdb_tunnel_reply(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                     struct ctdb_tunnel_context *tctx, int destnode,
+                     struct ctdb_tunnel_context *tctx, uint32_t destnode,
                      uint32_t reqid, struct timeval timeout,
                      uint8_t *buf, size_t buflen)
 {
index c68135f0af96ef1e6622d1d3ca749ea6e5b30e00..35323ff9eac34a3616c599e885f1777a565e7621 100644 (file)
@@ -41,7 +41,7 @@ int list_of_nodes(struct ctdb_node_map *nodemap,
 {
        int num_nodes = 0;
        uint32_t *list;
-       int i;
+       unsigned int i;
 
        /* Allocate the list of same number of nodes */
        list = talloc_array(mem_ctx, uint32_t, nodemap->num);