Skip to content

Commit f945dae

Browse files
committed
Merge branch 'contrib/github_pr_15247' into 'master'
refactor(components/fatfs): replace assert expression (GitHub PR) Closes IDFGH-14473 See merge request espressif/esp-idf!38194
2 parents 01ce024 + c399089 commit f945dae

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

components/fatfs/diskio/diskio_wl.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static DRESULT ff_wl_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)
3333
{
3434
ESP_LOGV(TAG, "ff_wl_read - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);
3535
wl_handle_t wl_handle = ff_wl_handles[pdrv];
36-
assert(wl_handle + 1);
36+
assert(wl_handle != WL_INVALID_HANDLE);
3737
esp_err_t err = wl_read(wl_handle, sector * wl_sector_size(wl_handle), buff, count * wl_sector_size(wl_handle));
3838
if (unlikely(err != ESP_OK)) {
3939
ESP_LOGE(TAG, "wl_read failed (0x%x)", err);
@@ -46,7 +46,7 @@ static DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT coun
4646
{
4747
ESP_LOGV(TAG, "ff_wl_write - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);
4848
wl_handle_t wl_handle = ff_wl_handles[pdrv];
49-
assert(wl_handle + 1);
49+
assert(wl_handle != WL_INVALID_HANDLE);
5050
esp_err_t err = wl_erase_range(wl_handle, sector * wl_sector_size(wl_handle), count * wl_sector_size(wl_handle));
5151
if (unlikely(err != ESP_OK)) {
5252
ESP_LOGE(TAG, "wl_erase_range failed (0x%x)", err);
@@ -64,7 +64,7 @@ static DRESULT ff_wl_ioctl (BYTE pdrv, BYTE cmd, void *buff)
6464
{
6565
wl_handle_t wl_handle = ff_wl_handles[pdrv];
6666
ESP_LOGV(TAG, "ff_wl_ioctl: cmd=%i", cmd);
67-
assert(wl_handle + 1);
67+
assert(wl_handle != WL_INVALID_HANDLE);
6868
switch (cmd) {
6969
case CTRL_SYNC:
7070
return RES_OK;

0 commit comments

Comments
 (0)