Merge branch 'bugfix/macros_trailing_semicolon' into 'master'

Remove trialing semicolon from function-like macros

See merge request idf/esp-idf!4397

components/esp32/include/esp_err.h

@@ -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 {                                         \
         esp_err_t __err_rc = (x);                                       \
         (void) sizeof(__err_rc);                                        \
-    } while(0);
+    } while(0)
 #elif defined(CONFIG_OPTIMIZATION_ASSERTIONS_SILENT)
 #define ESP_ERROR_CHECK(x) do {                                         \
         esp_err_t __err_rc = (x);                                       \
         if (__err_rc != ESP_OK) {                                       \
             abort();                                                    \
         }                                                               \
-    } while(0);
+    } while(0)
 #else
 #define ESP_ERROR_CHECK(x) do {                                         \
         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__,       \
                                     __ASSERT_FUNC, #x);                 \
         }                                                               \
-    } while(0);
+    } while(0)
 #endif
 
 /**

components/esp32/include/rom/ets_sys.h

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

components/esp32/pm_trace.h

@@ -39,7 +39,7 @@ void esp_pm_trace_exit(esp_pm_trace_event_t event, int core_id);
 
 #else // CONFIG_PM_TRACE
 
-#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_ENTER(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

components/heap/heap_trace.c

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