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

Merge branch 'destroy_config_refactor' into 'master'

Browse Source 
Makes esp_mqtt_destroy_config void

See merge request espressif/esp-mqtt!86
This commit is contained in:
David Čermák
2021-01-21 15:24:06 +08:00
parent 2530edbdce b834be80a5
commit 7a38867ce2
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mqtt_client.c
View File

@@ -120,7 +120,7 @@ const static int DISCONNECT_BIT = BIT2;
static esp_err_t esp_mqtt_dispatch_event(esp_mqtt_client_handle_t client); static esp_err_t esp_mqtt_dispatch_event(esp_mqtt_client_handle_t client);
static esp_err_t esp_mqtt_dispatch_event_with_msgid(esp_mqtt_client_handle_t client); static esp_err_t esp_mqtt_dispatch_event_with_msgid(esp_mqtt_client_handle_t client);
static esp_err_t esp_mqtt_destroy_config(esp_mqtt_client_handle_t client); static void esp_mqtt_destroy_config(esp_mqtt_client_handle_t client);
static esp_err_t esp_mqtt_connect(esp_mqtt_client_handle_t client, int timeout_ms); static esp_err_t esp_mqtt_connect(esp_mqtt_client_handle_t client, int timeout_ms);
static esp_err_t esp_mqtt_abort_connection(esp_mqtt_client_handle_t client); static esp_err_t esp_mqtt_abort_connection(esp_mqtt_client_handle_t client);
static esp_err_t esp_mqtt_client_ping(esp_mqtt_client_handle_t client); static esp_err_t esp_mqtt_client_ping(esp_mqtt_client_handle_t client);
@@ -535,21 +535,20 @@ _mqtt_set_config_failed:
return err; return err;
} }
static esp_err_t esp_mqtt_destroy_config(esp_mqtt_client_handle_t client) static void esp_mqtt_destroy_config(esp_mqtt_client_handle_t client)
{ {
mqtt_config_storage_t *cfg = client->config; if (client->config == NULL) {
if (cfg == NULL) { return;
return ESP_ERR_INVALID_STATE;
} }
free(cfg->host); free(client->config->host);
free(cfg->uri); free(client->config->uri);
free(cfg->path); free(client->config->path);
free(cfg->scheme); free(client->config->scheme);
for (int i = 0; i < cfg->num_alpn_protos; i++) { for (int i = 0; i < client->config->num_alpn_protos; i++) {
free(cfg->alpn_protos[i]); free(client->config->alpn_protos[i]);
} }
free(cfg->alpn_protos); free(client->config->alpn_protos);
free(cfg->clientkey_password); free(client->config->clientkey_password);
free(client->connect_info.will_topic); free(client->connect_info.will_topic);
free(client->connect_info.will_message); free(client->connect_info.will_message);
free(client->connect_info.client_id); free(client->connect_info.client_id);
@@ -561,10 +560,9 @@ static esp_err_t esp_mqtt_destroy_config(esp_mqtt_client_handle_t client)
esp_event_loop_delete(client->config->event_loop_handle); esp_event_loop_delete(client->config->event_loop_handle);
} }
#endif #endif
memset(cfg, 0, sizeof(mqtt_config_storage_t)); memset(client->config, 0, sizeof(mqtt_config_storage_t));
free(client->config); free(client->config);
client->config = NULL; client->config = NULL;
return ESP_OK;
} }
static esp_err_t esp_mqtt_connect(esp_mqtt_client_handle_t client, int timeout_ms) static esp_err_t esp_mqtt_connect(esp_mqtt_client_handle_t client, int timeout_ms)