diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-19 12:36:57 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-19 12:36:57 (GMT) |
| commit | cb588d3c54594f7a36c89a55d6f2d5e8f39348c5 (patch) | |
| tree | e7b12c42a2501a8952f5abac5070d7bff30c735c /generic/tclIO.c | |
| parent | 072c5b11392289eeeb1813fa9deecd946db1e916 (diff) | |
| parent | c670267c5ecc42904d39383d08154bde04d021bd (diff) | |
| download | tcl-cb588d3c54594f7a36c89a55d6f2d5e8f39348c5.zip tcl-cb588d3c54594f7a36c89a55d6f2d5e8f39348c5.tar.gz tcl-cb588d3c54594f7a36c89a55d6f2d5e8f39348c5.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 7ed6993..9cdf1aa 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -5044,8 +5044,7 @@ Tcl_GetsObj( done: assert(!GotFlag(statePtr, CHANNEL_EOF) - || GotFlag(statePtr, CHANNEL_STICKY_EOF) - || GotFlag(statePtr, CHANNEL_ENCODING_ERROR) + || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); @@ -6173,8 +6172,7 @@ finish: */ assert(!GotFlag(statePtr, CHANNEL_EOF) - || GotFlag(statePtr, CHANNEL_STICKY_EOF) - || GotFlag(statePtr, CHANNEL_ENCODING_ERROR) + || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); @@ -10406,8 +10404,7 @@ DoRead( } assert(!GotFlag(statePtr, CHANNEL_EOF) - || GotFlag(statePtr, CHANNEL_STICKY_EOF) - || GotFlag(statePtr, CHANNEL_ENCODING_ERROR) + || GotFlag(statePtr, CHANNEL_STICKY_EOF|CHANNEL_ENCODING_ERROR) || Tcl_InputBuffered((Tcl_Channel)chanPtr) == 0); assert(!(GotFlag(statePtr, CHANNEL_EOF|CHANNEL_BLOCKED) == (CHANNEL_EOF|CHANNEL_BLOCKED))); |