github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lv_fs: fix duplicated error cheching

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-04-09 12:33:33 +02:00
parent a4b697f41e
commit 94bf21b9be
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lv_misc/lv_fs.c
View File

@@ -163,7 +163,7 @@ lv_fs_res_t lv_fs_remove (const char * path)
lv_fs_res_t lv_fs_read (lv_fs_file_t * file_p, void * buf, uint32_t btr, uint32_t * br) lv_fs_res_t lv_fs_read (lv_fs_file_t * file_p, void * buf, uint32_t btr, uint32_t * br)
{ {
if(br != NULL) *br = 0; if(br != NULL) *br = 0;
if(file_p->drv == NULL || file_p->drv == NULL) return LV_FS_RES_INV_PARAM; if(file_p->drv == NULL) return LV_FS_RES_INV_PARAM;
if(file_p->drv->read == NULL) return LV_FS_RES_NOT_IMP; if(file_p->drv->read == NULL) return LV_FS_RES_NOT_IMP;
uint32_t br_tmp = 0; uint32_t br_tmp = 0;
@@ -185,7 +185,7 @@ lv_fs_res_t lv_fs_write (lv_fs_file_t * file_p, const void * buf, uint32_t btw,
{ {
if(bw != NULL) *bw = 0; if(bw != NULL) *bw = 0;
if(file_p->drv == NULL || file_p->drv == NULL) { if(file_p->drv == NULL) {
return LV_FS_RES_INV_PARAM; return LV_FS_RES_INV_PARAM;
} }
@@ -208,7 +208,7 @@ lv_fs_res_t lv_fs_write (lv_fs_file_t * file_p, const void * buf, uint32_t btw,
*/ */
lv_fs_res_t lv_fs_seek (lv_fs_file_t * file_p, uint32_t pos) lv_fs_res_t lv_fs_seek (lv_fs_file_t * file_p, uint32_t pos)
{ {
if(file_p->drv == NULL || file_p->drv == NULL) { if(file_p->drv == NULL) {
return LV_FS_RES_INV_PARAM; return LV_FS_RES_INV_PARAM;
} }
@@ -229,7 +229,7 @@ lv_fs_res_t lv_fs_seek (lv_fs_file_t * file_p, uint32_t pos)
*/ */
lv_fs_res_t lv_fs_tell (lv_fs_file_t * file_p, uint32_t * pos) lv_fs_res_t lv_fs_tell (lv_fs_file_t * file_p, uint32_t * pos)
{ {
if(file_p->drv == NULL || file_p->drv == NULL) { if(file_p->drv == NULL) {
pos = 0; pos = 0;
return LV_FS_RES_INV_PARAM; return LV_FS_RES_INV_PARAM;
} }
@@ -252,7 +252,7 @@ lv_fs_res_t lv_fs_tell (lv_fs_file_t * file_p, uint32_t * pos)
*/ */
lv_fs_res_t lv_fs_size (lv_fs_file_t * file_p, uint32_t * size) lv_fs_res_t lv_fs_size (lv_fs_file_t * file_p, uint32_t * size)
{ {
if(file_p->drv == NULL || file_p->drv == NULL) { if(file_p->drv == NULL) {
return LV_FS_RES_INV_PARAM; return LV_FS_RES_INV_PARAM;
} }