diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-18 10:11:29 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-18 10:11:29 +0000 |
commit | 6121dc77366dbc5b7fe28e6d405e498e79630c15 (patch) | |
tree | da2e2000ca12b6e2c1c739f123d867b0f182c841 /cpukit/zlib/deflate.h | |
parent | This commit was generated by cvs2svn to compensate for changes in r25189, (diff) | |
download | rtems-6121dc77366dbc5b7fe28e6d405e498e79630c15.tar.bz2 |
2010-03-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* ChangeLog.zlib, FAQ, Makefile.am, README, adler32.c, compress.c,
crc32.c, deflate.c, deflate.h, infback.c, inffast.c, inflate.c,
inflate.h, inftrees.c, inftrees.h, trees.c, uncompr.c, zconf.h,
zlib.3, zlib.h, zutil.c, zutil.h: Update to zlib 1.2.4.
* gzclose.c, gzguts.h, gzlib.c, gzread.c, gzwrite.c, doc/algorithm.txt:
New files.
* algorithm.txt, gzio.c: Removed.
Diffstat (limited to 'cpukit/zlib/deflate.h')
-rw-r--r-- | cpukit/zlib/deflate.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/cpukit/zlib/deflate.h b/cpukit/zlib/deflate.h index 05a5ab3a2c..f53deba852 100644 --- a/cpukit/zlib/deflate.h +++ b/cpukit/zlib/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)]) |