From: Martin Schwenke <martin@meltin.net>
Date: Mon, 24 Jun 2019 06:42:21 +0000 (+1000)
Subject: ctdb-common: Fix signed/unsigned comparisons by declaring as unsigned
X-Git-Tag: samba-4.11.0rc1~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d424d2197f1f873fded84ed650295d0b8c64960a;p=thirdparty%2Fsamba.git

ctdb-common: Fix signed/unsigned comparisons by declaring as unsigned

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

diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index 1fc9ce28c1b..73458754def 100644
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -308,8 +308,8 @@ int ctdb_ltdb_delete(struct ctdb_db_context *ctdb_db, TDB_DATA key)
 
 int ctdb_trackingdb_add_pnn(struct ctdb_context *ctdb, TDB_DATA *data, uint32_t pnn)
 {
-	int byte_pos = pnn / 8;
-	int bit_mask   = 1 << (pnn % 8);
+	unsigned int byte_pos = pnn / 8;
+	unsigned char bit_mask = 1 << (pnn % 8);
 
 	if (byte_pos + 1 > data->dsize) {
 		char *buf;
@@ -334,10 +334,10 @@ int ctdb_trackingdb_add_pnn(struct ctdb_context *ctdb, TDB_DATA *data, uint32_t
 
 void ctdb_trackingdb_traverse(struct ctdb_context *ctdb, TDB_DATA data, ctdb_trackingdb_cb cb, void *private_data)
 {
-	int i;
+	unsigned int i;
 
 	for(i = 0; i < data.dsize; i++) {
-		int j;
+		unsigned int j;
 
 		for (j=0; j<8; j++) {
 			int mask = 1<<j;
diff --git a/ctdb/common/run_event.c b/ctdb/common/run_event.c
index ca4e572a806..d283664e2cf 100644
--- a/ctdb/common/run_event.c
+++ b/ctdb/common/run_event.c
@@ -519,7 +519,7 @@ struct run_event_state {
 	struct run_event_script_list *script_list;
 	const char **argv;
 	struct tevent_req *script_subreq;
-	int index;
+	unsigned int index;
 	bool cancelled;
 };