summaryrefslogtreecommitdiff
path: root/py/objenumerate.c
diff options
context:
space:
mode:
authorJim Mussared <jim.mussared@gmail.com>2022-04-22 17:09:15 +1000
committerDamien George <damien@micropython.org>2022-05-03 22:28:14 +1000
commit0e7bfc88c6ac6b5d64240f91183a3cfe2ab67ade (patch)
treeb578372082eb5b661263d61a1194af3868968cf9 /py/objenumerate.c
parent6a3bc0e1a1f4dc0ad0b71ca0f168ad1a87d28859 (diff)
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/objenumerate.c')
-rw-r--r--py/objenumerate.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/py/objenumerate.c b/py/objenumerate.c
index d1de4add4..241aef302 100644
--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@@ -54,14 +54,12 @@ STATIC mp_obj_t enumerate_make_new(const mp_obj_type_t *type, size_t n_args, siz
MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&arg_vals);
// create enumerate object
- mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t);
- o->base.type = type;
+ mp_obj_enumerate_t *o = mp_obj_malloc(mp_obj_enumerate_t, type);
o->iter = mp_getiter(arg_vals.iterable.u_obj, NULL);
o->cur = arg_vals.start.u_int;
#else
mp_arg_check_num(n_args, n_kw, 1, 2, false);
- mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t);
- o->base.type = type;
+ mp_obj_enumerate_t *o = mp_obj_malloc(mp_obj_enumerate_t, type);
o->iter = mp_getiter(args[0], NULL);
o->cur = n_args > 1 ? mp_obj_get_int(args[1]) : 0;
#endif