diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-04-15 10:12:18 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-04-15 10:12:18 (GMT) |
| commit | 868c49e500dc6cc9039da6bbbdf539c7559fa109 (patch) | |
| tree | f0aa1e792f906fb30056c652360718f6f597e9a9 /generic/tclZlib.c | |
| parent | 2e1f8f2c31f3860a2302b9e51f8c6773211cd78a (diff) | |
| parent | b54406ffc1f268bdb88f9512f500f04e0bc0be2f (diff) | |
| download | tcl-868c49e500dc6cc9039da6bbbdf539c7559fa109.zip tcl-868c49e500dc6cc9039da6bbbdf539c7559fa109.tar.gz tcl-868c49e500dc6cc9039da6bbbdf539c7559fa109.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclZlib.c')
| -rw-r--r-- | generic/tclZlib.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c index 068308a..9b231df 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -2691,27 +2691,29 @@ ZlibTransformSetOption( /* not used */ */ cd->outStream.avail_in = 0; - do { + while (1) { int e; cd->outStream.next_out = (Bytef *) cd->outBuffer; cd->outStream.avail_out = cd->outAllocated; e = deflate(&cd->outStream, flushType); - if (e != Z_OK) { + if (e == Z_BUF_ERROR) { + break; + } else if (e != Z_OK) { ConvertError(interp, e); return TCL_ERROR; + } else if (cd->outStream.avail_out == 0) { + break; } - if (cd->outStream.avail_out > 0) { - if (Tcl_WriteRaw(cd->parent, cd->outBuffer, - PTR2INT(cd->outStream.next_out)) < 0) { - Tcl_AppendResult(interp, "problem flushing channel: ", - Tcl_PosixError(interp), NULL); - return TCL_ERROR; - } + if (Tcl_WriteRaw(cd->parent, cd->outBuffer, + cd->outStream.next_out - (Bytef*)cd->outBuffer) < 0) { + Tcl_AppendResult(interp, "problem flushing channel: ", + Tcl_PosixError(interp), NULL); + return TCL_ERROR; } - } while (cd->outStream.avail_out > 0); + } return TCL_OK; } |