alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-30 19:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't ignore return value of httpd_stop

Browse Source
This commit is contained in:
Nathan Phillips
2022-04-22 11:19:27 +01:00
committed by BOT
parent 523c51818c
commit e8e63a06e8
10 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/protocols/http_server/persistent_sockets/main/main.c
View File

@@ -182,10 +182,10 @@ static httpd_handle_t start_webserver(void)
return NULL;
}
static void stop_webserver(httpd_handle_t server)
static esp_err_t stop_webserver(httpd_handle_t server)
{
// Stop the httpd server
httpd_stop(server);
return httpd_stop(server);
}
@@ -195,8 +195,8 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base,
httpd_handle_t* server = (httpd_handle_t*) arg;
if (*server) {
ESP_LOGI(TAG, "Stopping webserver");
stop_webserver(*server);
*server = NULL;
if (stop_webserver(*server) == ESP_OK)
*server = NULL;
}
}

8
examples/protocols/http_server/simple/main/main.c
View File

@@ -362,10 +362,10 @@ static httpd_handle_t start_webserver(void)
return NULL;
}
static void stop_webserver(httpd_handle_t server)
static esp_err_t stop_webserver(httpd_handle_t server)
{
// Stop the httpd server
httpd_stop(server);
return httpd_stop(server);
}
static void disconnect_handler(void* arg, esp_event_base_t event_base,
@@ -374,8 +374,8 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base,
httpd_handle_t* server = (httpd_handle_t*) arg;
if (*server) {
ESP_LOGI(TAG, "Stopping webserver");
stop_webserver(*server);
*server = NULL;
if (stop_webserver(*server) == ESP_OK)
*server = NULL;
}
}

8
examples/protocols/http_server/ws_echo_server/main/ws_echo_server.c
View File

@@ -140,10 +140,10 @@ static httpd_handle_t start_webserver(void)
return NULL;
}
static void stop_webserver(httpd_handle_t server)
static esp_err_t stop_webserver(httpd_handle_t server)
{
// Stop the httpd server
httpd_stop(server);
return httpd_stop(server);
}
static void disconnect_handler(void* arg, esp_event_base_t event_base,
@@ -152,8 +152,8 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base,
httpd_handle_t* server = (httpd_handle_t*) arg;
if (*server) {
ESP_LOGI(TAG, "Stopping webserver");
stop_webserver(*server);
*server = NULL;
if (stop_webserver(*server) == ESP_OK)
*server = NULL;
}
}

8
examples/protocols/https_server/simple/main/main.c
View File

@@ -139,10 +139,10 @@ static httpd_handle_t start_webserver(void)
return server;
}
static void stop_webserver(httpd_handle_t server)
static esp_err_t stop_webserver(httpd_handle_t server)
{
// Stop the httpd server
httpd_ssl_stop(server);
return httpd_ssl_stop(server);
}
static void disconnect_handler(void* arg, esp_event_base_t event_base,
@@ -150,8 +150,8 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base,
{
httpd_handle_t* server = (httpd_handle_t*) arg;
if (*server) {
stop_webserver(*server);
*server = NULL;
if (stop_webserver(*server) == ESP_OK)
*server = NULL;
}
}

8
examples/protocols/https_server/wss_server/main/wss_server_example.c
View File

@@ -206,12 +206,12 @@ static httpd_handle_t start_wss_echo_server(void)
return server;
}
static void stop_wss_echo_server(httpd_handle_t server)
static esp_err_t stop_wss_echo_server(httpd_handle_t server)
{
// Stop keep alive thread
wss_keep_alive_stop(httpd_get_global_user_ctx(server));
// Stop the httpd server
httpd_ssl_stop(server);
return httpd_ssl_stop(server);
}
static void disconnect_handler(void* arg, esp_event_base_t event_base,
@@ -219,8 +219,8 @@ static void disconnect_handler(void* arg, esp_event_base_t event_base,
{
httpd_handle_t* server = (httpd_handle_t*) arg;
if (*server) {
stop_wss_echo_server(*server);
*server = NULL;
if (stop_wss_echo_server(*server) == ESP_OK)
*server = NULL;
}
}