summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-05-08 16:12:35 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-05-08 16:12:35 (GMT)
commit7444d05c9414f8357eedf9bd5b0c7bab1ad28db6 (patch)
tree37b61c906c9d34ef48595c594969a6b1335c835c
parent311f44633e3dab963b7705cd04ffa3a4b6c4dcce (diff)
parent4f9f25fc55b73b0eb82e118bb35b6e41ce173a27 (diff)
downloadtcl-7444d05c9414f8357eedf9bd5b0c7bab1ad28db6.zip
tcl-7444d05c9414f8357eedf9bd5b0c7bab1ad28db6.tar.gz
tcl-7444d05c9414f8357eedf9bd5b0c7bab1ad28db6.tar.bz2
merge trunk
-rw-r--r--generic/tclIO.c11
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)". */
/*