Fix some -Wextra compiler warnings.

lib/util_topic.c

@@ -139,6 +139,9 @@ int mosquitto_topic_matches_sub2(const char *sub, size_t sublen, const char *top
 {
 	size_t spos;
 
+	UNUSED(sublen);
+	UNUSED(topiclen);
+
 	if(!result) return MOSQ_ERR_INVAL;
 	*result = false;
 

src/persist_write_v5.c

@@ -56,7 +56,7 @@ error:
 int persist__chunk_client_write_v5(FILE *db_fptr, struct P_client *chunk)
 {
 	struct PF_header header;
-	int id_len = chunk->F.id_len;
+	uint16_t id_len = chunk->F.id_len;
 
 	chunk->F.session_expiry_interval = htonl(chunk->F.session_expiry_interval);
 	chunk->F.last_mid = htons(chunk->F.last_mid);
@@ -81,7 +81,7 @@ int persist__chunk_client_msg_write_v5(FILE *db_fptr, struct P_client_msg *chunk
 {
 	struct PF_header header;
 	struct mosquitto__packet prop_packet;
-	int id_len = chunk->F.id_len;
+	uint16_t id_len = chunk->F.id_len;
 	uint32_t proplen = 0;
 	int rc;
 
@@ -126,10 +126,10 @@ error:
 int persist__chunk_message_store_write_v5(FILE *db_fptr, struct P_msg_store *chunk)
 {
 	struct PF_header header;
-	int payloadlen = chunk->F.payloadlen;
-	int source_id_len = chunk->F.source_id_len;
-	int source_username_len = chunk->F.source_username_len;
-	int topic_len = chunk->F.topic_len;
+	uint32_t payloadlen = chunk->F.payloadlen;
+	uint16_t source_id_len = chunk->F.source_id_len;
+	uint16_t source_username_len = chunk->F.source_username_len;
+	uint16_t topic_len = chunk->F.topic_len;
 	uint32_t proplen = 0;
 	struct mosquitto__packet prop_packet;
 	int rc;
@@ -208,8 +208,8 @@ error:
 int persist__chunk_sub_write_v5(FILE *db_fptr, struct P_sub *chunk)
 {
 	struct PF_header header;
-	int id_len = chunk->F.id_len;
-	int topic_len = chunk->F.topic_len;
+	uint16_t id_len = chunk->F.id_len;
+	uint16_t topic_len = chunk->F.topic_len;
 
 	chunk->F.identifier = htonl(chunk->F.identifier);
 	chunk->F.id_len = htons(chunk->F.id_len);

src/subs.c

@@ -112,7 +112,7 @@ static int subs__send(struct mosquitto_db *db, struct mosquitto__subleaf *leaf,
 }
 
 
-static int subs__shared_process(struct mosquitto_db *db, struct mosquitto__subhier *hier, const char *source_id, const char *topic, int qos, int retain, struct mosquitto_msg_store *stored, bool set_retain)
+static int subs__shared_process(struct mosquitto_db *db, struct mosquitto__subhier *hier, const char *topic, int qos, int retain, struct mosquitto_msg_store *stored)
 {
 	int rc = 0, rc2;
 	struct mosquitto__subshared *shared, *shared_tmp;
@@ -162,7 +162,7 @@ static int subs__process(struct mosquitto_db *db, struct mosquitto__subhier *hie
 		}
 	}
 
-	rc2 = subs__shared_process(db, hier, source_id, topic, qos, retain, stored, set_retain);
+	rc2 = subs__shared_process(db, hier, topic, qos, retain, stored);
 
 	leaf = hier->subs;
 	while(source_id && leaf){
@@ -335,14 +335,14 @@ static void sub__remove_shared_leaf(struct mosquitto__subhier *subhier, struct m
 }
 
 
-static int sub__add_shared(struct mosquitto_db *db, struct mosquitto *context, int qos, uint32_t identifier, int options, struct mosquitto__subhier *subhier, struct sub__token *tokens, char *sharename)
+static int sub__add_shared(struct mosquitto_db *db, struct mosquitto *context, int qos, uint32_t identifier, int options, struct mosquitto__subhier *subhier, char *sharename)
 {
 	struct mosquitto__subleaf *newleaf;
 	struct mosquitto__subshared *shared = NULL;
 	struct mosquitto__subshared_ref **shared_subs;
 	struct mosquitto__subshared_ref *shared_ref;
 	int i;
-	int slen;
+	unsigned int slen;
 	int rc;
 
 	slen = strlen(sharename);
@@ -411,7 +411,7 @@ static int sub__add_shared(struct mosquitto_db *db, struct mosquitto *context, i
 }
 
 
-static int sub__add_normal(struct mosquitto_db *db, struct mosquitto *context, int qos, uint32_t identifier, int options, struct mosquitto__subhier *subhier, struct sub__token *tokens)
+static int sub__add_normal(struct mosquitto_db *db, struct mosquitto *context, int qos, uint32_t identifier, int options, struct mosquitto__subhier *subhier)
 {
 	struct mosquitto__subleaf *newleaf;
 	struct mosquitto__subhier **subs;
@@ -472,9 +472,9 @@ static int sub__add_context(struct mosquitto_db *db, struct mosquitto *context,
 	/* Add add our context */
 	if(context && context->id){
 		if(sharename){
-			return sub__add_shared(db, context, qos, identifier, options, subhier, tokens, sharename);
+			return sub__add_shared(db, context, qos, identifier, options, subhier, sharename);
 		}else{
-			return sub__add_normal(db, context, qos, identifier, options, subhier, tokens);
+			return sub__add_normal(db, context, qos, identifier, options, subhier);
 		}
 	}else{
 		return MOSQ_ERR_SUCCESS;