Commit 08d0481e authored by Keith Packard's avatar Keith Packard

os: Fix -Wshadow errors

Rename variables to avoid shadowing globals
Signed-off-by: Keith Packard's avatarKeith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
parent 1487145b
......@@ -62,7 +62,7 @@ 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,
......@@ -77,7 +77,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;
}
......@@ -90,7 +90,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;
......@@ -150,10 +150,10 @@ XdmAuthenticationInit(const 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);
......@@ -328,7 +328,7 @@ XdmAddCookie(unsigned short data_length, const char *data, XID id)
if (authFromXDMCP) {
/* 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';
}
......@@ -341,7 +341,7 @@ XdmAddCookie(unsigned short data_length, const 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
......@@ -466,7 +466,7 @@ XdmRemoveCookie(unsigned short data_length, const char *data)
break;
#ifdef XDMCP
case 8:
rho_bits = &rho;
rho_bits = &global_rho;
key_bits = (XdmAuthKeyPtr) data;
break;
#endif
......
......@@ -641,15 +641,15 @@ XdmcpCloseDisplay(int sock)
XdmcpBlockHandler(void *data, /* unused */
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;
......@@ -669,23 +669,23 @@ XdmcpBlockHandler(void *data, /* unused */
XdmcpWakeupHandler(void *data, /* unused */
int i, void *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();
......@@ -712,12 +712,12 @@ XdmcpWakeupHandler(void *data, /* unused */
static void
XdmcpSelectHost(const struct sockaddr *host_sockaddr,
int host_len, ARRAY8Ptr AuthenticationName)
int host_len, 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();
}
......@@ -730,9 +730,9 @@ XdmcpSelectHost(const struct sockaddr *host_sockaddr,
/*ARGSUSED*/ static void
XdmcpAddHost(const struct sockaddr *from,
int fromlen,
ARRAY8Ptr AuthenticationName, ARRAY8Ptr hostname, ARRAY8Ptr status)
ARRAY8Ptr auth_name, ARRAY8Ptr hostname, ARRAY8Ptr status)
{
XdmcpSelectHost(from, fromlen, AuthenticationName);
XdmcpSelectHost(from, fromlen, auth_name);
}
/*
......@@ -1058,8 +1058,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],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment