XKeysymToString: move variable declarations to the scope of their usage

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> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

XKeysymToString: move variable declarations to the scope of their usage
d43f4c39 · Alan Coopersmith · Ulrich Sibiller · 5e0584c4 · d43f4c39
Commit d43f4c39 authored Feb 15, 2013 by Alan Coopersmith Committed by Ulrich Sibiller Oct 19, 2016
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 14 deletions

KeysymStr.c nx-X11/lib/X11/KeysymStr.c +10 -14

No files found.
--- a/nx-X11/lib/X11/KeysymStr.c
+++ b/nx-X11/lib/X11/KeysymStr.c
@@ -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;
+	unsigned char val1 = ks >> 24;
-	val2 = (ks >> 16) & 0xff;
+	unsigned char val2 = (ks >> 16) & 0xff;
-	val3 = (ks >> 8) & 0xff;
+	unsigned char val3 = (ks >> 8) & 0xff;
-	val4 = ks & 0xff;
+	unsigned char val4 = ks & 0xff;
-	i = ks % VTABLESIZE;
+	int i = ks % VTABLESIZE;
-	h = i + 1;
+	int h = i + 1;
-	n = VMAXHASH;
+	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;