Skip to content

Commit a492935

Browse files
Removes leftover calls to event_handler
The possibility to add a callback as custom handler was removed from the client in favor of esp_event. These removes the older alternative that wasn't possible to use.
1 parent a89af4b commit a492935

File tree

3 files changed

+0
-14
lines changed

3 files changed

+0
-14
lines changed

include/mqtt_client.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ typedef struct esp_mqtt_event_t {
213213

214214
typedef esp_mqtt_event_t *esp_mqtt_event_handle_t;
215215

216-
typedef esp_err_t (*mqtt_event_callback_t)(esp_mqtt_event_handle_t event);
217216

218217
/**
219218
* *MQTT* client configuration structure

lib/include/mqtt_client_priv.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ typedef struct mqtt_state {
6161
} mqtt_state_t;
6262

6363
typedef struct {
64-
mqtt_event_callback_t event_handle;
6564
esp_event_loop_handle_t event_loop_handle;
6665
int task_stack;
6766
int task_prio;

mqtt_client.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -980,16 +980,12 @@ static esp_err_t esp_mqtt_dispatch_event(esp_mqtt_client_handle_t client)
980980
client->event.protocol_ver = client->connect_info.protocol_ver;
981981
esp_err_t ret = ESP_FAIL;
982982

983-
if (client->config->event_handle) {
984-
ret = client->config->event_handle(&client->event);
985-
} else {
986983
#ifdef MQTT_SUPPORTED_FEATURE_EVENT_LOOP
987984
esp_event_post_to(client->config->event_loop_handle, MQTT_EVENTS, client->event.event_id, &client->event, sizeof(client->event), portMAX_DELAY);
988985
ret = esp_event_loop_run(client->config->event_loop_handle, 0);
989986
#else
990987
return ESP_FAIL;
991988
#endif
992-
}
993989
if (client->connect_info.protocol_ver == MQTT_PROTOCOL_V_5) {
994990
#ifdef MQTT_PROTOCOL_5
995991
esp_mqtt5_client_delete_user_property(client->event.property->user_property);
@@ -2132,10 +2128,6 @@ esp_err_t esp_mqtt_client_register_event(esp_mqtt_client_handle_t client, esp_mq
21322128
return ESP_ERR_INVALID_ARG;
21332129
}
21342130
#ifdef MQTT_SUPPORTED_FEATURE_EVENT_LOOP
2135-
if (client->config->event_handle) {
2136-
ESP_LOGW(TAG, "Registering event loop while event callback is not null, clearing callback");
2137-
client->config->event_handle = NULL;
2138-
}
21392131

21402132
return esp_event_handler_register_with(client->config->event_loop_handle, MQTT_EVENTS, event, event_handler, event_handler_arg);
21412133
#else
@@ -2150,10 +2142,6 @@ esp_err_t esp_mqtt_client_unregister_event(esp_mqtt_client_handle_t client, esp_
21502142
return ESP_ERR_INVALID_ARG;
21512143
}
21522144
#ifdef MQTT_SUPPORTED_FEATURE_EVENT_LOOP
2153-
if (client->config->event_handle) {
2154-
ESP_LOGW(TAG, "Unregistering event loop while event callback is not null, clearing callback");
2155-
client->config->event_handle = NULL;
2156-
}
21572145

21582146
return esp_event_handler_unregister_with(client->config->event_loop_handle, MQTT_EVENTS, event, event_handler);
21592147
#else

0 commit comments

Comments
 (0)