8000 WIP extmod/vfs_lfs: Make it work without NLR. · micropython/micropython@b00107a · GitHub
[go: up one dir, main page]

Skip to content

Commit b00107a

Browse files
committed
WIP extmod/vfs_lfs: Make it work without NLR.
1 parent b4710b4 commit b00107a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

extmod/vfs_lfsx.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ STATIC mp_obj_t MP_VFS_LFSx(make_new)(const mp_obj_type_t *type, size_t n_args,
123123
args[LFS_MAKE_ARG_readsize].u_int, args[LFS_MAKE_ARG_progsize].u_int, args[LFS_MAKE_ARG_lookahead].u_int);
124124
int ret = LFSx_API(mount)(&self->lfs, &self->config);
125125
if (ret < 0) {
126-
mp_raise_OSError(-ret);
126+
return mp_raise_OSError_o(-ret);
127127
}
128128
return MP_OBJ_FROM_PTR(self);
129129
}
@@ -137,7 +137,7 @@ STATIC mp_obj_t MP_VFS_LFSx(mkfs)(size_t n_args, const mp_obj_t *pos_args, mp_ma
137137
args[LFS_MAKE_ARG_readsize].u_int, args[LFS_MAKE_ARG_progsize].u_int, args[LFS_MAKE_ARG_lookahead].u_int);
138138
int ret = LFSx_API(format)(&self.lfs, &self.config);
139139
if (ret < 0) {
140-
mp_raise_OSError(-ret);
140+
return mp_raise_OSError_o(-ret);
141141
}
142142
return mp_const_none;
143143
}
@@ -205,7 +205,7 @@ STATIC mp_obj_t MP_VFS_LFSx(ilistdir_func)(size_t n_args, const mp_obj_t *args)
205205
iter->vfs = self;
206206
int ret = LFSx_API(dir_open)(&self->lfs, &iter->dir, path);
207207
if (ret < 0) {
208-
mp_raise_OSError(-ret);
208+
return mp_raise_OSError_o(-ret);
209209
}
210210
return MP_OBJ_FROM_PTR(iter);
211211
}
@@ -216,7 +216,7 @@ STATIC mp_obj_t MP_VFS_LFSx(remove)(mp_obj_t self_in, mp_obj_t path_in) {
216216
const char *path = MP_VFS_LFSx(make_path)(self, path_in);
217217
int ret = LFSx_API(remove)(&self->lfs, path);
218218
if (ret < 0) {
219-
mp_raise_OSError(-ret);
219+
return mp_raise_OSError_o(-ret);
220220
}
221221
return mp_const_none;
222222
}
@@ -227,7 +227,7 @@ STATIC mp_obj_t MP_VFS_LFSx(rmdir)(mp_obj_t self_in, mp_obj_t path_in) {
227227
const char *path = MP_VFS_LFSx(make_path)(self, path_in);
228228
int ret = LFSx_API(remove)(&self->lfs, path);
229229
if (ret < 0) {
230-
mp_raise_OSError(-ret);
230+
return mp_raise_OSError_o(-ret);
231231
}
232232
return mp_const_none;
233233
}
@@ -243,7 +243,7 @@ STATIC mp_obj_t MP_VFS_LFSx(rename)(mp_obj_t self_in, mp_obj_t path_old_in, mp_o
243243
int ret = LFSx_API(rename)(&self->lfs, path_old, vstr_null_terminated_str(&path_new));
244244
vstr_clear(&path_new);
245245
if (ret < 0) {
246-
mp_raise_OSError(-ret);
246+
return mp_raise_OSError_o(-ret);
247247
}
248248
return mp_const_none;
249249
}
@@ -254,7 +254,7 @@ STATIC mp_obj_t MP_VFS_LFSx(mkdir)(mp_obj_t self_in, mp_obj_t path_o) {
254254
const char *path = MP_VFS_LFSx(make_path)(self, path_o);
255255
int ret = LFSx_API(mkdir)(&self->lfs, path);
256256
if (ret < 0) {
257-
mp_raise_OSError(-ret);
257+
return mp_raise_OSError_o(-ret);
258258
}
259259
return mp_const_none;
260260
}
@@ -270,7 +270,7 @@ STATIC mp_obj_t MP_VFS_LFSx(chdir)(mp_obj_t self_in, mp_obj_t path_in) {
270270
struct LFSx_API(info) info;
271271
int ret = LFSx_API(stat)(&self->lfs, path, &info);
272272
if (ret < 0 || info.type != LFSx_MACRO(_TYPE_DIR)) {
273-
mp_raise_OSError(-MP_ENOENT);
273+
return mp_raise_OSError_o(-MP_ENOENT);
274274
}
275275
}
276276

@@ -308,7 +308,7 @@ STATIC mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
308308
struct LFSx_API(info) info;
309309
int ret = LFSx_API(stat)(&self->lfs, path, &info);
310310
if (ret < 0) {
311-
mp_raise_OSError(-ret);
311+
return mp_raise_OSError_o(-ret);
312312
}
313313

314314
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
@@ -344,7 +344,7 @@ STATIC mp_obj_t MP_VFS_LFSx(statvfs)(mp_obj_t self_in, mp_obj_t path_in) {
344344
int ret = LFSx_API(fs_traverse)(&self->lfs, LFSx_API(traverse_cb), &n_used_blocks);
345345
#endif
346346
if (ret < 0) {
347-
mp_raise_OSError(-ret);
347+
return mp_raise_OSError_o(-ret);
348348
}
349349

350350
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));

extmod/vfs_lfsx_file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ mp_obj_t MP_VFS_LFSx(file_open)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mod
105105
int ret = LFSx_API(file_opencfg)(&self->lfs, &o->file, path, flags, &o->cfg);
106106
if (ret < 0) {
107107
o->vfs = NULL;
108-
mp_raise_OSError(-ret);
108+
return mp_raise_OSError_o(-ret);
109109
}
110110

111111
return MP_OBJ_FROM_PTR(o);

0 commit comments

Comments
 (0)
0