diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-07 07:42:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-07 07:42:03 (GMT) |
| commit | 97b08c9a24dd40233c45c0637be7370972ec7b0c (patch) | |
| tree | 0a4f179c562b1722721777ac589d7b98a8457f3f /generic/tclCmdMZ.c | |
| parent | b97b608974fe24725a6d53807d9b11a3b9c7f401 (diff) | |
| parent | 5500074eff2f8cd05b593f4dcac0aecd23e00b94 (diff) | |
| download | tcl-97b08c9a24dd40233c45c0637be7370972ec7b0c.zip tcl-97b08c9a24dd40233c45c0637be7370972ec7b0c.tar.gz tcl-97b08c9a24dd40233c45c0637be7370972ec7b0c.tar.bz2 | |
merge 8.7
Diffstat (limited to 'generic/tclCmdMZ.c')
| -rw-r--r-- | generic/tclCmdMZ.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index e8ace2a..f8b85b4 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -597,9 +597,9 @@ Tcl_RegsubObjCmd( * slightly modified version of the one pair STR_MAP code. */ - int slen, nocase; + int slen, nocase, wsrclc; int (*strCmpFn)(const Tcl_UniChar*,const Tcl_UniChar*,unsigned long); - Tcl_UniChar *p, wsrclc; + Tcl_UniChar *p; numMatches = 0; nocase = (cflags & TCL_REG_NOCASE); @@ -1999,8 +1999,8 @@ StringMapCmd( * larger strings. */ - int mapLen; - Tcl_UniChar *mapString, u2lc; + int mapLen, u2lc; + Tcl_UniChar *mapString; ustring2 = Tcl_GetUnicodeFromObj(mapElemv[0], &length2); p = ustring1; @@ -2031,8 +2031,8 @@ StringMapCmd( } } } else { - Tcl_UniChar **mapStrings, *u2lc = NULL; - int *mapLens; + Tcl_UniChar **mapStrings; + int *mapLens, *u2lc = NULL; /* * Precompute pointers to the unicode string and length. This saves us @@ -2044,7 +2044,7 @@ StringMapCmd( mapStrings = TclStackAlloc(interp, mapElemc*2*sizeof(Tcl_UniChar *)); mapLens = TclStackAlloc(interp, mapElemc * 2 * sizeof(int)); if (nocase) { - u2lc = TclStackAlloc(interp, mapElemc * sizeof(Tcl_UniChar)); + u2lc = TclStackAlloc(interp, mapElemc * sizeof(int)); } for (index = 0; index < mapElemc; index++) { mapStrings[index] = Tcl_GetUnicodeFromObj(mapElemv[index], |