extmod/vfs_fat: Use mp_raise_OSError helper function.

dpgeorge · dpgeorge · commit 620c4c32bf1a · 2016-10-07T13:44:55.000+11:00
diff --git a/extmod/fsusermount.c b/extmod/fsusermount.c
@@ -31,6 +31,7 @@
 
 #include "py/nlr.h"
 #include "py/runtime.h"
+#include "py/mperrno.h"
 #include "lib/fatfs/ff.h"
 #include "extmod/fsusermount.h"
 
@@ -183,7 +184,7 @@ mp_obj_t fatfs_umount(mp_obj_t bdev_or_path_in) {
     }
 
     if (i == MP_ARRAY_SIZE(MP_STATE_PORT(fs_user_mount))) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EINVAL)));
+        mp_raise_OSError(MP_EINVAL);
     }
 
     fs_user_mount_t *vfs = MP_STATE_PORT(fs_user_mount)[i];
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
@@ -84,8 +84,7 @@ STATIC mp_obj_t fat_vfs_remove(mp_obj_t vfs_in, mp_obj_t path_in) {
     if (res == FR_OK) {
         return mp_const_none;
     } else {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,
-            MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
+        mp_raise_OSError(fresult_to_errno_table[res]);
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_remove_obj, fat_vfs_remove);
@@ -106,8 +105,7 @@ STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_
     if (res == FR_OK) {
         return mp_const_none;
     } else {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,
-            MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
+        mp_raise_OSError(fresult_to_errno_table[res]);
     }
 
 }
@@ -120,8 +118,7 @@ STATIC mp_obj_t fat_vfs_mkdir(mp_obj_t vfs_in, mp_obj_t path_o) {
     if (res == FR_OK) {
         return mp_const_none;
     } else {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,
-            MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
+        mp_raise_OSError(fresult_to_errno_table[res]);
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_mkdir_obj, fat_vfs_mkdir);
@@ -139,8 +136,7 @@ STATIC mp_obj_t fat_vfs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) {
     }
 
     if (res != FR_OK) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,
-            MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
+        mp_raise_OSError(fresult_to_errno_table[res]);
     }
 
     return mp_const_none;
@@ -154,7 +150,7 @@ STATIC mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {
     FRESULT res = f_getcwd(buf, sizeof buf);
 
     if (res != FR_OK) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
+        mp_raise_OSError(fresult_to_errno_table[res]);
     }
 
     return mp_obj_new_str(buf, strlen(buf), false);
@@ -215,8 +211,7 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
             res = f_stat(path, &fno);
         }
         if (res != FR_OK) {
-            nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,
-                MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
+            mp_raise_OSError(fresult_to_errno_table[res]);
         }
     }
 
@@ -259,8 +254,7 @@ STATIC mp_obj_t fat_vfs_statvfs(mp_obj_t vfs_in, mp_obj_t path_in) {
     DWORD nclst;
     FRESULT res = f_getfree(path, &nclst, &fatfs);
     if (FR_OK != res) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,
-          MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
+        mp_raise_OSError(fresult_to_errno_table[res]);
     }
 
     mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
@@ -208,7 +208,7 @@ STATIC mp_obj_t file_open(const mp_obj_type_t *type, mp_arg_val_t *args) {
     FRESULT res = f_open(&o->fp, fname, mode);
     if (res != FR_OK) {
         m_del_obj(pyb_file_obj_t, o);
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
+        mp_raise_OSError(fresult_to_errno_table[res]);
     }
 
     // for 'a' mode, we must begin at the end of the file
diff --git a/extmod/vfs_fat_misc.c b/extmod/vfs_fat_misc.c
@@ -54,9 +54,7 @@ mp_obj_t fat_vfs_listdir(const char *path, bool is_str_type) {
 
     res = f_opendir(&dir, path);                       /* Open the directory */
     if (res != FR_OK) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,
-          MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));
-
+        mp_raise_OSError(fresult_to_errno_table[res]);
     }
 
     mp_obj_t dir_list = mp_obj_new_list(0, NULL);

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`
`32`	`32`	`#include "py/nlr.h"`
`33`	`33`	`#include "py/runtime.h"`
	`34`	`+#include "py/mperrno.h"`
