andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

os: Fix -Wshadow errors

Browse Source 
Rename variables to avoid shadowing globals

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Keith Packard 2013-12-15 01:12:22 -08:00
parent 1487145b41
commit 08d0481e29
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
os/xdmauth.c
View File

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

28
os/xdmcp.c
View File

@ -641,15 +641,15 @@ XdmcpCloseDisplay(int sock)
XdmcpBlockHandler(void *data, /* unused */ XdmcpBlockHandler(void *data, /* unused */
struct timeval **wt, void *pReadmask) struct timeval **wt, void *pReadmask)
{ {
fd_set *LastSelectMask = (fd_set *) pReadmask; fd_set *last_select_mask = (fd_set *) pReadmask;
CARD32 millisToGo; CARD32 millisToGo;
if (state == XDM_OFF) if (state == XDM_OFF)
return; return;
FD_SET(xdmcpSocket, LastSelectMask); FD_SET(xdmcpSocket, last_select_mask);
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6) && defined(AF_INET6)
if (xdmcpSocket6 >= 0) if (xdmcpSocket6 >= 0)
FD_SET(xdmcpSocket6, LastSelectMask); FD_SET(xdmcpSocket6, last_select_mask);
#endif #endif
if (timeOutTime == 0) if (timeOutTime == 0)
return; return;
@ -669,23 +669,23 @@ XdmcpBlockHandler(void *data, /* unused */
XdmcpWakeupHandler(void *data, /* unused */ XdmcpWakeupHandler(void *data, /* unused */
int i, void *pReadmask) int i, void *pReadmask)
{ {
fd_set *LastSelectMask = (fd_set *) pReadmask; fd_set *last_select_mask = (fd_set *) pReadmask;
fd_set devicesReadable; fd_set devicesReadable;
if (state == XDM_OFF) if (state == XDM_OFF)
return; return;
if (i > 0) { if (i > 0) {
if (FD_ISSET(xdmcpSocket, LastSelectMask)) { if (FD_ISSET(xdmcpSocket, last_select_mask)) {
receive_packet(xdmcpSocket); receive_packet(xdmcpSocket);
FD_CLR(xdmcpSocket, LastSelectMask); FD_CLR(xdmcpSocket, last_select_mask);
} }
#if defined(IPv6) && defined(AF_INET6) #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); receive_packet(xdmcpSocket6);
FD_CLR(xdmcpSocket6, LastSelectMask); FD_CLR(xdmcpSocket6, last_select_mask);
} }
#endif #endif
XFD_ANDSET(&devicesReadable, LastSelectMask, &EnabledDevices); XFD_ANDSET(&devicesReadable, last_select_mask, &EnabledDevices);
if (XFD_ANYSET(&devicesReadable)) { if (XFD_ANYSET(&devicesReadable)) {
if (state == XDM_AWAIT_USER_INPUT) if (state == XDM_AWAIT_USER_INPUT)
restart(); restart();
@ -712,12 +712,12 @@ XdmcpWakeupHandler(void *data, /* unused */
static void static void
XdmcpSelectHost(const struct sockaddr *host_sockaddr, XdmcpSelectHost(const struct sockaddr *host_sockaddr,
int host_len, ARRAY8Ptr AuthenticationName) int host_len, ARRAY8Ptr auth_name)
{ {
state = XDM_START_CONNECTION; state = XDM_START_CONNECTION;
memmove(&req_sockaddr, host_sockaddr, host_len); memmove(&req_sockaddr, host_sockaddr, host_len);
req_socklen = host_len; req_socklen = host_len;
XdmcpSetAuthentication(AuthenticationName); XdmcpSetAuthentication(auth_name);
send_packet(); send_packet();
} }
@ -730,9 +730,9 @@ XdmcpSelectHost(const struct sockaddr *host_sockaddr,
/*ARGSUSED*/ static void /*ARGSUSED*/ static void
XdmcpAddHost(const struct sockaddr *from, XdmcpAddHost(const struct sockaddr *from,
int fromlen, 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); XdmcpWriteHeader(&buffer, &header);
XdmcpWriteARRAYofARRAY8(&buffer, &AuthenticationNames); XdmcpWriteARRAYofARRAY8(&buffer, &AuthenticationNames);
if (broadcast) { if (broadcast) {
int i;
for (i = 0; i < NumBroadcastAddresses; i++) for (i = 0; i < NumBroadcastAddresses; i++)
XdmcpFlush(xdmcpSocket, &buffer, XdmcpFlush(xdmcpSocket, &buffer,
(XdmcpNetaddr) &BroadcastAddresses[i], (XdmcpNetaddr) &BroadcastAddresses[i],