From 3d95ace7fec8b374da6de59d26b104f83833f250 Mon Sep 17 00:00:00 2001 From: David Lin Date: Fri, 6 Mar 2020 09:01:07 +0800 Subject: [PATCH 1/3] Minor optimization to improve readability of code mqtt_msg_handler_destory -> mqtt_msg_handler_destroy --- .../connectivity/mqttclient/mqttclient/mqttclient.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/connectivity/mqttclient/mqttclient/mqttclient.c b/components/connectivity/mqttclient/mqttclient/mqttclient.c index 0d71a275..16d8a550 100644 --- a/components/connectivity/mqttclient/mqttclient/mqttclient.c +++ b/components/connectivity/mqttclient/mqttclient/mqttclient.c @@ -401,7 +401,7 @@ static message_handlers_t *mqtt_msg_handler_create(const char* topic_filter, mqt return msg_handler; } -static void mqtt_msg_handler_destory(message_handlers_t *msg_handler) +static void mqtt_msg_handler_destroy(message_handlers_t *msg_handler) { if (NULL != &msg_handler->list) { list_del(&msg_handler->list); @@ -435,7 +435,7 @@ static int mqtt_msg_handler_is_exist(mqtt_client_t* c, message_handlers_t *handl static int mqtt_msg_handlers_install(mqtt_client_t* c, message_handlers_t *handler) { if (mqtt_msg_handler_is_exist(c, handler)) { - mqtt_msg_handler_destory(handler); + mqtt_msg_handler_destroy(handler); RETURN_ERROR(MQTT_SUCCESS_ERROR); } @@ -620,7 +620,7 @@ static int mqtt_suback_packet_handle(mqtt_client_t *c, platform_timer_t *timer) RETURN_ERROR(MQTT_MEM_NOT_ENOUGH_ERROR); if (is_nack) { - mqtt_msg_handler_destory(msg_handler); + mqtt_msg_handler_destroy(msg_handler); RETURN_ERROR(MQTT_SUBSCRIBE_NOT_ACK_ERROR); } @@ -643,7 +643,7 @@ static int mqtt_unsuback_packet_handle(mqtt_client_t *c, platform_timer_t *timer if (!msg_handler) RETURN_ERROR(MQTT_MEM_NOT_ENOUGH_ERROR); - mqtt_msg_handler_destory(msg_handler); + mqtt_msg_handler_destroy(msg_handler); RETURN_ERROR(rc); } From 2c9f8b2ff8bc661a7f1d4320068ebff23a497a4a Mon Sep 17 00:00:00 2001 From: David Lin Date: Fri, 6 Mar 2020 09:05:03 +0800 Subject: [PATCH 2/3] Update README.md --- components/connectivity/mqttclient/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/connectivity/mqttclient/README.md b/components/connectivity/mqttclient/README.md index c98af004..823b3588 100644 --- a/components/connectivity/mqttclient/README.md +++ b/components/connectivity/mqttclient/README.md @@ -311,7 +311,7 @@ mqtt_ack_list_unrecord(c, UNSUBACK, packet_id, &msg_handler) ``` 3. 销毁对应的订阅消息处理函数 ```c -mqtt_msg_handler_destory(msg_handler); +mqtt_msg_handler_destroy(msg_handler); ``` ## 来自服务器的`发布`报文的处理 ```c From 738b11f44bce73139259036ad2bf38a7ed298822 Mon Sep 17 00:00:00 2001 From: David Lin Date: Fri, 6 Mar 2020 10:29:46 +0800 Subject: [PATCH 3/3] Update README.md --- components/connectivity/mqttclient/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/connectivity/mqttclient/README.md b/components/connectivity/mqttclient/README.md index 823b3588..d97c3a60 100644 --- a/components/connectivity/mqttclient/README.md +++ b/components/connectivity/mqttclient/README.md @@ -4,7 +4,7 @@ ## 整体框架 ![整体框架](./png/mqttclient.png) -> 备注：目前只支持linux及encentOS tiny系统 +> 备注：目前只支持linux及TencentOS tiny系统 ## linux平台下测试使用 ### 安装cmake：