diff options
author | hansr <hk-git@circlestorm.org> | 2014-10-18 12:11:48 +0200 |
---|---|---|
committer | hansr <hk-git@circlestorm.org> | 2014-10-18 12:11:48 +0200 |
commit | 8999d0a963bd0e5080b6ed56bd073d2f5544e982 (patch) | |
tree | 0b4f2186625a4bb19fe53075001c3cbc2c68bf26 /test/example.c | |
parent | de4fe1be2b673051e4773e6d86d7331f6cb14b01 (diff) |
Remove FAR variants of voidpf
And a few Bytef leftovers from test/example.c
Diffstat (limited to 'test/example.c')
-rw-r--r-- | test/example.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/example.c b/test/example.c index 62141e5..b64f0d6 100644 --- a/test/example.c +++ b/test/example.c @@ -86,7 +86,7 @@ void test_compress(compr, comprLen, uncompr, uncomprLen) int err; uLong len = (uLong)strlen(hello)+1; - err = compress(compr, &comprLen, (const Bytef*)hello, len); + err = compress(compr, &comprLen, (const Byte*)hello, len); CHECK_ERR(err, "compress"); strcpy((char*)uncompr, "garbage"); @@ -201,7 +201,7 @@ void test_deflate(compr, comprLen) c_stream.zalloc = zalloc; c_stream.zfree = zfree; - c_stream.opaque = (voidpf)0; + c_stream.opaque = (voidp)0; err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); CHECK_ERR(err, "deflateInit"); @@ -240,7 +240,7 @@ void test_inflate(compr, comprLen, uncompr, uncomprLen) d_stream.zalloc = zalloc; d_stream.zfree = zfree; - d_stream.opaque = (voidpf)0; + d_stream.opaque = (voidp)0; d_stream.next_in = compr; d_stream.avail_in = 0; @@ -279,7 +279,7 @@ void test_large_deflate(compr, comprLen, uncompr, uncomprLen) c_stream.zalloc = zalloc; c_stream.zfree = zfree; - c_stream.opaque = (voidpf)0; + c_stream.opaque = (voidp)0; err = deflateInit(&c_stream, Z_BEST_SPEED); CHECK_ERR(err, "deflateInit"); @@ -336,7 +336,7 @@ void test_large_inflate(compr, comprLen, uncompr, uncomprLen) d_stream.zalloc = zalloc; d_stream.zfree = zfree; - d_stream.opaque = (voidpf)0; + d_stream.opaque = (voidp)0; d_stream.next_in = compr; d_stream.avail_in = (uInt)comprLen; @@ -376,7 +376,7 @@ void test_flush(compr, comprLen) c_stream.zalloc = zalloc; c_stream.zfree = zfree; - c_stream.opaque = (voidpf)0; + c_stream.opaque = (voidp)0; err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); CHECK_ERR(err, "deflateInit"); @@ -415,7 +415,7 @@ void test_sync(compr, comprLen, uncompr, uncomprLen) d_stream.zalloc = zalloc; d_stream.zfree = zfree; - d_stream.opaque = (voidpf)0; + d_stream.opaque = (voidp)0; d_stream.next_in = compr; d_stream.avail_in = 2; /* just read the zlib header */ @@ -457,13 +457,13 @@ void test_dict_deflate(compr, comprLen) c_stream.zalloc = zalloc; c_stream.zfree = zfree; - c_stream.opaque = (voidpf)0; + c_stream.opaque = (voidp)0; err = deflateInit(&c_stream, Z_BEST_COMPRESSION); CHECK_ERR(err, "deflateInit"); err = deflateSetDictionary(&c_stream, - (const Bytef*)dictionary, (int)sizeof(dictionary)); + (const Byte*)dictionary, (int)sizeof(dictionary)); CHECK_ERR(err, "deflateSetDictionary"); dictId = c_stream.adler; @@ -496,7 +496,7 @@ void test_dict_inflate(compr, comprLen, uncompr, uncomprLen) d_stream.zalloc = zalloc; d_stream.zfree = zfree; - d_stream.opaque = (voidpf)0; + d_stream.opaque = (voidp)0; d_stream.next_in = compr; d_stream.avail_in = (uInt)comprLen; @@ -515,7 +515,7 @@ void test_dict_inflate(compr, comprLen, uncompr, uncomprLen) fprintf(stderr, "unexpected dictionary"); exit(1); } - err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary, + err = inflateSetDictionary(&d_stream, (const Byte*)dictionary, (int)sizeof(dictionary)); } CHECK_ERR(err, "inflate with dict"); |