feedc0de/esp-mqtt
1
0
Fork 0
forked from espressif/esp-mqtt
Code Pull Requests Activity

Merge branch 'remove_outbox_cleanup_function' into 'master'

Browse Source 
Removes unnecessary outbox_cleanup

See merge request espressif/esp-mqtt!108
This commit is contained in:
David Čermák
2021-07-09 16:13:48 +00:00
parent c11c314f44 ebef896b00
commit 026ea95338
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/include/mqtt_outbox.h
View File

@ -56,7 +56,6 @@ int outbox_delete_single_expired(outbox_handle_t outbox, outbox_tick_t current_t
esp_err_t outbox_set_pending(outbox_handle_t outbox, int msg_id, pending_state_t pending); esp_err_t outbox_set_pending(outbox_handle_t outbox, int msg_id, pending_state_t pending);
esp_err_t outbox_set_tick(outbox_handle_t outbox, int msg_id, outbox_tick_t tick); esp_err_t outbox_set_tick(outbox_handle_t outbox, int msg_id, outbox_tick_t tick);
int outbox_get_size(outbox_handle_t outbox); int outbox_get_size(outbox_handle_t outbox);
esp_err_t outbox_cleanup(outbox_handle_t outbox, int max_size);
void outbox_destroy(outbox_handle_t outbox); void outbox_destroy(outbox_handle_t outbox);
void outbox_delete_all_items(outbox_handle_t outbox); void outbox_delete_all_items(outbox_handle_t outbox);

14
lib/mqtt_outbox.c
View File

@ -210,20 +210,6 @@ int outbox_get_size(outbox_handle_t outbox)
return siz; return siz;
} }
esp_err_t outbox_cleanup(outbox_handle_t outbox, int max_size)
{
while (outbox_get_size(outbox) > max_size) {
outbox_item_handle_t item = outbox_dequeue(outbox, CONFIRMED, NULL);
if (item == NULL) {
return ESP_FAIL;
}
STAILQ_REMOVE(outbox, item, outbox_item, next);
free(item->buffer);
free(item);
}
return ESP_OK;
}
void outbox_delete_all_items(outbox_handle_t outbox) void outbox_delete_all_items(outbox_handle_t outbox)
{ {
outbox_item_handle_t item, tmp; outbox_item_handle_t item, tmp;

1
mqtt_client.c
View File

@ -1454,7 +1454,6 @@ static void esp_mqtt_task(void *pv)
client->state = MQTT_STATE_INIT; client->state = MQTT_STATE_INIT;
} }
outbox_cleanup(client->outbox, OUTBOX_MAX_SIZE);
break; break;
case MQTT_STATE_WAIT_RECONNECT: case MQTT_STATE_WAIT_RECONNECT: