diff options
Diffstat (limited to 'deflate.c')
-rw-r--r-- | deflate.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -52,7 +52,7 @@ | |||
52 | #include "deflate.h" | 52 | #include "deflate.h" |
53 | 53 | ||
54 | const char deflate_copyright[] = | 54 | const char deflate_copyright[] = |
55 | " deflate 1.2.3.9 Copyright 1995-2010 Jean-loup Gailly and Mark Adler "; | 55 | " deflate 1.2.4 Copyright 1995-2010 Jean-loup Gailly and Mark Adler "; |
56 | /* | 56 | /* |
57 | If you use the zlib library in a product, an acknowledgment is welcome | 57 | If you use the zlib library in a product, an acknowledgment is welcome |
58 | in the documentation of your product. If for some reason you cannot | 58 | in the documentation of your product. If for some reason you cannot |
@@ -1433,21 +1433,21 @@ local void fill_window(s) | |||
1433 | * Flush the current block, with given end-of-file flag. | 1433 | * Flush the current block, with given end-of-file flag. |
1434 | * IN assertion: strstart is set to the end of the current match. | 1434 | * IN assertion: strstart is set to the end of the current match. |
1435 | */ | 1435 | */ |
1436 | #define FLUSH_BLOCK_ONLY(s, eof) { \ | 1436 | #define FLUSH_BLOCK_ONLY(s, last) { \ |
1437 | _tr_flush_block(s, (s->block_start >= 0L ? \ | 1437 | _tr_flush_block(s, (s->block_start >= 0L ? \ |
1438 | (charf *)&s->window[(unsigned)s->block_start] : \ | 1438 | (charf *)&s->window[(unsigned)s->block_start] : \ |
1439 | (charf *)Z_NULL), \ | 1439 | (charf *)Z_NULL), \ |
1440 | (ulg)((long)s->strstart - s->block_start), \ | 1440 | (ulg)((long)s->strstart - s->block_start), \ |
1441 | (eof)); \ | 1441 | (last)); \ |
1442 | s->block_start = s->strstart; \ | 1442 | s->block_start = s->strstart; \ |
1443 | flush_pending(s->strm); \ | 1443 | flush_pending(s->strm); \ |
1444 | Tracev((stderr,"[FLUSH]")); \ | 1444 | Tracev((stderr,"[FLUSH]")); \ |
1445 | } | 1445 | } |
1446 | 1446 | ||
1447 | /* Same but force premature exit if necessary. */ | 1447 | /* Same but force premature exit if necessary. */ |
1448 | #define FLUSH_BLOCK(s, eof) { \ | 1448 | #define FLUSH_BLOCK(s, last) { \ |
1449 | FLUSH_BLOCK_ONLY(s, eof); \ | 1449 | FLUSH_BLOCK_ONLY(s, last); \ |
1450 | if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \ | 1450 | if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ |
1451 | } | 1451 | } |
1452 | 1452 | ||
1453 | /* =========================================================================== | 1453 | /* =========================================================================== |