Fix some compiler warnings

Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>

plugins/examples/plugin-event-stats/mosquitto_plugin_event_stats.c

@@ -28,6 +28,8 @@ Contributors:
  *
  * Note that this only works on Mosquitto 2.1 or later.
  */
+#include <inttypes.h>
+
 #include "config.h"
 
 #include <stdio.h>
@@ -98,7 +100,7 @@ static int callback_tick(int event, void *event_data, void *userdata)
 
 		for(int i=1; i<MAX_EVT+1; i++){
 			if(evt_counts[i] != last_evt_counts[i]){
-				slen = snprintf(payload, sizeof(payload), "%ld", evt_counts[i]);
+				slen = snprintf(payload, sizeof(payload), "%" PRIu64, evt_counts[i]);
 				mosquitto_broker_publish_copy(NULL, evt_topics[i], slen, payload, 0, 1, NULL);
 				last_evt_counts[i] = evt_counts[i];
 			}

src/database.c

@@ -383,20 +383,17 @@ void db__message_dequeue_first(struct mosquitto *context, struct mosquitto_msg_d
 int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_state expect_state, int qos)
 {
 	struct mosquitto_client_msg *tail, *tmp;
-	int msg_index = 0;
 	bool deleted = false;
 
 	if(!context) return MOSQ_ERR_INVAL;
 
 	DL_FOREACH_SAFE(context->msgs_out.inflight, tail, tmp){
-		msg_index++;
 		if(tail->mid == mid){
 			if(tail->qos != qos){
 				return MOSQ_ERR_PROTOCOL;
 			}else if(qos == 2 && tail->state != expect_state){
 				return MOSQ_ERR_PROTOCOL;
 			}
-			msg_index--;
 			db__message_remove_inflight(context, &context->msgs_out, tail);
 			deleted = true;
 			break;
@@ -422,7 +419,6 @@ int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mo
 			break;
 		}
 
-		msg_index++;
 		switch(tail->qos){
 			case 0:
 				tail->state = mosq_ms_publish_qos0;
@@ -1156,14 +1152,12 @@ int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
 	int retain;
 	char *topic;
 	char *source_id;
-	int msg_index = 0;
 	bool deleted = false;
 	int rc;
 
 	if(!context) return MOSQ_ERR_INVAL;
 
 	DL_FOREACH_SAFE(context->msgs_in.inflight, tail, tmp){
-		msg_index++;
 		if(tail->mid == mid){
 			if(tail->base_msg->qos != 2){
 				return MOSQ_ERR_PROTOCOL;
@@ -1196,8 +1190,6 @@ int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
 			break;
 		}
 
-		msg_index++;
-
 		if(tail->qos == 2){
 			send__pubrec(context, tail->mid, 0, NULL);
 			tail->state = mosq_ms_wait_for_pubrel;

src/mosquitto.c

@@ -189,7 +189,7 @@ static int drop_privileges(struct mosquitto__config *config)
 					}
 				}
 			}
-			if(initgroups(config->user, pwd->pw_gid) == -1){
+			if(initgroups(config->user, (int)pwd->pw_gid) == -1){
 				err = strerror(errno);
 				log__printf(NULL, MOSQ_LOG_ERR, "Error setting groups whilst dropping privileges: %s.", err);
 				return 1;

test/lib/c/01-con-discon-success-v5.c

@@ -9,6 +9,9 @@ static int run = -1;
 static void on_connect(struct mosquitto *mosq, void *obj, int rc, int flags, const mosquitto_property *properties)
 {
 	(void)obj;
+	(void)rc;
+	(void)flags;
+	(void)properties;
 
 	/* FIXME - should verify flags and all properties here. */
 	if(rc){
@@ -22,6 +25,7 @@ static void on_disconnect(struct mosquitto *mosq, void *obj, int rc, const mosqu
 {
 	(void)mosq;
 	(void)obj;
+	(void)properties;
 
 	/* FIXME - should verify flags and all properties here. */
 	run = rc;

test/lib/c/02-subscribe-qos1-async2.c

@@ -62,6 +62,8 @@ static const char* loglevel_as_str(int level)
 
 static void on_log(struct mosquitto *mosq, void *user_data, int level, const char *msg)
 {
+	(void)mosq;
+	(void)user_data;
 	fprintf(stderr, "%s: %s\n", loglevel_as_str(level), msg);
 }
 

test/unit/datatype_read.c

@@ -157,7 +157,7 @@ static void bytes_read_helper(
 	rc = packet__read_bytes(&packet, value, (uint32_t)count);
 	CU_ASSERT_EQUAL(rc, rc_expected);
 	if(rc == MOSQ_ERR_SUCCESS){
-		CU_ASSERT_EQUAL(packet.pos, count);
+		CU_ASSERT_EQUAL(packet.pos, (uint32_t)count);
 	}
 	if(value_expected){
 		for(i=0; i<count; i++){

test/unit/keepalive_test.c

@@ -167,7 +167,7 @@ static void TEST_100k_random_clients(void)
 	struct mosquitto *contexts;
 	int rc;
 	const int client_count = 100000;
-	int client_total, cur_count;
+	int /*client_total,*/ cur_count;
 
 	/* This is a very crude test, adding 100k clients with random keepalive and
 	 * random last message in. */
@@ -176,7 +176,7 @@ static void TEST_100k_random_clients(void)
 
 	memset(&db, 0, sizeof(db));
 
-	contexts = calloc(client_count, sizeof(struct mosquitto));
+	contexts = calloc((size_t)client_count, sizeof(struct mosquitto));
 	db.now_s = 1000;
 	db.config = calloc(1, sizeof(struct mosquitto__config));
 	if(db.config == NULL){
@@ -208,12 +208,12 @@ static void TEST_100k_random_clients(void)
 	}
 
 	/* Count clients */
-	client_total = 0;
+	/* client_total = 0; */
 	for(int i=0; i<keepalive_list_max; i++){
 		struct mosquitto *ctx;
 
 		DL_COUNT2(keepalive_list[i], ctx, cur_count, keepalive_next);
-		client_total += cur_count;
+		/* client_total += cur_count; */
 	}
 	/* FIXME
 	CU_ASSERT_EQUAL(client_total, client_count);

test/unit/property_add.c

@@ -579,8 +579,8 @@ static void TEST_check_length(void)
 	mosquitto_property *proplist = NULL;
 	int rc;
 	unsigned int len;
-	int varbytes;
-	int i;
+	unsigned int varbytes;
+	unsigned int i;
 
 	len = property__get_remaining_length(proplist);
 	CU_ASSERT_EQUAL(len, 1);

test/unit/property_read.c

@@ -248,7 +248,7 @@ static void binary_prop_read_helper(
 		CU_ASSERT_EQUAL(properties->value.bin.len, len_expected);
 		CU_ASSERT_EQUAL(memcmp(properties->value.bin.v, value_expected, (size_t)len_expected), 0);
 		CU_ASSERT_PTR_EQUAL(properties->next, NULL);
-		CU_ASSERT_EQUAL(property__get_length_all(properties), 1+2+len_expected);
+		CU_ASSERT_EQUAL(property__get_length_all(properties), 1+2+(unsigned int)len_expected);
 		mosquitto_property_free_all(&properties);
 	}
 	CU_ASSERT_PTR_EQUAL(properties, NULL);