diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-01-23 16:42:15 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-01-23 16:42:15 (GMT) |
| commit | c93ca3534a26772f8acc81f3432c1bc74da5c701 (patch) | |
| tree | 5fa5c50aa0b980fc25477f158eea2a756922fadd /generic/tclIO.c | |
| parent | 8399b253ca7479b09d5d05ce4e81a9c9697a3582 (diff) | |
| download | tcl-c93ca3534a26772f8acc81f3432c1bc74da5c701.zip tcl-c93ca3534a26772f8acc81f3432c1bc74da5c701.tar.gz tcl-c93ca3534a26772f8acc81f3432c1bc74da5c701.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index af0055e..d9f2d39 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclIO.c,v 1.121.2.8 2007/12/10 18:32:56 dgp Exp $ + * RCS: @(#) $Id: tclIO.c,v 1.121.2.9 2008/01/23 16:42:18 dgp Exp $ */ #include "tclInt.h" @@ -3953,12 +3953,6 @@ Tcl_GetsObj( char *dst, *dstEnd, *eol, *eof; Tcl_EncodingState oldState; - /* - * This operation should occur at the top of a channel stack. - */ - - chanPtr = statePtr->topChanPtr; - if (CheckChannelErrors(statePtr, TCL_READABLE) != 0) { copiedTotal = -1; goto done; @@ -3976,6 +3970,12 @@ Tcl_GetsObj( return TclGetsObjBinary(chan, objPtr); } + /* + * This operation should occur at the top of a channel stack. + */ + + chanPtr = statePtr->topChanPtr; + bufPtr = statePtr->inQueueHead; encoding = statePtr->encoding; @@ -4316,6 +4316,12 @@ TclGetsObjBinary( int rawLen, byteLen, eolChar; unsigned char *dst, *dstEnd, *eol, *eof, *byteArray; + /* + * This operation should occur at the top of a channel stack. + */ + + chanPtr = statePtr->topChanPtr; + bufPtr = statePtr->inQueueHead; /* |