diff options
author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-11-11 11:17:38 -0800 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-11-11 11:17:38 -0800 |
commit | 6099655a4bbe1fd3e26b8afd2b91888ad2766086 (patch) | |
tree | cf8c255b8c05c008b5161ff3d2a14deaad1f1e28 /xkbcomp.c | |
parent | b7e88debd937be147d3581b9c8720c0bfe354052 (diff) |
Silence -Wshadow warnings
warning: declaration shadows a local variable [-Wshadow]
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'xkbcomp.c')
-rw-r--r-- | xkbcomp.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -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 |