diff options
author | Siddharth Heroor <heroor@ti.com> | 2013-10-07 14:11:36 +0530 |
---|---|---|
committer | Ran Benita <ran234@gmail.com> | 2013-10-07 21:00:33 +0300 |
commit | 27f2743cf19ec6e2d4e8fe8d172a7e2e7cf99a38 (patch) | |
tree | 3128d987b0dea6b2d1d3999309d4debb6567ef4d /src/keysym-utf.c | |
parent | 1e52bf79951855914057d289e84aed1d98c2b331 (diff) | |
download | xorg-lib-libxkbcommon-27f2743cf19ec6e2d4e8fe8d172a7e2e7cf99a38.tar.gz |
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>
Diffstat (limited to 'src/keysym-utf.c')
-rw-r--r-- | src/keysym-utf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/keysym-utf.c b/src/keysym-utf.c index 5484a83..9a96053 100644 --- a/src/keysym-utf.c +++ b/src/keysym-utf.c @@ -838,20 +838,20 @@ static const struct codepair keysymtab[] = { static uint32_t bin_search(const struct codepair *table, size_t length, xkb_keysym_t keysym) { - int min = 0; - int max = length; + int first = 0; + int last = length; int mid; if (keysym < table[0].keysym || keysym > table[length].keysym) return 0; /* binary search in table */ - while (max >= min) { - mid = (min + max) / 2; + while (last >= first) { + mid = (first + last) / 2; if (table[mid].keysym < keysym) - min = mid + 1; + first = mid + 1; else if (table[mid].keysym > keysym) - max = mid - 1; + last = mid - 1; else /* found it */ return table[mid].ucs; } |