diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-06 20:50:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-04-06 20:50:10 (GMT) |
| commit | 6e89d3d4331e3490a3b631c36ee615d12cfbe53f (patch) | |
| tree | f41ded97c6aa26a15808801bc50a3ca9363b72ec | |
| parent | f47fbe763af41b982b9233bca58795cd34b2c259 (diff) | |
| parent | ed8749e3d8e96b45b6296e804b00af547a0aaf04 (diff) | |
| download | tcl-6e89d3d4331e3490a3b631c36ee615d12cfbe53f.zip tcl-6e89d3d4331e3490a3b631c36ee615d12cfbe53f.tar.gz tcl-6e89d3d4331e3490a3b631c36ee615d12cfbe53f.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclUtil.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 96287bd..a697734 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -1673,7 +1673,7 @@ TrimRight( { const char *p = bytes + numBytes; size_t pInc; - Tcl_UniChar ch1 = 0, ch2 = 0; + int ch1, ch2; /* * Outer loop: iterate over string to be trimmed. @@ -1684,14 +1684,14 @@ TrimRight( size_t bytesLeft = numTrim; p = Tcl_UtfPrev(p, bytes); - pInc = TclUtfToUniChar(p, &ch1); + pInc = TclUtfToUCS4(p, &ch1); /* * Inner loop: scan trim string for match to current character. */ do { - size_t qInc = TclUtfToUniChar(q, &ch2); + size_t qInc = TclUtfToUCS4(q, &ch2); if (ch1 == ch2) { break; @@ -1771,14 +1771,14 @@ TrimLeft( size_t numTrim) /* ...and its length in bytes */ { const char *p = bytes; - Tcl_UniChar ch1 = 0, ch2 = 0; + int ch1, ch2; /* * Outer loop: iterate over string to be trimmed. */ do { - size_t pInc = TclUtfToUniChar(p, &ch1); + size_t pInc = TclUtfToUCS4(p, &ch1); const char *q = trim; size_t bytesLeft = numTrim; @@ -1787,7 +1787,7 @@ TrimLeft( */ do { - size_t qInc = TclUtfToUniChar(q, &ch2); + size_t qInc = TclUtfToUCS4(q, &ch2); if (ch1 == ch2) { break; |