diff options
| author | Damien George <damien.p.george@gmail.com> | 2016-12-02 16:39:50 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-12-02 16:39:50 +1100 |
| commit | ebc8d730f1b1a95399c5c4cdd6f010aabf7a186d (patch) | |
| tree | 75962c8265308a6d7ebde8546ea457b0adfd4fa7 /extmod/moduselect.c | |
| parent | 304cfda8c466920b1d29903bfca8bca5ed110f3b (diff) | |
| download | micropython-ebc8d730f1b1a95399c5c4cdd6f010aabf7a186d.tar.gz micropython-ebc8d730f1b1a95399c5c4cdd6f010aabf7a186d.zip | |
extmod/moduselect: Use stream helper function instead of ad-hoc code.
Diffstat (limited to 'extmod/moduselect.c')
| -rw-r--r-- | extmod/moduselect.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/extmod/moduselect.c b/extmod/moduselect.c index 2fc19cdf09..a19901e171 100644 --- a/extmod/moduselect.c +++ b/extmod/moduselect.c @@ -55,11 +55,7 @@ STATIC void poll_map_add(mp_map_t *poll_map, const mp_obj_t *obj, mp_uint_t obj_ mp_map_elem_t *elem = mp_map_lookup(poll_map, mp_obj_id(obj[i]), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND); if (elem->value == NULL) { // object not found; get its ioctl and add it to the poll list - mp_obj_type_t *type = mp_obj_get_type(obj[i]); - const mp_stream_p_t *stream_p = type->protocol; - if (stream_p == NULL || stream_p->ioctl == NULL) { - nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "object with stream.ioctl required")); - } + const mp_stream_p_t *stream_p = mp_get_stream_raise(obj[i], MP_STREAM_OP_IOCTL); poll_obj_t *poll_obj = m_new_obj(poll_obj_t); poll_obj->obj = obj[i]; poll_obj->ioctl = stream_p->ioctl; |