kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-28 07:51:19 +01:00
Code Releases Activity

pkg: paho-mqtt: use fixed sized integers

Browse Source 
This fix will let Paho build for architectures with less than 32 bit.
This commit is contained in:
Oleg Hahm 2022-12-01 11:34:57 +01:00
parent 945af26648
commit 0b46e1c0e2
3 changed files with 1241 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/paho-mqtt/patches/0002-MQTTPacket-removed-unused-function.patch Normal file
View File

@ -0,0 +1,31 @@
From 8b320ad01a06dced43ea6a7119f02cb79ca6054c Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg+eclipse@riot-os.org>
Date: Fri, 2 Dec 2022 19:12:09 +0100
Subject: [PATCH 2/4] MQTTPacket: removed unused function
---
MQTTPacket/src/MQTTPacket.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/MQTTPacket/src/MQTTPacket.c b/MQTTPacket/src/MQTTPacket.c
index 4f1f95a..0723b9a 100644
--- a/MQTTPacket/src/MQTTPacket.c
+++ b/MQTTPacket/src/MQTTPacket.c
@@ -183,14 +183,6 @@ void writeCString(unsigned char** pptr, const char* string)
*pptr += len;
}
-
-int getLenStringLen(char* ptr)
-{
- int len = 256*((unsigned char)(*ptr)) + (unsigned char)(*(ptr+1));
- return len;
-}
-
-
void writeMQTTString(unsigned char** pptr, MQTTString mqttstring)
{
if (mqttstring.lenstring.len > 0)
--
2.38.1

1139
pkg/paho-mqtt/patches/0003-MQTTPacket-use-int32_t-instead-of-int-where-necessar.patch Normal file
View File

File diff suppressed because it is too large Load Diff

71
pkg/paho-mqtt/patches/0004-MQTTPacket-fix-printf-formatters.patch Normal file
View File

@ -0,0 +1,71 @@
From c57b997f04b672a698941c7876bf4ac00c3ab5df Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg+eclipse@riot-os.org>
Date: Thu, 1 Dec 2022 22:08:58 +0100
Subject: [PATCH 4/4] MQTTPacket: fix printf formatters
---
MQTTPacket/src/MQTTFormat.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/MQTTPacket/src/MQTTFormat.c b/MQTTPacket/src/MQTTFormat.c
index 6fb8312..f0ff873 100644
--- a/MQTTPacket/src/MQTTFormat.c
+++ b/MQTTPacket/src/MQTTFormat.c
@@ -40,20 +40,20 @@ int MQTTStringFormat_connect(char* strbuf, int strbuflen, MQTTPacket_connectData
strindex = snprintf(strbuf, strbuflen,
"CONNECT MQTT version %d, client id %.*s, clean session %d, keep alive %d",
- (int)data->MQTTVersion, data->clientID.lenstring.len, data->clientID.lenstring.data,
+ (int)data->MQTTVersion, (int) data->clientID.lenstring.len, data->clientID.lenstring.data,
(int)data->cleansession, data->keepAliveInterval);
if (data->willFlag)
strindex += snprintf(&strbuf[strindex], strbuflen - strindex,
", will QoS %d, will retain %d, will topic %.*s, will message %.*s",
data->will.qos, data->will.retained,
- data->will.topicName.lenstring.len, data->will.topicName.lenstring.data,
- data->will.message.lenstring.len, data->will.message.lenstring.data);
+ (int) data->will.topicName.lenstring.len, data->will.topicName.lenstring.data,
+ (int) data->will.message.lenstring.len, data->will.message.lenstring.data);
if (data->username.lenstring.data && data->username.lenstring.len > 0)
strindex += snprintf(&strbuf[strindex], strbuflen - strindex,
- ", user name %.*s", data->username.lenstring.len, data->username.lenstring.data);
+ ", user name %.*s", (int) data->username.lenstring.len, data->username.lenstring.data);
if (data->password.lenstring.data && data->password.lenstring.len > 0)
strindex += snprintf(&strbuf[strindex], strbuflen - strindex,
- ", password %.*s", data->password.lenstring.len, data->password.lenstring.data);
+ ", password %.*s", (int) data->password.lenstring.len, data->password.lenstring.data);
return strindex;
}
@@ -71,8 +71,8 @@ int MQTTStringFormat_publish(char* strbuf, int strbuflen, unsigned char dup, int
int strindex = snprintf(strbuf, strbuflen,
"PUBLISH dup %d, QoS %d, retained %d, packet id %d, topic %.*s, payload length %d, payload %.*s",
dup, qos, retained, packetid,
- (topicName.lenstring.len < 20) ? topicName.lenstring.len : 20, topicName.lenstring.data,
- payloadlen, (payloadlen < 20) ? payloadlen : 20, payload);
+ (topicName.lenstring.len < 20) ? (int) topicName.lenstring.len : 20, topicName.lenstring.data,
+ (int) payloadlen, (payloadlen < 20) ? (int) payloadlen : 20, payload);
return strindex;
}
@@ -92,7 +92,7 @@ int MQTTStringFormat_subscribe(char* strbuf, int strbuflen, unsigned char dup, u
return snprintf(strbuf, strbuflen,
"SUBSCRIBE dup %d, packet id %d count %d topic %.*s qos %d",
dup, packetid, count,
- topicFilters[0].lenstring.len, topicFilters[0].lenstring.data,
+ (int) topicFilters[0].lenstring.len, topicFilters[0].lenstring.data,
requestedQoSs[0]);
}
@@ -110,7 +110,7 @@ int MQTTStringFormat_unsubscribe(char* strbuf, int strbuflen, unsigned char dup,
return snprintf(strbuf, strbuflen,
"UNSUBSCRIBE dup %d, packet id %d count %d topic %.*s",
dup, packetid, count,
- topicFilters[0].lenstring.len, topicFilters[0].lenstring.data);
+ (int) topicFilters[0].lenstring.len, topicFilters[0].lenstring.data);
}
--
2.38.1