diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-03-05 14:23:38 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-03-05 14:23:38 (GMT) |
| commit | 23801213cacd306b0bfddbdb51efcd15c88ed0f9 (patch) | |
| tree | 4153d7c885a1b6867797e7c0e97b03539ce07c68 | |
| parent | 6ac36ed52bd548be97ae7baa3022e822f6a1bdce (diff) | |
| download | tcl-23801213cacd306b0bfddbdb51efcd15c88ed0f9.zip tcl-23801213cacd306b0bfddbdb51efcd15c88ed0f9.tar.gz tcl-23801213cacd306b0bfddbdb51efcd15c88ed0f9.tar.bz2 | |
Merge repair to correct failing tests.
| -rw-r--r-- | generic/tclIO.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 139a05e..6e3f0cf 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -5320,7 +5320,7 @@ ReadChars( * srcLen bytes, write no more than dstLimit bytes. */ - int code = Tcl_ExternalToUtf(NULL, statePtr->encoding, src, srcLen, + int code = Tcl_ExternalToUtf(NULL, encoding, src, srcLen, statePtr->inputEncodingFlags & (bufPtr->nextPtr ? ~0 : ~TCL_ENCODING_END), &statePtr->inputEncodingState, dst, dstLimit, &srcRead, &dstDecoded, &numChars); @@ -5441,7 +5441,7 @@ ReadChars( statePtr->inputEncodingFlags = savedIEFlags; statePtr->inputEncodingState = savedState; - Tcl_ExternalToUtf(NULL, statePtr->encoding, src, srcLen, + Tcl_ExternalToUtf(NULL, encoding, src, srcLen, statePtr->inputEncodingFlags & (bufPtr->nextPtr ? ~0 : ~TCL_ENCODING_END), &statePtr->inputEncodingState, buffer, TCL_UTF_MAX + 2, &read, &decoded, &count); |