Skip to content

Commit 2b4ad1e

Browse files
committed
Fix warnings that come from -O3 (I think)
1 parent 733094a commit 2b4ad1e

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

extmod/vfs.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ mp_vfs_mount_t *mp_vfs_lookup_path(const char *path, const char **path_out) {
7171
STATIC mp_vfs_mount_t *lookup_path(mp_obj_t path_in, mp_obj_t *path_out) {
7272
const char *path = mp_obj_str_get_str(path_in);
7373
const char *p_out;
74+
*path_out = mp_const_none;
7475
mp_vfs_mount_t *vfs = mp_vfs_lookup_path(path, &p_out);
7576
if (vfs != MP_VFS_NONE && vfs != MP_VFS_ROOT) {
7677
*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) {
329330
path_in = MP_OBJ_NEW_QSTR(MP_QSTR_);
330331
}
331332

332-
mp_obj_t path_out;
333+
mp_obj_t path_out = mp_const_none;
333334
mp_vfs_mount_t *vfs = lookup_path(path_in, &path_out);
334335

335336
if (vfs == MP_VFS_ROOT) {
@@ -359,7 +360,7 @@ mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) {
359360
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_listdir_obj, 0, 1, mp_vfs_listdir);
360361

361362
mp_obj_t mp_vfs_mkdir(mp_obj_t path_in) {
362-
mp_obj_t path_out;
363+
mp_obj_t path_out = mp_const_none;
363364
mp_vfs_mount_t *vfs = lookup_path(path_in, &path_out);
364365
if (vfs == MP_VFS_ROOT || (vfs != MP_VFS_NONE && !strcmp(mp_obj_str_get_str(path_out), "/"))) {
365366
mp_raise_OSError(MP_EEXIST);

shared-bindings/microcontroller/Pin.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ static void get_pin_name(const mcu_pin_obj_t *self, qstr* package, qstr* module,
6666

6767
STATIC void mcu_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
6868
mcu_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
69-
qstr package;
69+
qstr package = MP_QSTR_Pin;
7070
qstr module;
71-
qstr name;
71+
qstr name = MP_QSTR_Pin;
7272

7373
get_pin_name(self, &package, &module, &name);
74-
if (package){
74+
if (package) {
7575
mp_printf(print, "%q.%q.%q", package, module, name);
7676
} else {
7777
mp_printf(print, "%q.%q", module , name);
@@ -131,7 +131,7 @@ void assert_pin_free(const mcu_pin_obj_t* pin) {
131131
if (pin != NULL && pin != MP_OBJ_TO_PTR(mp_const_none) && !common_hal_mcu_pin_is_free(pin)) {
132132
qstr package;
133133
qstr module;
134-
qstr name;
134+
qstr name = MP_QSTR_Pin;
135135

136136
get_pin_name(pin, &package, &module, &name);
137137
mp_raise_ValueError_varg(translate("%q in use"), name);

shared-module/os/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
// Version of mp_vfs_lookup_path that takes and returns uPy string objects.
4343
STATIC mp_vfs_mount_t *lookup_path(const char* path, mp_obj_t *path_out) {
4444
const char *p_out;
45+
*path_out = mp_const_none;
4546
mp_vfs_mount_t *vfs = mp_vfs_lookup_path(path, &p_out);
4647
if (vfs != MP_VFS_NONE && vfs != MP_VFS_ROOT) {
4748
*path_out = mp_obj_new_str_of_type(&mp_type_str,
@@ -53,6 +54,7 @@ STATIC mp_vfs_mount_t *lookup_path(const char* path, mp_obj_t *path_out) {
5354
// Strip off trailing slashes to please underlying libraries
5455
STATIC mp_vfs_mount_t *lookup_dir_path(const char* path, mp_obj_t *path_out) {
5556
const char *p_out;
57+
*path_out = mp_const_none;
5658
mp_vfs_mount_t *vfs = mp_vfs_lookup_path(path, &p_out);
5759
if (vfs != MP_VFS_NONE && vfs != MP_VFS_ROOT) {
5860
size_t len = strlen(p_out);

0 commit comments

Comments
 (0)