From dd6b43541706f7c03bbd33676b39d2b3268e5dde Mon Sep 17 00:00:00 2001 From: Proddy Date: Tue, 12 Dec 2023 22:34:34 +0100 Subject: [PATCH] merge latest change from official repo --- lib/espMqttClient/src/MqttClient.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/espMqttClient/src/MqttClient.cpp b/lib/espMqttClient/src/MqttClient.cpp index 51d67426d..8b780cf3f 100644 --- a/lib/espMqttClient/src/MqttClient.cpp +++ b/lib/espMqttClient/src/MqttClient.cpp @@ -317,7 +317,8 @@ void MqttClient::_loop(MqttClient * c) { uint16_t MqttClient::_getNextPacketId() { ++_packetId; - if (_packetId == 0) ++_packetId; + if (_packetId == 0) + ++_packetId; return _packetId; } @@ -333,7 +334,7 @@ int MqttClient::_sendPacket() { EMC_SEMAPHORE_TAKE(); OutgoingPacket * packet = _outbox.getCurrent(); - size_t written = 0; + size_t written = 0; if (packet) { size_t wantToWrite = packet->packet.available(_bytesSent); if (wantToWrite == 0) { @@ -498,12 +499,12 @@ void MqttClient::_onConnack() { } void MqttClient::_onPublish() { - espMqttClientInternals::IncomingPacket p = _parser.getPacket(); - uint8_t qos = p.qos(); - bool retain = p.retain(); - bool dup = p.dup(); - uint16_t packetId = p.variableHeader.fixed.packetId; - bool callback = true; + const espMqttClientInternals::IncomingPacket & p = _parser.getPacket(); + uint8_t qos = p.qos(); + bool retain = p.retain(); + bool dup = p.dup(); + uint16_t packetId = p.variableHeader.fixed.packetId; + bool callback = true; if (qos == 1) { if (p.payload.index + p.payload.length == p.payload.total) { EMC_SEMAPHORE_TAKE();