From 42886b70f01dd8c1d9e524f943ce1df1d6edab58 Mon Sep 17 00:00:00 2001 From: tomoaki Date: Wed, 15 Aug 2018 06:41:10 +0900 Subject: [PATCH] Compile Errors #68 Signed-off-by: tomoaki --- MQTTSNGateway/src/MQTTGWPacket.h | 2 ++ MQTTSNGateway/src/MQTTSNGWClient.cpp | 2 +- MQTTSNGateway/src/MQTTSNGWConnectionHandler.h | 1 - MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp | 2 +- MQTTSNGateway/src/MQTTSNGWTopic.cpp | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MQTTSNGateway/src/MQTTGWPacket.h b/MQTTSNGateway/src/MQTTGWPacket.h index bc35d97..3a4829e 100644 --- a/MQTTSNGateway/src/MQTTGWPacket.h +++ b/MQTTSNGateway/src/MQTTGWPacket.h @@ -116,6 +116,7 @@ typedef struct unsigned char version; /**< MQTT version number */ } Connect; +#define MQTTPacket_Connect_Initializer {{0}, 0, nullptr, nullptr, nullptr, nullptr, 0, 0} #define MQTTPacket_willOptions_initializer { {'M', 'Q', 'T', 'W'}, 0, {NULL, {0, NULL}}, {NULL, {0, NULL}}, 0, 0 } #define MQTTPacket_connectData_initializer { {'M', 'Q', 'T', 'C'}, 0, 4, {NULL, {0, NULL}}, 60, 1, 0, \ MQTTPacket_willOptions_initializer, {NULL, {0, NULL}}, {NULL, {0, NULL}} } @@ -173,6 +174,7 @@ typedef struct int payloadlen; /**< payload length */ } Publish; +#define MQTTPacket_Publish_Initializer {{0}, nullptr, 0, 0, nullptr, 0} /** * Data for one of the ack packets. diff --git a/MQTTSNGateway/src/MQTTSNGWClient.cpp b/MQTTSNGateway/src/MQTTSNGWClient.cpp index f524d0b..11c5520 100644 --- a/MQTTSNGateway/src/MQTTSNGWClient.cpp +++ b/MQTTSNGateway/src/MQTTSNGWClient.cpp @@ -44,7 +44,7 @@ Client::Client(bool secure) _clientId = nullptr; _willTopic = nullptr; _willMsg = nullptr; - _connectData = {0, 0, 0, 0, 0, 0, 0}; + _connectData = MQTTPacket_Connect_Initializer; _network = new Network(secure); _secureNetwork = secure; _sensorNetype = true; diff --git a/MQTTSNGateway/src/MQTTSNGWConnectionHandler.h b/MQTTSNGateway/src/MQTTSNGWConnectionHandler.h index adf92d4..6af6113 100644 --- a/MQTTSNGateway/src/MQTTSNGWConnectionHandler.h +++ b/MQTTSNGateway/src/MQTTSNGWConnectionHandler.h @@ -39,7 +39,6 @@ public: private: void sendStoredPublish(Client* client); - char _pbuf[MQTTSNGW_MAX_PACKET_SIZE * 3]; Gateway* _gateway; }; diff --git a/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp b/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp index 53bbb43..dd01c50 100644 --- a/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp +++ b/MQTTSNGateway/src/MQTTSNGWPublishHandler.cpp @@ -44,7 +44,7 @@ MQTTGWPacket* MQTTSNPublishHandler::handlePublish(Client* client, MQTTSNPacket* uint8_t* payload; MQTTSN_topicid topicid; int payloadlen; - Publish pub = {0, 0, 0, 0, 0, 0}; + Publish pub = MQTTPacket_Publish_Initializer; char shortTopic[2]; diff --git a/MQTTSNGateway/src/MQTTSNGWTopic.cpp b/MQTTSNGateway/src/MQTTSNGWTopic.cpp index 7777a2c..5be2278 100644 --- a/MQTTSNGateway/src/MQTTSNGWTopic.cpp +++ b/MQTTSNGateway/src/MQTTSNGWTopic.cpp @@ -443,7 +443,7 @@ TopicIdMapElement* TopicIdMap::add(uint16_t msgId, uint16_t topicId, MQTTSN_topi { return 0; } - if ( getElement(msgId) > 0 ) + if ( getElement(msgId) ) { erase(msgId); }