X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5be59dc5b269a84ea529b7f97652e48077286696..f80621049e9b2b2070920ef364c272b6ddaec073:/token.c diff --git a/token.c b/token.c index 87bba582..9d3bccdf 100644 --- a/token.c +++ b/token.c @@ -116,7 +116,7 @@ send_deflated_token(int f, int token, tx_strm.zalloc = z_alloc; tx_strm.zfree = z_free; if (deflateInit2(&tx_strm, Z_DEFAULT_COMPRESSION, 8, - -15, 8, Z_DEFAULT_STRATEGY, -4) != Z_OK) { + -15, 8, Z_DEFAULT_STRATEGY) != Z_OK) { fprintf(FERROR, "compression init failed\n"); exit_cleanup(1); } @@ -293,14 +293,17 @@ recv_deflated_token(int f, char **data) rx_strm.avail_out = CHUNK_SIZE; r = inflate(&rx_strm, Z_NO_FLUSH); n = CHUNK_SIZE - rx_strm.avail_out; - if (r != Z_OK || n == 0) { + if (r != Z_OK) { fprintf(FERROR, "inflate returned %d (%d bytes)\n", r, n); exit_cleanup(1); } if (rx_strm.avail_out != 0) recv_state = r_inflated; - *data = dbuf; - return n; + if (n != 0) { + *data = dbuf; + return n; + } + break; case r_running: ++rx_token;