From e6f5633ff6cd66e3e28dafd810621ef8c67e78a2 Mon Sep 17 00:00:00 2001 From: Kai Buschulte Date: Thu, 3 Nov 2022 10:45:51 +0100 Subject: [PATCH] Fix some compiler warnings Signed-off-by: Kai Buschulte --- .../plugin-event-stats/mosquitto_plugin_event_stats.c | 4 +++- src/database.c | 8 -------- src/mosquitto.c | 2 +- test/lib/c/01-con-discon-success-v5.c | 4 ++++ test/lib/c/02-subscribe-qos1-async2.c | 2 ++ test/unit/datatype_read.c | 2 +- test/unit/keepalive_test.c | 8 ++++---- test/unit/property_add.c | 4 ++-- test/unit/property_read.c | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/examples/plugin-event-stats/mosquitto_plugin_event_stats.c b/plugins/examples/plugin-event-stats/mosquitto_plugin_event_stats.c index e2d0564c..a1751262 100644 --- a/plugins/examples/plugin-event-stats/mosquitto_plugin_event_stats.c +++ b/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 + #include "config.h" #include @@ -98,7 +100,7 @@ static int callback_tick(int event, void *event_data, void *userdata) for(int i=1; imsgs_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; diff --git a/src/mosquitto.c b/src/mosquitto.c index cb381acf..ebafd004 100644 --- a/src/mosquitto.c +++ b/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; diff --git a/test/lib/c/01-con-discon-success-v5.c b/test/lib/c/01-con-discon-success-v5.c index 35dc656b..b46bb8cb 100644 --- a/test/lib/c/01-con-discon-success-v5.c +++ b/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; diff --git a/test/lib/c/02-subscribe-qos1-async2.c b/test/lib/c/02-subscribe-qos1-async2.c index c81935c5..ac8fb972 100644 --- a/test/lib/c/02-subscribe-qos1-async2.c +++ b/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); } diff --git a/test/unit/datatype_read.c b/test/unit/datatype_read.c index 93e0e061..5d0e7f8a 100644 --- a/test/unit/datatype_read.c +++ b/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; ivalue.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);