MQTTPacket: use int32_t instead of int where necessary

Followup commit to 1f3e757.
eclipse-paho · Jan 15, 2025 · b217029 · b217029
1 parent f44e537
commit b217029
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/MQTTClient-C/src/MQTTClient.c b/MQTTClient-C/src/MQTTClient.c
@@ -296,7 +296,7 @@ int cycle(MQTTClient* c, Timer* timer)
             unsigned char intQoS;
             msg.payloadlen = 0; /* this is a size_t, but deserialize publish sets this as int */
             if (MQTTDeserialize_publish(&msg.dup, &intQoS, &msg.retained, &msg.id, &topicName,
-               (unsigned char**)&msg.payload, (int*)&msg.payloadlen, c->readbuf, c->readbuf_size) != 1)
+               (unsigned char**)&msg.payload, (int32_t*)&msg.payloadlen, c->readbuf, c->readbuf_size) != 1)
                 goto exit;
             msg.qos = (enum MQTTQoS)intQoS;
             deliverMessage(c, &topicName, &msg);

diff --git a/MQTTPacket/src/MQTTDeserializePublish.c b/MQTTPacket/src/MQTTDeserializePublish.c
@@ -56,7 +56,7 @@ int32_t MQTTDeserialize_publish(unsigned char* dup, unsigned char* qos, unsigned
 	unsigned char* curdata = buf;
 	unsigned char* enddata = NULL;
 	int32_t rc = 0;
-	int mylen = 0;
+	int32_t mylen = 0;
 
 	FUNC_ENTRY;
 	header.byte = readChar(&curdata);

diff --git a/MQTTPacket/src/MQTTPacket.c b/MQTTPacket/src/MQTTPacket.c
@@ -296,7 +296,7 @@ int MQTTPacket_read(unsigned char* buf, int32_t buflen, int (*getfn)(unsigned ch
 	int rc = -1;
 	MQTTHeader header = {0};
 	int32_t len = 0;
-	int rem_len = 0;
+	int32_t rem_len = 0;
 
 	/* 1. read the header byte.  This has the packet type in it */
 	if ((*getfn)(buf, 1) != 1)

diff --git a/MQTTPacket/src/MQTTSubscribeServer.c b/MQTTPacket/src/MQTTSubscribeServer.c
@@ -127,7 +127,7 @@ int32_t MQTTSerialize_suback(unsigned char* buf, int32_t buflen, unsigned short
 int32_t MQTTV5Serialize_suback(unsigned char* buf, int32_t buflen, unsigned short packetid,
 	  MQTTProperties* properties, int count, unsigned char* reasonCodes)
 #else
-int32_t MQTTSerialize_suback(unsigned char* buf, int buflen, unsigned short packetid, int count, unsigned char* grantedQoSs)
+int32_t MQTTSerialize_suback(unsigned char* buf, int32_t buflen, unsigned short packetid, int count, unsigned char* grantedQoSs)
 #endif
 {
 	MQTTHeader header = {0};