comparison zlib/compress.c @ 111:04ced10e8804

gcc 7
author kono
date Fri, 27 Oct 2017 22:46:09 +0900
parents ae3a4bfb450b
children
comparison
equal deleted inserted replaced
68:561a7518be6b 111:04ced10e8804
1 /* compress.c -- compress a memory buffer 1 /* compress.c -- compress a memory buffer
2 * Copyright (C) 1995-2003 Jean-loup Gailly. 2 * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
6 /* @(#) $Id: compress.c,v 1.1.1.2 2002/03/11 21:53:23 tromey Exp $ */ 6 /* @(#) $Id: compress.c,v 1.1.1.2 2002/03/11 21:53:23 tromey Exp $ */
7 7
26 uLong sourceLen; 26 uLong sourceLen;
27 int level; 27 int level;
28 { 28 {
29 z_stream stream; 29 z_stream stream;
30 int err; 30 int err;
31 const uInt max = (uInt)-1;
32 uLong left;
31 33
32 stream.next_in = (Bytef*)source; 34 left = *destLen;
33 stream.avail_in = (uInt)sourceLen; 35 *destLen = 0;
34 #ifdef MAXSEG_64K
35 /* Check for source > 64K on 16-bit machine: */
36 if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
37 #endif
38 stream.next_out = dest;
39 stream.avail_out = (uInt)*destLen;
40 if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
41 36
42 stream.zalloc = (alloc_func)0; 37 stream.zalloc = (alloc_func)0;
43 stream.zfree = (free_func)0; 38 stream.zfree = (free_func)0;
44 stream.opaque = (voidpf)0; 39 stream.opaque = (voidpf)0;
45 40
46 err = deflateInit(&stream, level); 41 err = deflateInit(&stream, level);
47 if (err != Z_OK) return err; 42 if (err != Z_OK) return err;
48 43
49 err = deflate(&stream, Z_FINISH); 44 stream.next_out = dest;
50 if (err != Z_STREAM_END) { 45 stream.avail_out = 0;
51 deflateEnd(&stream); 46 stream.next_in = (z_const Bytef *)source;
52 return err == Z_OK ? Z_BUF_ERROR : err; 47 stream.avail_in = 0;
53 } 48
49 do {
50 if (stream.avail_out == 0) {
51 stream.avail_out = left > (uLong)max ? max : (uInt)left;
52 left -= stream.avail_out;
53 }
54 if (stream.avail_in == 0) {
55 stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
56 sourceLen -= stream.avail_in;
57 }
58 err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
59 } while (err == Z_OK);
60
54 *destLen = stream.total_out; 61 *destLen = stream.total_out;
55 62 deflateEnd(&stream);
56 err = deflateEnd(&stream); 63 return err == Z_STREAM_END ? Z_OK : err;
57 return err;
58 } 64 }
59 65
60 /* =========================================================================== 66 /* ===========================================================================
61 */ 67 */
62 int ZEXPORT compress (dest, destLen, source, sourceLen) 68 int ZEXPORT compress (dest, destLen, source, sourceLen)
73 this function needs to be updated. 79 this function needs to be updated.
74 */ 80 */
75 uLong ZEXPORT compressBound (sourceLen) 81 uLong ZEXPORT compressBound (sourceLen)
76 uLong sourceLen; 82 uLong sourceLen;
77 { 83 {
78 return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11; 84 return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
85 (sourceLen >> 25) + 13;
79 } 86 }