diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-11-30 17:52:09 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-11-30 17:52:09 (GMT) |
| commit | 49e332ded25e7502ce49b62bb7ef6b22cdd2e90f (patch) | |
| tree | 26dbaafb612b99b197231d5759173873cbb1d4e9 /generic/tclUtil.c | |
| parent | 079887fe42be52a69c2b001ae3efb5dae39862e6 (diff) | |
| parent | db726dc570738b047f110645527b804c3b59d28e (diff) | |
| download | tcl-49e332ded25e7502ce49b62bb7ef6b22cdd2e90f.zip tcl-49e332ded25e7502ce49b62bb7ef6b22cdd2e90f.tar.gz tcl-49e332ded25e7502ce49b62bb7ef6b22cdd2e90f.tar.bz2 | |
merge 8.7
Diffstat (limited to 'generic/tclUtil.c')
| -rw-r--r-- | generic/tclUtil.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index e5a54c5..4f72917 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -1664,6 +1664,7 @@ TclTrimRight( { const char *p = bytes + numBytes; int pInc; + Tcl_UniChar ch1 = 0, ch2 = 0; if ((bytes[numBytes] != '\0') || (trim[numTrim] != '\0')) { Tcl_Panic("TclTrimRight works only on null-terminated strings"); @@ -1682,7 +1683,6 @@ TclTrimRight( */ do { - Tcl_UniChar ch1; const char *q = trim; int bytesLeft = numTrim; @@ -1694,7 +1694,6 @@ TclTrimRight( */ do { - Tcl_UniChar ch2; int qInc = TclUtfToUniChar(q, &ch2); if (ch1 == ch2) { @@ -1744,6 +1743,7 @@ TclTrimLeft( int numTrim) /* ...and its length in bytes */ { const char *p = bytes; + Tcl_UniChar ch1 = 0, ch2 = 0; if ((bytes[numBytes] != '\0') || (trim[numTrim] != '\0')) { Tcl_Panic("TclTrimLeft works only on null-terminated strings"); @@ -1762,7 +1762,6 @@ TclTrimLeft( */ do { - Tcl_UniChar ch1; int pInc = TclUtfToUniChar(p, &ch1); const char *q = trim; int bytesLeft = numTrim; @@ -1772,7 +1771,6 @@ TclTrimLeft( */ do { - Tcl_UniChar ch2; int qInc = TclUtfToUniChar(q, &ch2); if (ch1 == ch2) { @@ -2106,7 +2104,7 @@ Tcl_StringCaseMatch( { int p, charLen; const char *pstart = pattern; - Tcl_UniChar ch1, ch2; + Tcl_UniChar ch1 = 0, ch2 = 0; while (1) { p = *pattern; @@ -2216,7 +2214,7 @@ Tcl_StringCaseMatch( */ if (p == '[') { - Tcl_UniChar startChar, endChar; + Tcl_UniChar startChar = 0, endChar = 0; pattern++; if (UCHAR(*str) < 0x80) { |