diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-19 13:23:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-19 13:23:48 (GMT) |
| commit | 2a8cf24f8b6953acb0d571b2a67d58ec966b3c1f (patch) | |
| tree | c46d004d0abf0953e188aada30d68d5972d49cef /generic/tclIO.c | |
| parent | 39841e0e25b84e494e2c893f8cdb06fc809cfabc (diff) | |
| parent | cb588d3c54594f7a36c89a55d6f2d5e8f39348c5 (diff) | |
| download | tcl-2a8cf24f8b6953acb0d571b2a67d58ec966b3c1f.zip tcl-2a8cf24f8b6953acb0d571b2a67d58ec966b3c1f.tar.gz tcl-2a8cf24f8b6953acb0d571b2a67d58ec966b3c1f.tar.bz2 | |
Merge 8.7
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 4e053e1..78cda5c 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -4975,8 +4975,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))); @@ -6098,8 +6097,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))); @@ -10240,8 +10238,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))); |