diff options
| author | Jim Mussared <jim.mussared@gmail.com> | 2022-04-22 17:09:15 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2022-05-03 22:28:14 +1000 |
| commit | 0e7bfc88c6ac6b5d64240f91183a3cfe2ab67ade (patch) | |
| tree | b578372082eb5b661263d61a1194af3868968cf9 /py/objset.c | |
| parent | 6a3bc0e1a1f4dc0ad0b71ca0f168ad1a87d28859 (diff) | |
| download | micropython-0e7bfc88c6ac6b5d64240f91183a3cfe2ab67ade.tar.gz micropython-0e7bfc88c6ac6b5d64240f91183a3cfe2ab67ade.zip | |
all: Use mp_obj_malloc everywhere it's applicable.
This replaces occurences of
foo_t *foo = m_new_obj(foo_t);
foo->base.type = &foo_type;
with
foo_t *foo = mp_obj_malloc(foo_t, &foo_type);
Excludes any places where base is a sub-field or when new0/memset is used.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Diffstat (limited to 'py/objset.c')
| -rw-r--r-- | py/objset.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/py/objset.c b/py/objset.c index d2508bfbf9..26fd74398b 100644 --- a/py/objset.c +++ b/py/objset.c @@ -174,8 +174,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_clear_obj, set_clear); STATIC mp_obj_t set_copy(mp_obj_t self_in) { check_set_or_frozenset(self_in); mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in); - mp_obj_set_t *other = m_new_obj(mp_obj_set_t); - other->base.type = self->base.type; + mp_obj_set_t *other = mp_obj_malloc(mp_obj_set_t, self->base.type); mp_set_init(&other->set, self->set.alloc); other->set.used = self->set.used; memcpy(other->set.table, self->set.table, self->set.alloc * sizeof(mp_obj_t)); @@ -579,8 +578,7 @@ const mp_obj_type_t mp_type_frozenset = { #endif mp_obj_t mp_obj_new_set(size_t n_args, mp_obj_t *items) { - mp_obj_set_t *o = m_new_obj(mp_obj_set_t); - o->base.type = &mp_type_set; + mp_obj_set_t *o = mp_obj_malloc(mp_obj_set_t, &mp_type_set); mp_set_init(&o->set, n_args); for (size_t i = 0; i < n_args; i++) { mp_set_lookup(&o->set, items[i], MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); |