diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-07-24 15:34:05 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-07-24 15:34:05 (GMT) |
| commit | 0a9367fbc97d46f8ce576938b3930fb4a8f451c9 (patch) | |
| tree | 8e2d1f52dda7f947aea136233d754d2f262eab81 /generic | |
| parent | 841ecebfa51d8efd3a77ff22cdfec76e4bd7a43b (diff) | |
| download | tcl-0a9367fbc97d46f8ce576938b3930fb4a8f451c9.zip tcl-0a9367fbc97d46f8ce576938b3930fb4a8f451c9.tar.gz tcl-0a9367fbc97d46f8ce576938b3930fb4a8f451c9.tar.bz2 | |
simplify moveBytes selection logic
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclIO.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 7e793a9..6052c43 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -8840,9 +8840,7 @@ TclCopyChannel( moveBytes = inStatePtr->inEofChar == '\0' /* No eofChar to stop input */ && inStatePtr->inputTranslation == TCL_TRANSLATE_LF && outStatePtr->outputTranslation == TCL_TRANSLATE_LF - && ((inStatePtr->encoding == NULL - && outStatePtr->encoding == NULL) - || (inStatePtr->encoding == outStatePtr->encoding)) + && inStatePtr->encoding == outStatePtr->encoding && !nonBlocking; /* First draft do only blocking case */ /* |