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

esp_http(s)_server: remove "Wno-format" cflag and fix formatting errors

Browse Source
This commit is contained in:
Mahavir Jain
2022-12-21 11:33:38 +05:30
parent bbc5914e63
commit 035c2e5799
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_http_server/CMakeLists.txt
View File

@@ -9,5 +9,3 @@ idf_component_register(SRCS "src/httpd_main.c"
PRIV_INCLUDE_DIRS "src/port/esp32" "src/util" PRIV_INCLUDE_DIRS "src/port/esp32" "src/util"
REQUIRES esp_event http_parser # for http_parser.h REQUIRES esp_event http_parser # for http_parser.h
PRIV_REQUIRES lwip mbedtls esp_timer) PRIV_REQUIRES lwip mbedtls esp_timer)
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

3
components/esp_http_server/src/httpd_parse.c
View File

@@ -10,6 +10,7 @@
#include <esp_log.h> #include <esp_log.h>
#include <esp_err.h> #include <esp_err.h>
#include <http_parser.h> #include <http_parser.h>
#include <inttypes.h>
#include <esp_http_server.h> #include <esp_http_server.h>
#include "esp_httpd_priv.h" #include "esp_httpd_priv.h"
@@ -364,7 +365,7 @@ static esp_err_t cb_headers_complete(http_parser *parser)
r->content_len = ((int)parser->content_length != -1 ? r->content_len = ((int)parser->content_length != -1 ?
parser->content_length : 0); parser->content_length : 0);
ESP_LOGD(TAG, LOG_FMT("bytes read = %d"), parser->nread); ESP_LOGD(TAG, LOG_FMT("bytes read = %" PRId32 ""), parser->nread);
ESP_LOGD(TAG, LOG_FMT("content length = %zu"), r->content_len); ESP_LOGD(TAG, LOG_FMT("content length = %zu"), r->content_len);
/* Handle upgrade requests - only WebSocket is supported for now */ /* Handle upgrade requests - only WebSocket is supported for now */

2
components/esp_https_ota/CMakeLists.txt
View File

@@ -2,5 +2,3 @@ idf_component_register(SRCS "src/esp_https_ota.c"
INCLUDE_DIRS "include" INCLUDE_DIRS "include"
REQUIRES esp_http_client bootloader_support esp_app_format esp_event REQUIRES esp_http_client bootloader_support esp_app_format esp_event
PRIV_REQUIRES log app_update) PRIV_REQUIRES log app_update)
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

3
components/esp_https_ota/src/esp_https_ota.c
View File

@@ -12,6 +12,7 @@
#include <esp_ota_ops.h> #include <esp_ota_ops.h>
#include <errno.h> #include <errno.h>
#include <sys/param.h> #include <sys/param.h>
#include <inttypes.h>
ESP_EVENT_DEFINE_BASE(ESP_HTTPS_OTA_EVENT); ESP_EVENT_DEFINE_BASE(ESP_HTTPS_OTA_EVENT);
@@ -342,7 +343,7 @@ esp_err_t esp_https_ota_begin(const esp_https_ota_config_t *ota_config, esp_http
err = ESP_FAIL; err = ESP_FAIL;
goto http_cleanup; goto http_cleanup;
} }
ESP_LOGI(TAG, "Writing to partition subtype %d at offset 0x%x", ESP_LOGI(TAG, "Writing to partition subtype %d at offset 0x%" PRIx32,
https_ota_handle->update_partition->subtype, https_ota_handle->update_partition->address); https_ota_handle->update_partition->subtype, https_ota_handle->update_partition->address);
const int alloc_size = MAX(ota_config->http_config->buffer_size, DEFAULT_OTA_BUF_SIZE); const int alloc_size = MAX(ota_config->http_config->buffer_size, DEFAULT_OTA_BUF_SIZE);