`34`	`35`	`#include "lib/fatfs/ff.h"`
`35`	`36`	`#include "extmod/fsusermount.h"`
`36`	`37`
`@@ -183,7 +184,7 @@ mp_obj_t fatfs_umount(mp_obj_t bdev_or_path_in) {`
`183`	`184`	`}`
`184`	`185`
`185`	`186`	`if (i == MP_ARRAY_SIZE(MP_STATE_PORT(fs_user_mount))) {`
`186`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(EINVAL)));`
	`187`	`+ mp_raise_OSError(MP_EINVAL);`
`187`	`188`	`}`
`188`	`189`
`189`	`190`	`fs_user_mount_t *vfs = MP_STATE_PORT(fs_user_mount)[i];`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@ STATIC mp_obj_t fat_vfs_remove(mp_obj_t vfs_in, mp_obj_t path_in) {`
`84`	`84`	`if (res == FR_OK) {`
`85`	`85`	`return mp_const_none;`
`86`	`86`	`} else {`
`87`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,`
`88`		`- MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));`
	`87`	`+ mp_raise_OSError(fresult_to_errno_table[res]);`
`89`	`88`	`}`
`90`	`89`	`}`
`91`	`90`	`STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_remove_obj, fat_vfs_remove);`
`@@ -106,8 +105,7 @@ STATIC mp_obj_t fat_vfs_rename(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t path_`
`106`	`105`	`if (res == FR_OK) {`
`107`	`106`	`return mp_const_none;`
`108`	`107`	`} else {`
`109`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,`
`110`		`- MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));`
	`108`	`+ mp_raise_OSError(fresult_to_errno_table[res]);`
`111`	`109`	`}`
`112`	`110`
`113`	`111`	`}`
`@@ -120,8 +118,7 @@ STATIC mp_obj_t fat_vfs_mkdir(mp_obj_t vfs_in, mp_obj_t path_o) {`
`120`	`118`	`if (res == FR_OK) {`
`121`	`119`	`return mp_const_none;`
`122`	`120`	`} else {`
`123`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,`
`124`		`- MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));`
	`121`	`+ mp_raise_OSError(fresult_to_errno_table[res]);`
`125`	`122`	`}`
`126`	`123`	`}`
`127`	`124`	`STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_mkdir_obj, fat_vfs_mkdir);`
`@@ -139,8 +136,7 @@ STATIC mp_obj_t fat_vfs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) {`
`139`	`136`	`}`
`140`	`137`
`141`	`138`	`if (res != FR_OK) {`
`142`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,`
`143`		`- MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));`
	`139`	`+ mp_raise_OSError(fresult_to_errno_table[res]);`
`144`	`140`	`}`
`145`	`141`
`146`	`142`	`return mp_const_none;`
`@@ -154,7 +150,7 @@ STATIC mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {`
`154`	`150`	`FRESULT res = f_getcwd(buf, sizeof buf);`
`155`	`151`
`156`	`152`	`if (res != FR_OK) {`
`157`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));`
	`153`	`+ mp_raise_OSError(fresult_to_errno_table[res]);`
`158`	`154`	`}`
`159`	`155`
`160`	`156`	`return mp_obj_new_str(buf, strlen(buf), false);`
`@@ -215,8 +211,7 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {`
`215`	`211`	`res = f_stat(path, &fno);`
`216`	`212`	`}`
`217`	`213`	`if (res != FR_OK) {`
`218`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,`
`219`		`- MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));`
	`214`	`+ mp_raise_OSError(fresult_to_errno_table[res]);`
`220`	`215`	`}`
`221`	`216`	`}`
`222`	`217`
`@@ -259,8 +254,7 @@ STATIC mp_obj_t fat_vfs_statvfs(mp_obj_t vfs_in, mp_obj_t path_in) {`
`259`	`254`	`DWORD nclst;`
`260`	`255`	`FRESULT res = f_getfree(path, &nclst, &fatfs);`
`261`	`256`	`if (FR_OK != res) {`
`262`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,`
`263`		`- MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));`
	`257`	`+ mp_raise_OSError(fresult_to_errno_table[res]);`
`264`	`258`	`}`
`265`	`259`
`266`	`260`	`mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ STATIC mp_obj_t file_open(const mp_obj_type_t type, mp_arg_val_t args) {`
`208`	`208`	`FRESULT res = f_open(&o->fp, fname, mode);`
`209`	`209`	`if (res != FR_OK) {`
`210`	`210`	`m_del_obj(pyb_file_obj_t, o);`
`211`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));`
	`211`	`+ mp_raise_OSError(fresult_to_errno_table[res]);`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`// for 'a' mode, we must begin at the end of the file`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,7 @@ mp_obj_t fat_vfs_listdir(const char *path, bool is_str_type) {`
`54`	`54`
`55`	`55`	`res = f_opendir(&dir, path); /* Open the directory */`
`56`	`56`	`if (res != FR_OK) {`
`57`		`- nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError,`
`58`		`- MP_OBJ_NEW_SMALL_INT(fresult_to_errno_table[res])));`
`59`		`-`
	`57`	`+ mp_raise_OSError(fresult_to_errno_table[res]);`
`60`	`58`	`}`
`61`	`59`
`62`	`60`	`mp_obj_t dir_list = mp_obj_new_list(0, NULL);`