diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-05-08 16:12:35 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-05-08 16:12:35 (GMT) |
| commit | f1ace09e643a7bc50e89f7d22ab5243b626a18e1 (patch) | |
| tree | 37b61c906c9d34ef48595c594969a6b1335c835c /generic/tclIO.c | |
| parent | 65baa666b5def661480dcc244b252f767f29d8c9 (diff) | |
| parent | f54edc88cf77d0730beab7375ae4e3f4c3e87585 (diff) | |
| download | tcl-f1ace09e643a7bc50e89f7d22ab5243b626a18e1.zip tcl-f1ace09e643a7bc50e89f7d22ab5243b626a18e1.tar.gz tcl-f1ace09e643a7bc50e89f7d22ab5243b626a18e1.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index c4d9171..67c9c3f 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -2313,7 +2313,7 @@ PreserveChannelBuffer( ChannelBuffer *bufPtr) { if (bufPtr->refCount == 0) { - Tcl_Panic("Reuse of ChannelBuffer!"); + Tcl_Panic("Reuse of ChannelBuffer! %p", bufPtr); } bufPtr->refCount++; } @@ -2703,9 +2703,7 @@ FlushChannel( wroteSome = 1; } - if (!IsBufferEmpty(bufPtr)) { - bufPtr->nextRemoved += written; - } + bufPtr->nextRemoved += written; /* * If this buffer is now empty, recycle it. @@ -2717,11 +2715,8 @@ FlushChannel( statePtr->outQueueTail = NULL; } RecycleBuffer(statePtr, bufPtr, 0); - bufPtr = NULL; - } - if (bufPtr) { - ReleaseChannelBuffer(bufPtr); } + ReleaseChannelBuffer(bufPtr); } /* Closes "while (1)". */ /* |