diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-08-02 04:38:36 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-08-02 04:38:36 (GMT) |
| commit | 445b84eada8389d5ac8104d6ab3934669f3766e8 (patch) | |
| tree | 97462440f4c2007ed1f278b83ac72440eebfc2bc /generic | |
| parent | 1b69ea0743abc137b40161caf7290fa4d9a3d8d0 (diff) | |
| parent | 3260faadc49ded6ca1d4aab4db21b5232cc647ff (diff) | |
| download | tcl-445b84eada8389d5ac8104d6ab3934669f3766e8.zip tcl-445b84eada8389d5ac8104d6ab3934669f3766e8.tar.gz tcl-445b84eada8389d5ac8104d6ab3934669f3766e8.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclExecute.c | 2 | ||||
| -rw-r--r-- | generic/tclIO.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 2098e50..2e03ab4 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -5079,7 +5079,7 @@ TEBCresume( valuePtr = OBJ_AT_TOS; opnd = TclGetInt4AtPtr(pc+1); - TRACE(("\%.30s\" %d => ", O2S(valuePtr), opnd)); + TRACE(("\"%.30s\" %d => ", O2S(valuePtr), opnd)); /* * Get the contents of the list, making sure that it really is a list diff --git a/generic/tclIO.c b/generic/tclIO.c index 7381f4d..c142917 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -626,6 +626,7 @@ TclFinalizeIOSubsystem(void) if (active) { + TclChannelPreserve((Tcl_Channel)chanPtr); /* * TIP #398: by default, we no longer set the channel back into * blocking mode. To restore the old blocking behavior, the @@ -684,6 +685,7 @@ TclFinalizeIOSubsystem(void) chanPtr->instanceData = NULL; SetFlag(statePtr, CHANNEL_DEAD); } + TclChannelRelease((Tcl_Channel)chanPtr); } } |