Skip to content

Commit 1d842ed

Browse files
committed
fix(check): rename 'err' to avoid name conflicts
1 parent 00c7e62 commit 1d842ed

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/check/esp_utils_check.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@
103103
* @param ... Additional arguments for the format string
104104
*/
105105
#define ESP_UTILS_CHECK_ERROR_RETURN(x, ret, fmt, ...) do { \
106-
esp_err_t err = (x); \
107-
if (unlikely(err != ESP_OK)) { \
106+
if (unlikely((x) != ESP_OK)) { \
108107
return ret; \
109108
} \
110109
} while(0)
@@ -310,9 +309,9 @@
310309
* @param ... Additional arguments for the format string
311310
*/
312311
#define ESP_UTILS_CHECK_ERROR_RETURN(x, ret, fmt, ...) do { \
313-
esp_err_t err = (x); \
314-
if (unlikely(err != ESP_OK)) { \
315-
ESP_UTILS_LOGE(fmt " [%s]", ##__VA_ARGS__, esp_err_to_name(err)); \
312+
esp_err_t _err_ = (x); \
313+
if (unlikely(_err_ != ESP_OK)) { \
314+
ESP_UTILS_LOGE(fmt " [%s]", ##__VA_ARGS__, esp_err_to_name(_err_)); \
316315
return ret; \
317316
} \
318317
} while(0)
@@ -326,9 +325,9 @@
326325
* @param ... Additional arguments for the format string
327326
*/
328327
#define ESP_UTILS_CHECK_ERROR_GOTO(x, goto_tag, fmt, ...) do { \
329-
esp_err_t err = (x); \
330-
if (unlikely((err) != ESP_OK)) { \
331-
ESP_UTILS_LOGE(fmt " [%s]", ##__VA_ARGS__, esp_err_to_name(err)); \
328+
esp_err_t _err_ = (x); \
329+
if (unlikely(_err_ != ESP_OK)) { \
330+
ESP_UTILS_LOGE(fmt " [%s]", ##__VA_ARGS__, esp_err_to_name(_err_)); \
332331
goto goto_tag; \
333332
} \
334333
} while(0)
@@ -341,9 +340,9 @@
341340
* @param ... Additional arguments for the format string
342341
*/
343342
#define ESP_UTILS_CHECK_ERROR_EXIT(x, fmt, ...) do { \
344-
esp_err_t err = (x); \
345-
if (unlikely((err) != ESP_OK)) { \
346-
ESP_UTILS_LOGE(fmt " [%s]", ##__VA_ARGS__, esp_err_to_name(err)); \
343+
esp_err_t _err_ = (x); \
344+
if (unlikely(_err_ != ESP_OK)) { \
345+
ESP_UTILS_LOGE(fmt " [%s]", ##__VA_ARGS__, esp_err_to_name(_err_)); \
347346
return; \
348347
} \
349348
} while(0)

0 commit comments

Comments
 (0)