espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_compiler_warn_write_string_v4.3' into 'release/v4.3'

Browse Source 
Build: Fix CMake to pass -Wwrite-string compiler flag if enabled (v4.3)

See merge request espressif/esp-idf!14426
This commit is contained in:
David Čermák
2021-09-09 09:49:33 +00:00
parent 4c400e9311 7f8d47203e
commit 51f1bc3ced
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -74,6 +74,10 @@ if(CONFIG_COMPILER_DISABLE_GCC8_WARNINGS)
"-Wno-int-in-bool-context") "-Wno-int-in-bool-context")
endif() endif()
if(CONFIG_COMPILER_WARN_WRITE_STRINGS)
list(APPEND compile_options "-Wwrite-strings")
endif()
if(CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE) if(CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
list(APPEND compile_definitions "-DNDEBUG") list(APPEND compile_definitions "-DNDEBUG")
endif() endif()

2
components/esp_http_client/test/test_http_client.c
View File

@@ -127,7 +127,7 @@ TEST_CASE("Username and password will not reset if new absolute URL doesnot spec
// esp_http_client_set_username sets new username and thus invalidates the original one // esp_http_client_set_username sets new username and thus invalidates the original one
// which we still reference in the local variable `value` (better forget it) // which we still reference in the local variable `value` (better forget it)
value = NULL; value = NULL;
esp_http_client_set_password(client, USERNAME); esp_http_client_set_password(client, (char *)USERNAME); // Need to cast the string literal (argument is not a const char*)
//checks if username is set or not //checks if username is set or not
r = esp_http_client_get_username(client, &value); r = esp_http_client_get_username(client, &value);
TEST_ASSERT_EQUAL(ESP_OK, r); TEST_ASSERT_EQUAL(ESP_OK, r);

2
components/esp_hw_support/port/esp32s3/rtc_init.c
View File

@@ -27,7 +27,7 @@
#define RTC_CNTL_MEM_FORCE_PU (RTC_CNTL_SLOWMEM_FORCE_PU | RTC_CNTL_FASTMEM_FORCE_PU) #define RTC_CNTL_MEM_FORCE_PU (RTC_CNTL_SLOWMEM_FORCE_PU | RTC_CNTL_FASTMEM_FORCE_PU)
#define RTC_CNTL_MEM_FORCE_NOISO (RTC_CNTL_SLOWMEM_FORCE_NOISO | RTC_CNTL_FASTMEM_FORCE_NOISO) #define RTC_CNTL_MEM_FORCE_NOISO (RTC_CNTL_SLOWMEM_FORCE_NOISO | RTC_CNTL_FASTMEM_FORCE_NOISO)
static char *TAG = "rtcinit"; static const char *TAG = "rtcinit";
void rtc_init(rtc_config_t cfg) void rtc_init(rtc_config_t cfg)
{ {

2
components/esp_system/port/arch/xtensa/panic_arch.c
View File

@@ -273,7 +273,7 @@ static inline void print_memprot_err_details(const void *f)
mem_type_prot_t mem_type = esp_memprot_get_active_intr_memtype(); mem_type_prot_t mem_type = esp_memprot_get_active_intr_memtype();
esp_memprot_get_fault_status( mem_type, &fault_addr, &op_type, &op_subtype ); esp_memprot_get_fault_status( mem_type, &fault_addr, &op_type, &op_subtype );
char *operation_type = "Write"; const char *operation_type = "Write";
if ( op_type == 0 ) { if ( op_type == 0 ) {
operation_type = (mem_type == MEMPROT_IRAM0_SRAM && op_subtype == 0) ? "Instruction fetch" : "Read"; operation_type = (mem_type == MEMPROT_IRAM0_SRAM && op_subtype == 0) ? "Instruction fetch" : "Read";
} }

2
components/wpa_supplicant/CMakeLists.txt
View File

@@ -157,7 +157,7 @@ idf_component_register(SRCS "${srcs}" "${tls_src}" "${roaming_src}" "${crypto_sr
PRIV_INCLUDE_DIRS src src/utils PRIV_INCLUDE_DIRS src src/utils
PRIV_REQUIRES mbedtls esp_timer) PRIV_REQUIRES mbedtls esp_timer)
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-strict-aliasing) target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-strict-aliasing -Wno-write-strings)
target_compile_definitions(${COMPONENT_LIB} PRIVATE target_compile_definitions(${COMPONENT_LIB} PRIVATE
__ets__ __ets__
ESP_SUPPLICANT ESP_SUPPLICANT