diff options
author | marha <marha@users.sourceforge.net> | 2013-11-12 13:55:55 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-12 13:56:28 +0100 |
commit | 0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (patch) | |
tree | eee062f34219e5c5d3f3e61caa5d3c39a5185794 /zlib/contrib/blast/blast.c | |
parent | 3893ee9f6b12465239b63d08763bd9ba0bd329e5 (diff) | |
parent | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff) | |
download | vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.gz vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.bz2 vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated zlib to 1.2.8
Conflicts:
zlib/win32/zlib.def
Diffstat (limited to 'zlib/contrib/blast/blast.c')
-rw-r--r-- | zlib/contrib/blast/blast.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/zlib/contrib/blast/blast.c b/zlib/contrib/blast/blast.c index 4ce697a41..69ef0fe00 100644 --- a/zlib/contrib/blast/blast.c +++ b/zlib/contrib/blast/blast.c @@ -1,7 +1,7 @@ /* blast.c - * Copyright (C) 2003 Mark Adler + * Copyright (C) 2003, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in blast.h - * version 1.1, 16 Feb 2003 + * version 1.2, 24 Oct 2012 * * blast.c decompresses data compressed by the PKWare Compression Library. * This function provides functionality similar to the explode() function of @@ -22,6 +22,8 @@ * * 1.0 12 Feb 2003 - First version * 1.1 16 Feb 2003 - Fixed distance check for > 4 GB uncompressed data + * 1.2 24 Oct 2012 - Add note about using binary mode in stdio + * - Fix comparisons of differently signed integers */ #include <setjmp.h> /* for setjmp(), longjmp(), and jmp_buf */ @@ -279,7 +281,7 @@ local int decomp(struct state *s) int dict; /* log2(dictionary size) - 6 */ int symbol; /* decoded symbol, extra bits for distance */ int len; /* length for copy */ - int dist; /* distance for copy */ + unsigned dist; /* distance for copy */ int copy; /* copy counter */ unsigned char *from, *to; /* copy pointers */ static int virgin = 1; /* build tables once */ |