From 828e7ae1300fcea520fd941af9627b097e4f90f5 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 2 Dec 2020 10:41:58 +0000
Subject: [PATCH] More conversion fixes.

---
 lib/send_connect.c     | 2 +-
 src/persist_write.c    | 4 ++--
 src/security_default.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/send_connect.c b/lib/send_connect.c
index 8e070a11..65a5b3ee 100644
--- a/lib/send_connect.c
+++ b/lib/send_connect.c
@@ -154,7 +154,7 @@ int send__connect(struct mosquitto *mosq, uint16_t keepalive, bool clean_session
 	}
 #endif
 	packet__write_byte(packet, version);
-	byte = (clean_session&0x1)<<1;
+	byte = (uint8_t)((clean_session&0x1)<<1);
 	if(will){
 		byte = byte | (uint8_t)(((mosq->will->msg.qos&0x3)<<3) | ((will&0x1)<<2));
 		if(mosq->retain_available){
diff --git a/src/persist_write.c b/src/persist_write.c
index 0f0e21c7..d07c30b5 100644
--- a/src/persist_write.c
+++ b/src/persist_write.c
@@ -66,8 +66,8 @@ static int persist__client_messages_save(FILE *db_fptr, struct mosquitto *contex
 		chunk.F.id_len = (uint16_t)strlen(context->id);
 		chunk.F.qos = cmsg->qos;
 		chunk.F.retain_dup = (uint8_t)((cmsg->retain&0x0F)<<4 | (cmsg->dup&0x0F));
-		chunk.F.direction = cmsg->direction;
-		chunk.F.state = cmsg->state;
+		chunk.F.direction = (uint8_t)cmsg->direction;
+		chunk.F.state = (uint8_t)cmsg->state;
 		chunk.client_id = context->id;
 		chunk.properties = cmsg->properties;
 
diff --git a/src/security_default.c b/src/security_default.c
index f228a16b..cc7e1f1b 100644
--- a/src/security_default.c
+++ b/src/security_default.c
@@ -840,7 +840,7 @@ static int unpwd__decode_passwords(struct mosquitto__unpwd **unpwd)
 	unsigned char *password;
 	unsigned int password_len;
 	int rc;
-	int hashtype;
+	enum mosquitto_pwhash_type hashtype;
 
 	HASH_ITER(hh, *unpwd, u, tmp){
 		/* Need to decode password into hashed data + salt. */