diff options
| author | DavePutz <dwputz@gmail.com> | 2021-01-21 16:07:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 16:07:24 -0600 |
| commit | 6043fdf94085bf2ec00e9f95149a74fb7eb0c7c4 (patch) | |
| tree | 49fb85346b3ce60a08ad7780b8aec7fd0f72366f /extmod | |
| parent | e424c8424936ded83803b098229d0787903f9f92 (diff) | |
| parent | 2249a33203339803c8a0b23e80eec15d77b7f23e (diff) | |
Merge pull request #39 from adafruit/main
Merge from adafruit main for RP2040
Diffstat (limited to 'extmod')
| m--------- | extmod/ulab | 0 | ||||
| -rw-r--r-- | extmod/vfs.c | 5 |
2 files changed, 3 insertions, 2 deletions
diff --git a/extmod/ulab b/extmod/ulab -Subproject d62d07ea0b9597535428ebe6012da6b0d6608bf +Subproject 8b804f3bcd8c5a3ac1b3e09e0ff7faf8270751d diff --git a/extmod/vfs.c b/extmod/vfs.c index c9c1fe3c3..420f8305f 100644 --- a/extmod/vfs.c +++ b/extmod/vfs.c @@ -71,6 +71,7 @@ mp_vfs_mount_t *mp_vfs_lookup_path(const char *path, const char **path_out) { STATIC mp_vfs_mount_t *lookup_path(mp_obj_t path_in, mp_obj_t *path_out) { const char *path = mp_obj_str_get_str(path_in); const char *p_out; + *path_out = mp_const_none; mp_vfs_mount_t *vfs = mp_vfs_lookup_path(path, &p_out); if (vfs != MP_VFS_NONE && vfs != MP_VFS_ROOT) { *path_out = mp_obj_new_str_of_type(mp_obj_get_type(path_in), @@ -329,7 +330,7 @@ mp_obj_t mp_vfs_ilistdir(size_t n_args, const mp_obj_t *args) { path_in = MP_OBJ_NEW_QSTR(MP_QSTR_); } - mp_obj_t path_out; + mp_obj_t path_out = mp_const_none; mp_vfs_mount_t *vfs = lookup_path(path_in, &path_out); if (vfs == MP_VFS_ROOT) { @@ -359,7 +360,7 @@ mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) { MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_listdir_obj, 0, 1, mp_vfs_listdir); mp_obj_t mp_vfs_mkdir(mp_obj_t path_in) { - mp_obj_t path_out; + mp_obj_t path_out = mp_const_none; mp_vfs_mount_t *vfs = lookup_path(path_in, &path_out); if (vfs == MP_VFS_ROOT || (vfs != MP_VFS_NONE && !strcmp(mp_obj_str_get_str(path_out), "/"))) { mp_raise_OSError(MP_EEXIST); |