summaryrefslogtreecommitdiff
path: root/alias.c
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-11-11 11:17:38 -0800
committerJeremy Huddleston <jeremyhu@apple.com>2011-11-11 11:17:38 -0800
commit6099655a4bbe1fd3e26b8afd2b91888ad2766086 (patch)
treecf8c255b8c05c008b5161ff3d2a14deaad1f1e28 /alias.c
parentb7e88debd937be147d3581b9c8720c0bfe354052 (diff)
Silence -Wshadow warnings
warning: declaration shadows a local variable [-Wshadow] Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'alias.c')
-rw-r--r--alias.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/alias.c b/alias.c
index ca56909..f28c2d2 100644
--- a/alias.c
+++ b/alias.c
@@ -215,10 +215,10 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
{
if (strncmp(a->alias, info->alias, XkbKeyNameLength) == 0)
{
- AliasInfo old;
- InitAliasInfo(&old, MergeAugment, 0, a->alias, a->real);
- HandleCollision(&old, info);
- memcpy(old.real, a->real, XkbKeyNameLength);
+ AliasInfo oldai;
+ InitAliasInfo(&oldai, MergeAugment, 0, a->alias, a->real);
+ HandleCollision(&oldai, info);
+ memcpy(oldai.real, a->real, XkbKeyNameLength);
info->alias[0] = '\0';
nNew--;
break;