summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--alias.c8
-rw-r--r--geometry.c8
-rw-r--r--xkbcomp.c14
3 files changed, 15 insertions, 15 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;
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 =
diff --git a/xkbcomp.c b/xkbcomp.c
index 2a3e8f4..063ae87 100644
--- a/xkbcomp.c
+++ b/xkbcomp.c
@@ -653,25 +653,25 @@ parseArgs(int argc, char *argv[])
len = strlen(inputFile);
if (inputFile[len - 1] == ')')
{
- char *tmp;
- if ((tmp = strchr(inputFile, '(')) != NULL)
+ char *tmpstr;
+ if ((tmpstr = strchr(inputFile, '(')) != NULL)
{
- *tmp = '\0';
+ *tmpstr = '\0';
inputFile[len - 1] = '\0';
- tmp++;
- if (*tmp == '\0')
+ tmpstr++;
+ if (*tmpstr == '\0')
{
WARN("Empty map in filename\n");
ACTION("Ignored\n");
}
else if (inputMap == NULL)
{
- inputMap = uStringDup(tmp);
+ inputMap = uStringDup(tmpstr);
}
else
{
WARN("Map specified in filename and with -m flag\n");
- ACTION1("map from name (\"%s\") ignored\n", tmp);
+ ACTION1("map from name (\"%s\") ignored\n", tmpstr);
}
}
else