summaryrefslogtreecommitdiff
path: root/geometry.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 /geometry.c
parentb7e88debd937be147d3581b9c8720c0bfe354052 (diff)
downloadxorg-app-xkbcomp-6099655a4bbe1fd3e26b8afd2b91888ad2766086.tar.gz
Silence -Wshadow warnings
warning: declaration shadows a local variable [-Wshadow] Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'geometry.c')
-rw-r--r--geometry.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/geometry.c b/geometry.c
index 5e0e703..7f65c3a 100644
--- a/geometry.c
+++ b/geometry.c
@@ -3611,11 +3611,11 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info)
key->shape_ndx = 0;
else
{
- ShapeInfo *si;
- si = FindShape(info, ki->shape, "key", keyText(ki));
- if (!si)
+ ShapeInfo *sinfo;
+ sinfo = FindShape(info, ki->shape, "key", keyText(ki));
+ if (!sinfo)
return False;
- key->shape_ndx = si->index;
+ key->shape_ndx = sinfo->index;
}
if (ki->color != None)
color =