[PATCH 14/14] os: Fix -Wshadow warnings

[Adam Jackson]

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 os/xdmauth.c |  4 ++--
 os/xdmcp.c   | 28 +++++++++++++---------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/os/xdmauth.c b/os/xdmauth.c
index 28584d2..6fe259a 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -241,7 +241,7 @@ XdmClientAuthTimeout(long now)
 
 static XdmClientAuthPtr
 XdmAuthorizationValidate(unsigned char *plain, int length,
-                         XdmAuthKeyPtr rho, ClientPtr xclient,
+                         XdmAuthKeyPtr _rho, ClientPtr xclient,
                          const char **reason)
 {
     XdmClientAuthPtr client, existing;
@@ -257,7 +257,7 @@ XdmAuthorizationValidate(unsigned char *plain, int length,
     if (!client)
         return NULL;
     XdmClientAuthDecode(plain, client);
-    if (!XdmcpCompareKeys(&client->rho, rho)) {
+    if (!XdmcpCompareKeys(&client->rho, _rho)) {
         free(client);
         if (reason)
             *reason = "Invalid XDM-AUTHORIZATION-1 key (failed key comparison)";
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 11f1133..58a6e7a 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -638,15 +638,15 @@ XdmcpCloseDisplay(int sock)
 XdmcpBlockHandler(pointer data, /* unused */
                   struct timeval **wt, pointer 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;
@@ -666,23 +666,23 @@ XdmcpBlockHandler(pointer data, /* unused */
 XdmcpWakeupHandler(pointer data,        /* unused */
                    int i, pointer pReadmask)
 {
-    fd_set *LastSelectMask = (fd_set *) pReadmask;
+    fd_set *last_select_mask = (fd_set *) pReadmask;
     fd_set devicesReadable;
 
     if (state == XDM_OFF)
         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
-        XFD_ANDSET(&devicesReadable, LastSelectMask, &EnabledDevices);
+        XFD_ANDSET(&devicesReadable, last_select_mask, &EnabledDevices);
         if (XFD_ANYSET(&devicesReadable)) {
             if (state == XDM_AWAIT_USER_INPUT)
                 restart();
@@ -709,12 +709,12 @@ XdmcpWakeupHandler(pointer data,        /* unused */
 
 static void
 XdmcpSelectHost(const struct sockaddr *host_sockaddr,
-                int host_len, ARRAY8Ptr AuthenticationName)
+                int host_len, ARRAY8Ptr authname)
 {
     state = XDM_START_CONNECTION;
     memmove(&req_sockaddr, host_sockaddr, host_len);
     req_socklen = host_len;
-    XdmcpSetAuthentication(AuthenticationName);
+    XdmcpSetAuthentication(authname);
     send_packet();
 }
 
@@ -727,9 +727,9 @@ XdmcpSelectHost(const struct sockaddr *host_sockaddr,
  /*ARGSUSED*/ static void
 XdmcpAddHost(const struct sockaddr *from,
              int fromlen,
-             ARRAY8Ptr AuthenticationName, ARRAY8Ptr hostname, ARRAY8Ptr status)
+             ARRAY8Ptr authname, ARRAY8Ptr hostname, ARRAY8Ptr status)
 {
-    XdmcpSelectHost(from, fromlen, AuthenticationName);
+    XdmcpSelectHost(from, fromlen, authname);
 }
 
 /*
@@ -1055,8 +1055,6 @@ send_query_msg(void)
     XdmcpWriteHeader(&buffer, &header);
     XdmcpWriteARRAYofARRAY8(&buffer, &AuthenticationNames);
     if (broadcast) {
-        int i;
-
         for (i = 0; i < NumBroadcastAddresses; i++)
             XdmcpFlush(xdmcpSocket, &buffer,
                        (XdmcpNetaddr) &BroadcastAddresses[i],
-- 
1.8.4.2