diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2012-08-12 18:08:52 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2012-08-13 00:02:40 -0700 |
commit | 62d6112a7981ad7c34f3b43cffdf00d4662a4f25 (patch) | |
tree | aed93070f7e1be31868dce1d62a1de6ffc1360f9 /test | |
parent | fb4e0599a5ddaef9eee726f786b9edef4943432b (diff) | |
download | zlib-62d6112a7981ad7c34f3b43cffdf00d4662a4f25.tar.gz zlib-62d6112a7981ad7c34f3b43cffdf00d4662a4f25.tar.bz2 zlib-62d6112a7981ad7c34f3b43cffdf00d4662a4f25.zip |
Clean up the usage of z_const and respect const usage within zlib.
This patch allows zlib to compile cleanly with the -Wcast-qual gcc
warning enabled, but only if ZLIB_CONST is defined, which adds
const to next_in and msg in z_stream and in the in_func prototype.
A --const option is added to ./configure which adds -DZLIB_CONST
to the compile flags, and adds -Wcast-qual to the compile flags
when ZLIBGCCWARN is set in the environment.
Diffstat (limited to 'test')
-rw-r--r-- | test/example.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/example.c b/test/example.c index f515a48..138a699 100644 --- a/test/example.c +++ b/test/example.c | |||
@@ -26,7 +26,7 @@ | |||
26 | } \ | 26 | } \ |
27 | } | 27 | } |
28 | 28 | ||
29 | const char hello[] = "hello, hello!"; | 29 | z_const char hello[] = "hello, hello!"; |
30 | /* "hello world" would be more standard, but the repeated "hello" | 30 | /* "hello world" would be more standard, but the repeated "hello" |
31 | * stresses the compression code better, sorry... | 31 | * stresses the compression code better, sorry... |
32 | */ | 32 | */ |
@@ -212,7 +212,7 @@ void test_deflate(compr, comprLen) | |||
212 | err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); | 212 | err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); |
213 | CHECK_ERR(err, "deflateInit"); | 213 | CHECK_ERR(err, "deflateInit"); |
214 | 214 | ||
215 | c_stream.next_in = (Bytef*)hello; | 215 | c_stream.next_in = (z_const unsigned char *)hello; |
216 | c_stream.next_out = compr; | 216 | c_stream.next_out = compr; |
217 | 217 | ||
218 | while (c_stream.total_in != len && c_stream.total_out < comprLen) { | 218 | while (c_stream.total_in != len && c_stream.total_out < comprLen) { |
@@ -387,7 +387,7 @@ void test_flush(compr, comprLen) | |||
387 | err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); | 387 | err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); |
388 | CHECK_ERR(err, "deflateInit"); | 388 | CHECK_ERR(err, "deflateInit"); |
389 | 389 | ||
390 | c_stream.next_in = (Bytef*)hello; | 390 | c_stream.next_in = (z_const unsigned char *)hello; |
391 | c_stream.next_out = compr; | 391 | c_stream.next_out = compr; |
392 | c_stream.avail_in = 3; | 392 | c_stream.avail_in = 3; |
393 | c_stream.avail_out = (uInt)*comprLen; | 393 | c_stream.avail_out = (uInt)*comprLen; |
@@ -476,7 +476,7 @@ void test_dict_deflate(compr, comprLen) | |||
476 | c_stream.next_out = compr; | 476 | c_stream.next_out = compr; |
477 | c_stream.avail_out = (uInt)comprLen; | 477 | c_stream.avail_out = (uInt)comprLen; |
478 | 478 | ||
479 | c_stream.next_in = (Bytef*)hello; | 479 | c_stream.next_in = (z_const unsigned char *)hello; |
480 | c_stream.avail_in = (uInt)strlen(hello)+1; | 480 | c_stream.avail_in = (uInt)strlen(hello)+1; |
481 | 481 | ||
482 | err = deflate(&c_stream, Z_FINISH); | 482 | err = deflate(&c_stream, Z_FINISH); |