Skip to content

Commit fb7b715

Browse files
committed
extmod/modlwip: Use _ERR_BADF instead of magic number.
1 parent bc25545 commit fb7b715

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

extmod/modlwip.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ STATIC const mp_obj_type_t lwip_slip_type = {
150150
// Table to convert lwIP err_t codes to socket errno codes, from the lwIP
151151
// socket API.
152152

153+
// Extension to lwIP error codes
154+
#define _ERR_BADF -16
153155
static const int error_lookup_table[] = {
154156
0, /* ERR_OK 0 No error, everything OK. */
155157
ENOMEM, /* ERR_MEM -1 Out of memory error. */
@@ -167,7 +169,7 @@ static const int error_lookup_table[] = {
167169
ENOTCONN, /* ERR_CONN -13 Not connected. */
168170
EIO, /* ERR_ARG -14 Illegal argument. */
169171
-1, /* ERR_IF -15 Low-level netif error */
170-
EBADF, /* Not an ERR -16 Closed socket (null pcb) */
172+
EBADF, /* _ERR_BADF -16 Closed socket (null pcb) */
171173
};
172174

173175
/*******************************************************************************/
@@ -493,7 +495,7 @@ STATIC mp_obj_t lwip_socket_close(mp_obj_t self_in) {
493495
//case MOD_NETWORK_SOCK_RAW: raw_remove(socket->pcb.raw); break;
494496
}
495497
socket->pcb.tcp = NULL;
496-
socket->state = -16; // EBADF
498+
socket->state = _ERR_BADF;
497499
if (socket->incoming.pbuf != NULL) {
498500
if (!socket_is_listener) {
499501
pbuf_free(socket->incoming.pbuf);
@@ -699,7 +701,7 @@ STATIC mp_obj_t lwip_socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
699701
if (socket->pcb.tcp == NULL) {
700702
// not connected
701703
_errno = error_lookup_table[-(socket->state)];
702-
socket->state = -16;
704+
socket->state = _ERR_BADF;
703705
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
704706
}
705707

@@ -732,7 +734,7 @@ STATIC mp_obj_t lwip_socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
732734
if (socket->pcb.tcp == NULL) {
733735
// not connected
734736
_errno = error_lookup_table[-(socket->state)];
735-
socket->state = -16;
737+
socket->state = _ERR_BADF;
736738
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
737739
}
738740

@@ -770,7 +772,7 @@ STATIC mp_obj_t lwip_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t
770772
if (socket->pcb.tcp == NULL) {
771773
// not connected
772774
_errno = error_lookup_table[-(socket->state)];
773-
socket->state = -16;
775+
socket->state = _ERR_BADF;
774776
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
775777
}
776778

@@ -806,7 +808,7 @@ STATIC mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
806808
if (socket->pcb.tcp == NULL) {
807809
// not connected
808810
_errno = error_lookup_table[-(socket->state)];
809-
socket->state = -16;
811+
socket->state = _ERR_BADF;
810812
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
811813
}
812814

0 commit comments

Comments
 (0)