From a94e8258f72ab5db4b9a1de7e10140b8d622667b Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 9 Jan 2020 23:18:17 +0100 Subject: os: Fix -Wshadow errors commit 08d0481e299c28b64a0db9bb0782ba2b551028fd Author: Keith Packard Date: Sun Dec 15 01:12:22 2013 -0800 os: Fix -Wshadow errors Rename variables to avoid shadowing globals Signed-off-by: Keith Packard Reviewed-by: Eric Anholt --- nx-X11/programs/Xserver/os/xdmcp.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'nx-X11/programs/Xserver/os/xdmcp.c') diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c index 8da1131ed..458870357 100644 --- a/nx-X11/programs/Xserver/os/xdmcp.c +++ b/nx-X11/programs/Xserver/os/xdmcp.c @@ -679,15 +679,15 @@ XdmcpBlockHandler( struct timeval **wt, void * pReadmask) { - fd_set *LastSelectMask = (fd_set*)pReadmask; + fd_set *last_select_mask = (fd_set*)pReadmask; CARD32 millisToGo; if (state == XDM_OFF) return; - FD_SET(xdmcpSocket, LastSelectMask); + FD_SET(xdmcpSocket, last_select_mask); #if defined(IPv6) && defined(AF_INET6) if (xdmcpSocket6 >= 0) - FD_SET(xdmcpSocket6, LastSelectMask); + FD_SET(xdmcpSocket6, last_select_mask); #endif if (timeOutTime == 0) return; @@ -710,7 +710,7 @@ XdmcpWakeupHandler( int i, void * pReadmask) { - fd_set* LastSelectMask = (fd_set*)pReadmask; + fd_set* last_select_mask = (fd_set*)pReadmask; #ifdef NX_TRANS_SOCKET @@ -723,16 +723,16 @@ XdmcpWakeupHandler( return; if (i > 0) { - if (FD_ISSET(xdmcpSocket, LastSelectMask)) + if (FD_ISSET(xdmcpSocket, last_select_mask)) { receive_packet(xdmcpSocket); - FD_CLR(xdmcpSocket, LastSelectMask); + FD_CLR(xdmcpSocket, last_select_mask); } #if defined(IPv6) && defined(AF_INET6) - if (xdmcpSocket6 >= 0 && FD_ISSET(xdmcpSocket6, LastSelectMask)) + if (xdmcpSocket6 >= 0 && FD_ISSET(xdmcpSocket6, last_select_mask)) { receive_packet(xdmcpSocket6); - FD_CLR(xdmcpSocket6, LastSelectMask); + FD_CLR(xdmcpSocket6, last_select_mask); } #endif } @@ -757,12 +757,12 @@ static void XdmcpSelectHost( struct sockaddr *host_sockaddr, int host_len, - ARRAY8Ptr AuthenticationName) + ARRAY8Ptr auth_name) { state = XDM_START_CONNECTION; memmove(&req_sockaddr, host_sockaddr, host_len); req_socklen = host_len; - XdmcpSetAuthentication (AuthenticationName); + XdmcpSetAuthentication (auth_name); send_packet(); } @@ -777,11 +777,11 @@ static void XdmcpAddHost( struct sockaddr *from, int fromlen, - ARRAY8Ptr AuthenticationName, + ARRAY8Ptr auth_name, ARRAY8Ptr hostname, ARRAY8Ptr status) { - XdmcpSelectHost(from, fromlen, AuthenticationName); + XdmcpSelectHost(from, fromlen, auth_name); } /* @@ -1066,8 +1066,6 @@ send_query_msg(void) XdmcpWriteARRAYofARRAY8 (&buffer, &AuthenticationNames); if (broadcast) { - int i; - for (i = 0; i < NumBroadcastAddresses; i++) XdmcpFlush (xdmcpSocket, &buffer, (XdmcpNetaddr) &BroadcastAddresses[i], sizeof (struct sockaddr_in)); -- cgit v1.2.3