Просмотр исходного кода

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

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

See merge request espressif/esp-idf!14426
David Čermák 4 лет назад
Родитель
Сommit
51f1bc3ced

+ 4 - 0
CMakeLists.txt

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

+ 1 - 1
components/esp_http_client/test/test_http_client.c

@@ -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
     // which we still reference in the local variable `value` (better forget it)
     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
     r = esp_http_client_get_username(client, &value);
     TEST_ASSERT_EQUAL(ESP_OK, r);

+ 1 - 1
components/esp_hw_support/port/esp32s3/rtc_init.c

@@ -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_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)
 {

+ 1 - 1
components/esp_system/port/arch/xtensa/panic_arch.c

@@ -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();
     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 ) {
         operation_type = (mem_type == MEMPROT_IRAM0_SRAM && op_subtype == 0) ? "Instruction fetch" : "Read";
     }

+ 1 - 1
components/wpa_supplicant/CMakeLists.txt

@@ -157,7 +157,7 @@ idf_component_register(SRCS "${srcs}" "${tls_src}" "${roaming_src}" "${crypto_sr
                     PRIV_INCLUDE_DIRS src src/utils
                     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
     __ets__
     ESP_SUPPLICANT