espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-07-30 18:58:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removes redundant field on mqtt state

Browse Source 
Client connection_info was unnecessarilly repeated. Removed from
mqtt_state and kept on mqtt_client.
This commit is contained in:
Euripedes Rocha
2021-10-27 14:40:49 -03:00
committed by David Cermak
parent 1fd50dd2cb
commit 09287a1156
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mqtt_client.c
View File

@ -43,7 +43,6 @@ ESP_EVENT_DEFINE_BASE(MQTT_EVENTS);
#endif #endif
typedef struct mqtt_state { typedef struct mqtt_state {
mqtt_connect_info_t *connect_info;
uint8_t *in_buffer; uint8_t *in_buffer;
uint8_t *out_buffer; uint8_t *out_buffer;
int in_buffer_length; int in_buffer_length;
@ -372,7 +371,7 @@ esp_err_t esp_mqtt_set_config(esp_mqtt_client_handle_t client, const esp_mqtt_cl
client->config->message_retransmit_timeout = config->message_retransmit_timeout; client->config->message_retransmit_timeout = config->message_retransmit_timeout;
if (config->message_retransmit_timeout <= 0) { if (config->message_retransmit_timeout <= 0) {
client->config->message_retransmit_timeout = 1000; client->config->message_retransmit_timeout = 1000;
} }
client->config->task_prio = config->task_prio; client->config->task_prio = config->task_prio;
@ -628,7 +627,7 @@ static esp_err_t esp_mqtt_connect(esp_mqtt_client_handle_t client, int timeout_m
int read_len, connect_rsp_code; int read_len, connect_rsp_code;
client->wait_for_ping_resp = false; client->wait_for_ping_resp = false;
client->mqtt_state.outbound_message = mqtt_msg_connect(&client->mqtt_state.mqtt_connection, client->mqtt_state.outbound_message = mqtt_msg_connect(&client->mqtt_state.mqtt_connection,
client->mqtt_state.connect_info); &client->connect_info);
if (client->mqtt_state.outbound_message->length == 0) { if (client->mqtt_state.outbound_message->length == 0) {
ESP_LOGE(TAG, "Connect message cannot be created"); ESP_LOGE(TAG, "Connect message cannot be created");
return ESP_FAIL; return ESP_FAIL;
@ -796,7 +795,6 @@ esp_mqtt_client_handle_t esp_mqtt_client_init(const esp_mqtt_client_config_t *co
ESP_MEM_CHECK(TAG, client->mqtt_state.out_buffer, goto _mqtt_init_failed); ESP_MEM_CHECK(TAG, client->mqtt_state.out_buffer, goto _mqtt_init_failed);
client->mqtt_state.out_buffer_length = out_buffer_size; client->mqtt_state.out_buffer_length = out_buffer_size;
client->mqtt_state.connect_info = &client->connect_info;
client->outbox = outbox_init(); client->outbox = outbox_init();
ESP_MEM_CHECK(TAG, client->outbox, goto _mqtt_init_failed); ESP_MEM_CHECK(TAG, client->outbox, goto _mqtt_init_failed);
client->status_bits = xEventGroupCreate(); client->status_bits = xEventGroupCreate();