espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-06 22:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

driver: Remove some stray __FILE__ macros

Browse Source 
Related to https://github.com/espressif/esp-idf/issues/6306
This commit is contained in:
Angus Gratton
2021-02-18 15:31:52 +11:00
parent 61b70c50a4
commit c68f869411
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/driver/esp32c3/adc.c
View File

@@ -36,7 +36,7 @@
#define ADC_CHECK_RET(fun_ret) ({ \ #define ADC_CHECK_RET(fun_ret) ({ \
if (fun_ret != ESP_OK) { \ if (fun_ret != ESP_OK) { \
ESP_LOGE(ADC_TAG,"%s:%d\n",__FUNCTION__,__LINE__); \ ESP_LOGE(ADC_TAG,"%s(%d)",__FUNCTION__,__LINE__); \
return ESP_FAIL; \ return ESP_FAIL; \
} \ } \
}) })
@@ -45,7 +45,7 @@ static const char *ADC_TAG = "ADC";
#define ADC_CHECK(a, str, ret_val) ({ \ #define ADC_CHECK(a, str, ret_val) ({ \
if (!(a)) { \ if (!(a)) { \
ESP_LOGE(ADC_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str); \ ESP_LOGE(ADC_TAG,"%s(%d) :%s", __FUNCTION__, __LINE__, str); \
return (ret_val); \ return (ret_val); \
} \ } \
}) })

2
components/driver/esp32c3/rtc_tempsensor.c
View File

@@ -33,7 +33,7 @@ static const char *TAG = "tsens";
#define TSENS_CHECK(res, ret_val) ({ \ #define TSENS_CHECK(res, ret_val) ({ \
if (!(res)) { \ if (!(res)) { \
ESP_LOGE(TAG, "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__); \ ESP_LOGE(TAG, "%s(%d)", __FUNCTION__, __LINE__); \
return (ret_val); \ return (ret_val); \
} \ } \
}) })

2
components/driver/esp32s2/dac.c
View File

@@ -29,7 +29,7 @@ static const char *DAC_TAG = "DAC";
#define DAC_CHECK(a, str, ret_val) ({ \ #define DAC_CHECK(a, str, ret_val) ({ \
if (!(a)) { \ if (!(a)) { \
ESP_LOGE(DAC_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str); \ ESP_LOGE(DAC_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \
return (ret_val); \ return (ret_val); \
} \ } \
}) })

2
components/touch_element/include/touch_element/touch_element_private.h
View File

@@ -29,7 +29,7 @@ extern "C" {
#define TE_CHECK(cond, ret_val) ({ \ #define TE_CHECK(cond, ret_val) ({ \
if (!(cond)) { \ if (!(cond)) { \
ESP_LOGE(TE_TAG, "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__); \ ESP_LOGE(TE_TAG, "%s(%d)", __FUNCTION__, __LINE__); \
return (ret_val); \ return (ret_val); \
} \ } \
}) })