From c73df52c461ee659ba7ef128e81a8ea039f4a635 Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Thu, 17 Feb 2022 23:19:15 +0800 Subject: [PATCH] net/socket: fix shadow variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit socket/setsockopt.c: In function ‘psock_socketlevel_option’: socket/setsockopt.c:168:38: warning: declaration of ‘conn’ shadows a previous local [-Wshadow] 168 | FAR struct tcp_conn_s *conn; | ^~~~ Signed-off-by: chao.an --- net/socket/setsockopt.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/net/socket/setsockopt.c b/net/socket/setsockopt.c index a0add14116f..83f383726e0 100644 --- a/net/socket/setsockopt.c +++ b/net/socket/setsockopt.c @@ -165,26 +165,26 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option, #if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) if (psock->s_type == SOCK_STREAM) { - FAR struct tcp_conn_s *conn; + FAR struct tcp_conn_s *tcp; - conn = (FAR struct tcp_conn_s *)psock->s_conn; + tcp = (FAR struct tcp_conn_s *)conn; /* Save the receive buffer size */ - conn->rcv_bufs = buffersize; + tcp->rcv_bufs = buffersize; } else #endif #if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) if (psock->s_type == SOCK_DGRAM) { - FAR struct udp_conn_s *conn; + FAR struct udp_conn_s *udp; - conn = (FAR struct udp_conn_s *)psock->s_conn; + udp = (FAR struct udp_conn_s *)conn; /* Save the receive buffer size */ - conn->rcvbufs = buffersize; + udp->rcvbufs = buffersize; } else #endif @@ -227,26 +227,26 @@ static int psock_socketlevel_option(FAR struct socket *psock, int option, #if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) if (psock->s_type == SOCK_STREAM) { - FAR struct tcp_conn_s *conn; + FAR struct tcp_conn_s *tcp; - conn = (FAR struct tcp_conn_s *)psock->s_conn; + tcp = (FAR struct tcp_conn_s *)conn; /* Save the send buffer size */ - conn->snd_bufs = buffersize; + tcp->snd_bufs = buffersize; } else #endif #if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) if (psock->s_type == SOCK_DGRAM) { - FAR struct udp_conn_s *conn; + FAR struct udp_conn_s *udp; - conn = (FAR struct udp_conn_s *)psock->s_conn; + udp = (FAR struct udp_conn_s *)conn; /* Save the send buffer size */ - conn->sndbufs = buffersize; + udp->sndbufs = buffersize; } else #endif