diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 13:01:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 13:01:59 (GMT) |
| commit | 65ac602b3d4224d0414e7b060f9d112f26270d98 (patch) | |
| tree | 7a5e13872d4b78c5f7eca83b17f30b106219a65a | |
| parent | 33781b4f56a17a08c2a610101656daed7b75a346 (diff) | |
| parent | 538b919b189ab1c46fa7b74b99c503240dfc0f6f (diff) | |
| download | tcl-65ac602b3d4224d0414e7b060f9d112f26270d98.zip tcl-65ac602b3d4224d0414e7b060f9d112f26270d98.tar.gz tcl-65ac602b3d4224d0414e7b060f9d112f26270d98.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tclZlib.c | 4 | ||||
| -rw-r--r-- | tests/zlib.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c index dad37a4..e70c4b3 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -3066,7 +3066,7 @@ ZlibTransformInput( /* buffer to start, we can read to whole available buffer */ cd->inStream.next_in = (Bytef *) cd->inBuffer; } - /* + /* * If done - no read needed anymore, check we have to copy rest of * decompressed data, otherwise return with size (or 0 for Eof) */ @@ -3150,7 +3150,7 @@ copyDecompressed: continue; } *errorCodePtr = EAGAIN; - return -1; + return -1; } break; } diff --git a/tests/zlib.test b/tests/zlib.test index d3a6dff..463cc7c 100644 --- a/tests/zlib.test +++ b/tests/zlib.test @@ -1032,7 +1032,7 @@ test zlib-13.1 {Ticket [8af92dfb66] - zlib stream mis-expansion} -constraints zl close $chanin close $chanout } -body { - file size $pathout + file size $pathout } -cleanup { removeFile $pathout unset chanin pathin chanout pathout @@ -1069,7 +1069,7 @@ test zlib-13.2 {Ticket [f70ce1fead] - zlib multi-stream expansion} -constraints fcopy $chanin $chanout chan pop $chanin close $chanout - # + # list [file size $pathout1] [file size $pathout2] } -cleanup { close $chanin |