StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keysym-utf: Fix a warning about shadowing 

Change variable names to avoid the name clash. The warning seen is

src/keysym-utf.c: In function 'bin_search':
src/keysym-utf.c:841: warning: declaration of 'min' shadows a global declaration
src/utils.h:109: warning: shadowed declaration is here
src/keysym-utf.c:842: warning: declaration of 'max' shadows a global declaration
src/utils.h:115: warning: shadowed declaration is here

Signed-off-by: Siddharth Heroor <heroor@ti.com>
master
Siddharth Heroor 2013-10-07 14:11:36 +05:30 committed by Ran Benita
parent 1e52bf7995
commit 27f2743cf1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/keysym-utf.c
View File

@ -838,20 +838,20 @@ static const struct codepair keysymtab[] = {
static uint32_t static uint32_t
bin_search(const struct codepair *table, size_t length, xkb_keysym_t keysym) bin_search(const struct codepair *table, size_t length, xkb_keysym_t keysym)
{ {
int min = 0; int first = 0;
int max = length; int last = length;
int mid; int mid;
if (keysym < table[0].keysym || keysym > table[length].keysym) if (keysym < table[0].keysym || keysym > table[length].keysym)
return 0; return 0;
/* binary search in table */ /* binary search in table */
while (max >= min) { while (last >= first) {
mid = (min + max) / 2; mid = (first + last) / 2;
if (table[mid].keysym < keysym) if (table[mid].keysym < keysym)
min = mid + 1; first = mid + 1;
else if (table[mid].keysym > keysym) else if (table[mid].keysym > keysym)
max = mid - 1; last = mid - 1;
else /* found it */ else /* found it */
return table[mid].ucs; return table[mid].ucs;
} }