diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-29 22:02:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-29 22:02:33 (GMT) |
| commit | 6963024f13c68b475b0768c3ba23d9ee53ba8f14 (patch) | |
| tree | e659848b4b174dcf799c93c0fadcefd9d1daa86e | |
| parent | 14ab5ccf54dac59237afc1a65d09a4a4860f197b (diff) | |
| parent | 07279ebb64ef3359cd341e8ef7f8f99ea36dedd1 (diff) | |
| download | tcl-6963024f13c68b475b0768c3ba23d9ee53ba8f14.zip tcl-6963024f13c68b475b0768c3ba23d9ee53ba8f14.tar.gz tcl-6963024f13c68b475b0768c3ba23d9ee53ba8f14.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tclIO.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index 0d047aa..6461909 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -707,7 +707,7 @@ TclFinalizeIOSubsystem(void) TclpFinalizeSockets(); TclpFinalizePipes(); } - + /* *---------------------------------------------------------------------- * @@ -4392,7 +4392,8 @@ Write( ChannelState *statePtr = chanPtr->state; /* State info for channel */ char *nextNewLine = NULL; - int endEncoding, saved = 0, total = 0, flushed = 0, needNlFlush = 0; + int endEncoding, needNlFlush = 0; + int saved = 0, total = 0, flushed = 0; char safe[BUFFER_PADDING]; int encodingError = 0; @@ -9784,9 +9785,10 @@ CopyData( Tcl_Obj *cmdPtr, *errObj = NULL, *bufObj = NULL, *msg = NULL; Tcl_Channel inChan, outChan; ChannelState *inStatePtr, *outStatePtr; - int result = TCL_OK, size; + int result = TCL_OK; Tcl_Size sizeb; Tcl_WideInt total; + int size; const char *buffer; int inBinary, outBinary, sameEncoding; /* Encoding control */ |