fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-07 03:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

XKeysymToString: move variable declarations to the scope of their usage

Browse source 
Makes it easier for readers to understand scope of variable usage, and
clears up gcc warning:

KeysymStr.c: In function 'XKeysymToString':
KeysymStr.c:128:13: warning: declaration of 'i' shadows a previous local [-Wshadow]
KeysymStr.c:73:18: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Alan Coopersmith 2013-02-15 23:43:12 -08:00
parent f0b171c8ea
commit b092dabbd7
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/KeysymStr.c
View file

@ -70,11 +70,6 @@ SameValue(
char *XKeysymToString(KeySym ks)
{
register int i, n;
int h;
register int idx;
const unsigned char *entry;
unsigned char val1, val2, val3, val4;
XrmDatabase keysymdb;
if (!ks || (ks & ((unsigned long) ~0x1fffffff)) != 0)
@ -83,16 +78,17 @@ char *XKeysymToString(KeySym ks)
ks = 0;
if (ks <= 0x1fffffff)
{
val1 = ks >> 24;
val2 = (ks >> 16) & 0xff;
val3 = (ks >> 8) & 0xff;
val4 = ks & 0xff;
i = ks % VTABLESIZE;
h = i + 1;
n = VMAXHASH;
unsigned char val1 = ks >> 24;
unsigned char val2 = (ks >> 16) & 0xff;
unsigned char val3 = (ks >> 8) & 0xff;
unsigned char val4 = ks & 0xff;
int i = ks % VTABLESIZE;
int h = i + 1;
int n = VMAXHASH;
int idx;
while ((idx = hashKeysym[i]))
{
entry = &_XkeyTable[idx];
const unsigned char *entry = &_XkeyTable[idx];
if ((entry[0] == val1) && (entry[1] == val2) &&
(entry[2] == val3) && (entry[3] == val4))
return ((char *)entry + 4);
@ -136,7 +132,7 @@ char *XKeysymToString(KeySym ks)
i--;
s[i--] = '\0';
for (; i; i--){
val1 = val & 0xf;
unsigned char val1 = val & 0xf;
val >>= 4;
if (val1 < 10)
s[i] = '0'+ val1;