diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-06-18 18:19:24 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-06-18 18:44:57 +0300 |
| commit | 07209f8592f15435d6abbccaad5347cea2c7722e (patch) | |
| tree | a009978926973dc9bb1365872f4313435df57259 /extmod/modussl.c | |
| parent | 080137961daef9a1b0fe1f37f54a820842728442 (diff) | |
| download | micropython-07209f8592f15435d6abbccaad5347cea2c7722e.tar.gz micropython-07209f8592f15435d6abbccaad5347cea2c7722e.zip | |
all: Rename mp_obj_type_t::stream_p to protocol.
It's now used for more than just stream protocol (e.g. pin protocol), so
don't use false names.
Diffstat (limited to 'extmod/modussl.c')
| -rw-r--r-- | extmod/modussl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/extmod/modussl.c b/extmod/modussl.c index 567033cf48..4a3e297e1e 100644 --- a/extmod/modussl.c +++ b/extmod/modussl.c @@ -156,7 +156,7 @@ STATIC const mp_obj_type_t ussl_socket_type = { .print = socket_print, .getiter = NULL, .iternext = NULL, - .stream_p = &ussl_socket_stream_p, + .protocol = &ussl_socket_stream_p, .locals_dict = (void*)&ussl_socket_locals_dict, }; @@ -202,7 +202,8 @@ int mp_stream_errno; ssize_t mp_stream_posix_write(void *sock_obj, const void *buf, size_t len) { struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)sock_obj; - mp_uint_t out_sz = o->type->stream_p->write(o, buf, len, &mp_stream_errno); + const mp_stream_p_t *stream_p = o->type->protocol; + mp_uint_t out_sz = stream_p->write(o, buf, len, &mp_stream_errno); if (out_sz == MP_STREAM_ERROR) { return -1; } else { @@ -212,7 +213,8 @@ ssize_t mp_stream_posix_write(void *sock_obj, const void *buf, size_t len) { ssize_t mp_stream_posix_read(void *sock_obj, void *buf, size_t len) { struct _mp_obj_base_t *o = (struct _mp_obj_base_t *)sock_obj; - mp_uint_t out_sz = o->type->stream_p->read(o, buf, len, &mp_stream_errno); + const mp_stream_p_t *stream_p = o->type->protocol; + mp_uint_t out_sz = stream_p->read(o, buf, len, &mp_stream_errno); if (out_sz == MP_STREAM_ERROR) { return -1; } else { |