extmod/modussl: address comments

tve · tve · commit f08a6b92ad8e · 2020-04-20T14:48:55.000-07:00
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
@@ -178,7 +178,7 @@ STATIC mp_uint_t ussl_socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int
 }
 
 STATIC mp_obj_t ussl_socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
-    size_t len = mp_obj_get_int(len_in);
+    size_t len = mp_obj_int_get_uint_checked(len_in);
     vstr_t vstr;
     vstr_init_len(&vstr, len);
 
@@ -204,8 +204,8 @@ STATIC mp_uint_t ussl_socket_write(mp_obj_t o_in, const void *buf, mp_uint_t siz
     mp_int_t r;
 eagain:
     r = ssl_write(o->ssl_sock, buf, size);
-    if (r == SSL_OK) {
-        // see comment in read method
+    if (r == 0) {
+        // see comment in ussl_socket_read above
         if (o->blocking) {
             goto eagain;
         } else {
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
@@ -662,12 +662,10 @@ STATIC mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_
         int r = lwip_write(sock->fd, buf, size);
         MP_THREAD_GIL_ENTER();
         if (r > 0) {
-            printf("socket_stream_write wrote %d\n", r);
             return r;
         }
         // lwip returns MP_EINPROGRESS when trying to write right after a non-blocking connect
         if (r < 0 && errno != MP_EWOULDBLOCK && errno != MP_EINPROGRESS) {
-            printf("socket_stream_write error %d\n", errno);
             *errcode = errno;
             return MP_STREAM_ERROR;
         }

Original file line number	Diff line number	Diff line change
`@@ -662,12 +662,10 @@ STATIC mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_`
`662`	`662`	`int r = lwip_write(sock->fd, buf, size);`
`663`	`663`	`MP_THREAD_GIL_ENTER();`
`664`	`664`	`if (r > 0) {`
`665`		`- printf("socket_stream_write wrote %d\n", r);`
`666`	`665`	`return r;`
`667`	`666`	`}`
`668`	`667`	`// lwip returns MP_EINPROGRESS when trying to write right after a non-blocking connect`
`669`	`668`	`if (r < 0 && errno != MP_EWOULDBLOCK && errno != MP_EINPROGRESS) {`
`670`		`- printf("socket_stream_write error %d\n", errno);`
`671`	`669`	`*errcode = errno;`
`672`	`670`	`return MP_STREAM_ERROR;`
`673`	`671`	`}`