From 9bb92507ace1f346ea61437bd6f57f555dd56f94 Mon Sep 17 00:00:00 2001 From: "hrushikesh.bhosale" Date: Mon, 8 Dec 2025 13:50:56 +0530 Subject: [PATCH] fix(http_server): Removed the build failure due to unused variables There were build failure due the unused variable last_error when ESP_HTTPS_SERVER_EVENTS and HTTPD_ENABLE_EVENTS are disabled --- components/esp_http_server/include/esp_http_server.h | 8 ++++---- components/esp_http_server/src/esp_httpd_priv.h | 10 +++++++--- components/esp_http_server/src/httpd_txrx.c | 10 ++-------- components/esp_https_server/include/esp_https_server.h | 2 +- components/esp_https_server/src/https_server.c | 8 +++++++- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/components/esp_http_server/include/esp_http_server.h b/components/esp_http_server/include/esp_http_server.h index 920c2a95c2f..0e05ae4b21a 100644 --- a/components/esp_http_server/include/esp_http_server.h +++ b/components/esp_http_server/include/esp_http_server.h @@ -23,6 +23,10 @@ extern "C" { #define ESP_HTTPD_DEF_CTRL_PORT (32768) /*!< HTTP Server control socket port*/ +#if CONFIG_HTTPD_ENABLE_EVENTS || __DOXYGEN_ +ESP_EVENT_DECLARE_BASE(ESP_HTTP_SERVER_EVENT); +#endif // CONFIG_HTTPD_ENABLE_EVENTS || __DOXYGEN_ + /** * @brief HTTP Server events id */ @@ -38,15 +42,11 @@ typedef enum { HTTP_SERVER_EVENT_STOP, /*!< This event occurs when HTTP Server is stopped */ } esp_http_server_event_id_t; -#if CONFIG_HTTPD_ENABLE_EVENTS || __DOXYGEN_ -ESP_EVENT_DECLARE_BASE(ESP_HTTP_SERVER_EVENT); - /** Argument structure for HTTP_SERVER_EVENT_ON_DATA and HTTP_SERVER_EVENT_SENT_DATA event */ typedef struct { int fd; /*!< Session socket file descriptor */ int data_len; /*!< Data length */ } esp_http_server_event_data; -#endif // CONFIG_HTTPD_ENABLE_EVENTS || __DOXYGEN_ /* note: esp_https_server.h includes a customized copy of this diff --git a/components/esp_http_server/src/esp_httpd_priv.h b/components/esp_http_server/src/esp_httpd_priv.h index 0d6b2220a98..dc3dd85c636 100644 --- a/components/esp_http_server/src/esp_httpd_priv.h +++ b/components/esp_http_server/src/esp_httpd_priv.h @@ -607,13 +607,17 @@ esp_err_t httpd_sess_close_lru_direct(struct httpd_data *hd); void esp_http_server_dispatch_event(int32_t event_id, const void* event_data, size_t event_data_size); #else // CONFIG_HTTPD_ENABLE_EVENTS -#define esp_http_server_dispatch_event(event_id, event_data, event_data_size) do {} while(0) +static inline void esp_http_server_dispatch_event(int32_t event_id, const void* event_data, size_t event_data_size) +{ + // Events disabled, do nothing + (void) event_id; + (void) event_data; + (void) event_data_size; +} #endif // CONFIG_HTTPD_ENABLE_EVENTS - esp_err_t httpd_crypto_sha1(const uint8_t *data, size_t data_len, uint8_t *hash); - #ifdef __cplusplus } #endif diff --git a/components/esp_http_server/src/httpd_txrx.c b/components/esp_http_server/src/httpd_txrx.c index db833027841..b4dd58d53a7 100644 --- a/components/esp_http_server/src/httpd_txrx.c +++ b/components/esp_http_server/src/httpd_txrx.c @@ -330,14 +330,12 @@ esp_err_t httpd_resp_send(httpd_req_t *r, const char *buf, ssize_t buf_len) return ESP_ERR_HTTPD_RESP_SEND; } } - hd->http_server_state = HTTP_SERVER_EVENT_SENT_DATA; -#ifdef CONFIG_HTTPD_ENABLE_EVENTS esp_http_server_event_data evt_data = { .fd = ra->sd->fd, .data_len = buf_len, }; + hd->http_server_state = HTTP_SERVER_EVENT_SENT_DATA; esp_http_server_dispatch_event(HTTP_SERVER_EVENT_SENT_DATA, &evt_data, sizeof(esp_http_server_event_data)); -#endif // CONFIG_HTTPD_ENABLE_EVENTS return ESP_OK; } @@ -432,14 +430,12 @@ esp_err_t httpd_resp_send_chunk(httpd_req_t *r, const char *buf, ssize_t buf_len if (httpd_send_all(r, "\r\n", strlen("\r\n")) != ESP_OK) { return ESP_ERR_HTTPD_RESP_SEND; } - hd->http_server_state = HTTP_SERVER_EVENT_SENT_DATA; -#ifdef CONFIG_HTTPD_ENABLE_EVENTS esp_http_server_event_data evt_data = { .fd = ra->sd->fd, .data_len = buf_len, }; + hd->http_server_state = HTTP_SERVER_EVENT_SENT_DATA; esp_http_server_dispatch_event(HTTP_SERVER_EVENT_SENT_DATA, &evt_data, sizeof(esp_http_server_event_data)); -#endif // CONFIG_HTTPD_ENABLE_EVENTS return ESP_OK; } @@ -650,13 +646,11 @@ int httpd_req_recv(httpd_req_t *r, char *buf, size_t buf_len) ESP_LOGD(TAG, LOG_FMT("received length = %d"), ret); struct httpd_data *hd = (struct httpd_data *) r->handle; hd->http_server_state = HTTP_SERVER_EVENT_ON_DATA; -#ifdef CONFIG_HTTPD_ENABLE_EVENTS esp_http_server_event_data evt_data = { .fd = ra->sd->fd, .data_len = ret, }; esp_http_server_dispatch_event(HTTP_SERVER_EVENT_ON_DATA, &evt_data, sizeof(esp_http_server_event_data)); -#endif // CONFIG_HTTPD_ENABLE_EVENTS return ret; } diff --git a/components/esp_https_server/include/esp_https_server.h b/components/esp_https_server/include/esp_https_server.h index fe8f4f3d6ec..99ff8a95389 100644 --- a/components/esp_https_server/include/esp_https_server.h +++ b/components/esp_https_server/include/esp_https_server.h @@ -20,6 +20,7 @@ extern "C" { #if CONFIG_ESP_HTTPS_SERVER_EVENTS || __DOXYGEN__ ESP_EVENT_DECLARE_BASE(ESP_HTTPS_SERVER_EVENT); +#endif // CONFIG_ESP_HTTPS_SERVER_EVENTS || __DOXYGEN__ typedef enum { HTTPS_SERVER_EVENT_ERROR = 0, /*!< This event occurs when there are any errors during execution */ @@ -30,7 +31,6 @@ typedef enum { HTTPS_SERVER_EVENT_DISCONNECTED, /*!< The connection has been disconnected */ HTTPS_SERVER_EVENT_STOP, /*!< This event occurs when HTTPS Server is stopped */ } esp_https_server_event_id_t; -#endif // CONFIG_ESP_HTTPS_SERVER_EVENTS || __DOXYGEN__ typedef enum { HTTPD_SSL_TRANSPORT_SECURE, // SSL Enabled diff --git a/components/esp_https_server/src/https_server.c b/components/esp_https_server/src/https_server.c index 543cd1e10ec..865560777d8 100644 --- a/components/esp_https_server/src/https_server.c +++ b/components/esp_https_server/src/https_server.c @@ -40,7 +40,13 @@ static void http_dispatch_event_to_event_loop(int32_t event_id, const void* even } } #else // CONFIG_ESP_HTTPS_SERVER_EVENTS -#define http_dispatch_event_to_event_loop(event_id, event_data, event_data_size) do {} while (0) +static void http_dispatch_event_to_event_loop(int32_t event_id, const void* event_data, size_t event_data_size) +{ + // Events disabled, do nothing + (void) event_id; + (void) event_data; + (void) event_data_size; +} #endif // CONFIG_ESP_HTTPS_SERVER_EVENTS /**