os: Fix -Wshadow errors

nx-X11/programs/Xserver/os/xdmauth.c

@@ -61,7 +61,7 @@ static Bool authFromXDMCP;
 static XdmAuthKeyRec	privateKey;
 static char XdmAuthenticationName[] = "XDM-AUTHENTICATION-1";
 #define XdmAuthenticationNameLen (sizeof XdmAuthenticationName - 1)
-static XdmAuthKeyRec	rho;
+static XdmAuthKeyRec	global_rho;
 
 static Bool 
 XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData, 
@@ -76,7 +76,7 @@ XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData,
 	    return FALSE;
     	incoming = (XdmAuthKeyPtr) incomingData->data;
     	XdmcpDecrementKey (incoming);
-    	return XdmcpCompareKeys (incoming, &rho);
+    	return XdmcpCompareKeys (incoming, &global_rho);
     }
     return FALSE;
 }
@@ -89,7 +89,7 @@ XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData,
     outgoingData->data = 0;
     if (packet_type == REQUEST) {
 	if (XdmcpAllocARRAY8 (outgoingData, 8))
-            XdmcpWrap ((unsigned char *)&rho, (unsigned char *)&privateKey,
+            XdmcpWrap ((unsigned char *)&global_rho, (unsigned char *)&privateKey,
                        outgoingData->data, 8);
     }
     return TRUE;
@@ -152,10 +152,10 @@ XdmAuthenticationInit (char *cookie, int cookie_len)
 	    cookie_len = 7;
     	memmove (privateKey.data + 1, cookie, cookie_len);
     }
-    XdmcpGenerateKey (&rho);
+    XdmcpGenerateKey (&global_rho);
     XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen,
-                                 (char *)&rho,
-				 sizeof (rho),
+                                 (char *)&global_rho,
+				 sizeof (global_rho),
                                  (ValidatorFunc)XdmAuthenticationValidator,
                                  (GeneratorFunc)XdmAuthenticationGenerator,
                                  (AddAuthorFunc)XdmAuthenticationAddAuth);
@@ -340,7 +340,7 @@ XdmAddCookie (unsigned short data_length, char *data, XID id)
 	{
 	    /* R5 xdm sent bogus authorization data in the accept packet,
 	     * but we can recover */
-	    rho_bits = rho.data;
+	    rho_bits = global_rho.data;
 	    key_bits = (unsigned char *) data;
 	    key_bits[0] = '\0';
 	}
@@ -353,7 +353,7 @@ XdmAddCookie (unsigned short data_length, char *data, XID id)
 	break;
 #ifdef XDMCP
     case 8:		    /* auth from XDMCP is 8 bytes long */
-	rho_bits = rho.data;
+	rho_bits = global_rho.data;
 	key_bits = (unsigned char *) data;
 	break;
 #endif
@@ -477,7 +477,7 @@ XdmRemoveCookie (unsigned short data_length, char *data)
 	break;
 #ifdef XDMCP
     case 8:
-	rho_bits = ρ
+	rho_bits = &global_rho;
 	key_bits = (XdmAuthKeyPtr) data;
 	break;
 #endif

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));