From 703a22fae59482b80ac142389986326f523706f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Lled=C3=B3?= Date: Fri, 17 Feb 2017 15:58:19 +0100 Subject: [PATCH] Support for 32bit errno codes --- src/api/sockets.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/api/sockets.c b/src/api/sockets.c index 27d8bc76..8315abc8 100644 --- a/src/api/sockets.c +++ b/src/api/sockets.c @@ -216,8 +216,8 @@ struct lwip_sock { u16_t sendevent; /** error happened for this socket, set by event_callback(), tested by select */ u16_t errevent; - /** last error that occurred on this socket (in fact, all our errnos fit into an u8_t) */ - u8_t err; + /** last error that occurred on this socket */ + int err; /** counter of how many threads are waiting for this socket using select */ SELWAIT_T select_waiting; }; @@ -295,7 +295,7 @@ static volatile int select_cb_ctr; #define sock_set_errno(sk, e) do { \ const int sockerr = (e); \ - sk->err = (u8_t)sockerr; \ + sk->err = sockerr; \ set_errno(sockerr); \ } while (0) @@ -305,8 +305,8 @@ static void event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len static void lwip_getsockopt_callback(void *arg); static void lwip_setsockopt_callback(void *arg); #endif -static u8_t lwip_getsockopt_impl(int s, int level, int optname, void *optval, socklen_t *optlen); -static u8_t lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_t optlen); +static int lwip_getsockopt_impl(int s, int level, int optname, void *optval, socklen_t *optlen); +static int lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_t optlen); #if LWIP_IPV4 && LWIP_IPV6 static void @@ -1780,7 +1780,7 @@ lwip_getsockname(int s, struct sockaddr *name, socklen_t *namelen) int lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen) { - u8_t err; + int err; struct lwip_sock *sock = get_socket(s); #if !LWIP_TCPIP_CORE_LOCKING LWIP_SETGETSOCKOPT_DATA_VAR_DECLARE(data); @@ -1875,10 +1875,10 @@ lwip_getsockopt_callback(void *arg) /** lwip_getsockopt_impl: the actual implementation of getsockopt: * same argument as lwip_getsockopt, either called directly or through callback */ -static u8_t +static int lwip_getsockopt_impl(int s, int level, int optname, void *optval, socklen_t *optlen) { - u8_t err = 0; + int err = 0; struct lwip_sock *sock = tryget_socket(s); if (!sock) { return EBADF; @@ -2186,7 +2186,7 @@ lwip_getsockopt_impl(int s, int level, int optname, void *optval, socklen_t *opt int lwip_setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen) { - u8_t err = 0; + int err = 0; struct lwip_sock *sock = get_socket(s); #if !LWIP_TCPIP_CORE_LOCKING LWIP_SETGETSOCKOPT_DATA_VAR_DECLARE(data); @@ -2276,10 +2276,10 @@ lwip_setsockopt_callback(void *arg) /** lwip_setsockopt_impl: the actual implementation of setsockopt: * same argument as lwip_setsockopt, either called directly or through callback */ -static u8_t +static int lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_t optlen) { - u8_t err = 0; + int err = 0; struct lwip_sock *sock = tryget_socket(s); if (!sock) { return EBADF;