factor out storage_object_from_path

jepler · jepler · commit 968763aa1d4e · 2018-03-27T21:28:18.000-05:00
diff --git a/shared-module/storage/__init__.c b/shared-module/storage/__init__.c
@@ -109,19 +109,15 @@ void common_hal_storage_umount_object(mp_obj_t vfs_obj) {
     mp_vfs_proxy_call(vfs, MP_QSTR_umount, 0, NULL);
 }
 
-void common_hal_storage_umount_path(const char* mount_path) {
-    // remove vfs from the mount table
-    mp_obj_t *vfs_obj = NULL;
+STATIC mp_obj_t storage_object_from_path(const char* mount_path) {
     for (mp_vfs_mount_t **vfsp = &MP_STATE_VM(vfs_mount_table); *vfsp != NULL; vfsp = &(*vfsp)->next) {
         if (strcmp(mount_path, (*vfsp)->str) == 0) {
-            vfs_obj = (*vfsp)->obj;
-            break;
+            return (*vfsp)->obj;
         }
     }
+    mp_raise_OSError(MP_EINVAL);
+}
 
-    if (vfs_obj == NULL) {
-        mp_raise_OSError(MP_EINVAL);
-    }
-
-    common_hal_storage_umount_object(vfs_obj);
+void common_hal_storage_umount_path(const char* mount_path) {
+    common_hal_storage_umount_object(storage_object_from_path(mount_path));
 }

Original file line number	Diff line number	Diff line change
`@@ -109,19 +109,15 @@ void common_hal_storage_umount_object(mp_obj_t vfs_obj) {`
`109`	`109`	`mp_vfs_proxy_call(vfs, MP_QSTR_umount, 0, NULL);`
`110`	`110`	`}`
`111`	`111`
`112`		`-void common_hal_storage_umount_path(const char* mount_path) {`
`113`		`- // remove vfs from the mount table`
`114`		`- mp_obj_t *vfs_obj = NULL;`
	`112`	`+STATIC mp_obj_t storage_object_from_path(const char* mount_path) {`
`115`	`113`	`for (mp_vfs_mount_t *vfsp = &MP_STATE_VM(vfs_mount_table); vfsp != NULL; vfsp = &(*vfsp)->next) {`
`116`	`114`	`if (strcmp(mount_path, (*vfsp)->str) == 0) {`
`117`		`- vfs_obj = (*vfsp)->obj;`
`118`		`- break;`
	`115`	`+ return (*vfsp)->obj;`
`119`	`116`	`}`
`120`	`117`	`}`
	`118`	`+ mp_raise_OSError(MP_EINVAL);`
	`119`	`+}`
`121`	`120`
`122`		`- if (vfs_obj == NULL) {`
`123`		`- mp_raise_OSError(MP_EINVAL);`
`124`		`- }`
`125`		`-`
`126`		`- common_hal_storage_umount_object(vfs_obj);`
	`121`	`+void common_hal_storage_umount_path(const char* mount_path) {`
	`122`	`+ common_hal_storage_umount_object(storage_object_from_path(mount_path));`
`127`	`123`	`}`