diff options
author | delphij <delphij@FreeBSD.org> | 2010-03-22 21:11:55 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2010-03-22 21:11:55 +0000 |
commit | 242fa9b7553b2ba79e6c24d9c970b87803969664 (patch) | |
tree | 1bab41b7473c7f820d5017fd4e0f8b6bccf0fdd3 /lib/libz/deflate.h | |
parent | a40c3ddf5af024b9de0a6be58ebdc15e29974cd0 (diff) | |
parent | f956321dcebbe74ca501db23263b30d1c3443b77 (diff) | |
download | FreeBSD-src-242fa9b7553b2ba79e6c24d9c970b87803969664.zip FreeBSD-src-242fa9b7553b2ba79e6c24d9c970b87803969664.tar.gz |
Update to zlib 1.2.4 and add versioned symbols to the
library.
Sponsored by: iXsystems, Inc.
Diffstat (limited to 'lib/libz/deflate.h')
-rw-r--r-- | lib/libz/deflate.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/libz/deflate.h b/lib/libz/deflate.h index 05a5ab3..f53deba 100644 --- a/lib/libz/deflate.h +++ b/lib/libz/deflate.h @@ -1,5 +1,5 @@ /* deflate.h -- internal compression state - * Copyright (C) 1995-2004 Jean-loup Gailly + * Copyright (C) 1995-2009 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -260,6 +260,13 @@ typedef struct internal_state { * are always zero. */ + ulg high_water; + /* High water mark offset in window for initialized bytes -- bytes above + * this are set to zero in order to avoid memory check warnings when + * longest match routines access bytes past the input. This is then + * updated to the new high water mark. + */ + } FAR deflate_state; /* Output a byte on the stream. @@ -278,14 +285,18 @@ typedef struct internal_state { * distances are limited to MAX_DIST instead of WSIZE. */ +#define WIN_INIT MAX_MATCH +/* Number of bytes after end of data in window to initialize in order to avoid + memory checker errors from longest match routines */ + /* in trees.c */ void _tr_init OF((deflate_state *s)); int _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); void _tr_flush_block OF((deflate_state *s, charf *buf, ulg stored_len, - int eof)); + int last)); void _tr_align OF((deflate_state *s)); void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, - int eof)); + int last)); #define d_code(dist) \ ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) |