diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-14 09:38:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-14 09:38:56 +0100 |
| commit | 156e37d3879b316329e3e05579414031da2647e2 (patch) | |
| tree | 59fb1dce046fd3aab228e224bff8b0c1d074f876 /xkbcomp/xkbcomp.c | |
| parent | d783adea42f29bd7917929597ca1031b70587e1d (diff) | |
| download | vcxsrv-156e37d3879b316329e3e05579414031da2647e2.tar.gz vcxsrv-156e37d3879b316329e3e05579414031da2647e2.tar.bz2 vcxsrv-156e37d3879b316329e3e05579414031da2647e2.zip | |
libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update
14 nov 2011
Diffstat (limited to 'xkbcomp/xkbcomp.c')
| -rw-r--r-- | xkbcomp/xkbcomp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xkbcomp/xkbcomp.c b/xkbcomp/xkbcomp.c index 2a3e8f48a..063ae8741 100644 --- a/xkbcomp/xkbcomp.c +++ b/xkbcomp/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 |