Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

esp32: Remove trialing semicolon from function-like macros

Browse source 
This commit removes trailing semicolons following a while(0) from
function-like macros in IDF. This will force those macros to be called
with a semicolon when called.
This commit is contained in:
Darian Leung 2019-02-28 21:58:47 +08:00
parent d82c80a07b
commit 59d1ecc78b
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/esp32/include/esp_err.h
View file

@ -104,14 +104,14 @@ void _esp_error_check_failed_without_abort(esp_err_t rc, const char *file, int l
#define ESP_ERROR_CHECK(x) do { \ #define ESP_ERROR_CHECK(x) do { \
esp_err_t __err_rc = (x); \ esp_err_t __err_rc = (x); \
(void) sizeof(__err_rc); \ (void) sizeof(__err_rc); \
} while(0); } while(0)
#elif defined(CONFIG_OPTIMIZATION_ASSERTIONS_SILENT) #elif defined(CONFIG_OPTIMIZATION_ASSERTIONS_SILENT)
#define ESP_ERROR_CHECK(x) do { \ #define ESP_ERROR_CHECK(x) do { \
esp_err_t __err_rc = (x); \ esp_err_t __err_rc = (x); \
if (__err_rc != ESP_OK) { \ if (__err_rc != ESP_OK) { \
abort(); \ abort(); \
} \ } \
} while(0); } while(0)
#else #else
#define ESP_ERROR_CHECK(x) do { \ #define ESP_ERROR_CHECK(x) do { \
esp_err_t __err_rc = (x); \ esp_err_t __err_rc = (x); \
@ -119,7 +119,7 @@ void _esp_error_check_failed_without_abort(esp_err_t rc, const char *file, int l
_esp_error_check_failed(__err_rc, __FILE__, __LINE__, \ _esp_error_check_failed(__err_rc, __FILE__, __LINE__, \
__ASSERT_FUNC, #x); \ __ASSERT_FUNC, #x); \
} \ } \
} while(0); } while(0)
#endif #endif
/** /**

2
components/esp32/include/rom/ets_sys.h
View file

@ -268,7 +268,7 @@ void ets_install_uart_printf(void);
ets_printf("%s %u \n", __FILE__, __LINE__); \ ets_printf("%s %u \n", __FILE__, __LINE__); \
while (1) {}; \ while (1) {}; \
} \ } \
} while (0); } while (0)
/** /**
* @} * @}

4
components/esp32/pm_trace.h
View file

@ -39,7 +39,7 @@ void esp_pm_trace_exit(esp_pm_trace_event_t event, int core_id);
#else // CONFIG_PM_TRACE #else // CONFIG_PM_TRACE
#define ESP_PM_TRACE_ENTER(type, core_id) do { (void) core_id; } while(0); #define ESP_PM_TRACE_ENTER(type, core_id) do { (void) core_id; } while(0)
#define ESP_PM_TRACE_EXIT(type, core_id) do { (void) core_id; } while(0); #define ESP_PM_TRACE_EXIT(type, core_id) do { (void) core_id; } while(0)
#endif // CONFIG_PM_TRACE #endif // CONFIG_PM_TRACE

2
components/heap/heap_trace.c
View file

@ -282,7 +282,7 @@ inline static uint32_t get_ccount(void)
if (!esp_ptr_executable(callers[N])) { \ if (!esp_ptr_executable(callers[N])) { \
return; \ return; \
} \ } \
} while(0); } while(0)
/* Static function to read the call stack for a traced heap call. /* Static function to read the call stack for a traced heap call.