Include zbuild.h first in tools and tests

zbuild.h defines _LARGEFILE64_SOURCE, but the macro only takes effect
if seen before any system header. The tools and fuzz/test files that
included <stdio.h> ahead of zbuild.h processed <features.h> without it,
so _LFS64_LARGEFILE never got set and z_off64_t expanded to an unknown
off64_t once LFS64 detection moved out of the build system.

Reorder so zbuild.h precedes any system header, and drop the redundant
<stdio.h>/<stdlib.h>/<string.h> includes that zbuild.h already pulls in.

diff --git a/test/fuzz/fuzzer_checksum.c b/test/fuzz/fuzzer_checksum.c
index cedd284dbeb47d557a1312203fa81bad26b60220..6106af0a712a7d1b65611643746bde0e5d99ff4c 100644 (file)
--- a/test/fuzz/fuzzer_checksum.c
+++ b/test/fuzz/fuzzer_checksum.c
@@ -1,7 +1,5 @@
-#include <stdio.h>
-#include <assert.h>
-
 #include "zbuild.h"
+#include <assert.h>
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
 #else

diff --git a/test/fuzz/fuzzer_compress.c b/test/fuzz/fuzzer_compress.c
index 2eca0382343cd80ce27e7a61327a699c89897bc6..a9de005a36ac2b80cff8ddbe2c8ef6958f32da02 100644 (file)
--- a/test/fuzz/fuzzer_compress.c
+++ b/test/fuzz/fuzzer_compress.c
@@ -1,7 +1,5 @@
-#include <stdio.h>
-#include <assert.h>
-
 #include "zbuild.h"
+#include <assert.h>
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
 #else

diff --git a/test/fuzz/fuzzer_example_dict.c b/test/fuzz/fuzzer_example_dict.c
index 053a3e101ae9561ad8dfd320db166a155a907c14..2cf0ee4a2945a01d56f889aea1e5f7ffb48c10fc 100644 (file)
--- a/test/fuzz/fuzzer_example_dict.c
+++ b/test/fuzz/fuzzer_example_dict.c
@@ -1,7 +1,5 @@
-#include <stdio.h>
-#include <assert.h>
-
 #include "zbuild.h"
+#include <assert.h>
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
 #else

diff --git a/test/fuzz/fuzzer_example_flush.c b/test/fuzz/fuzzer_example_flush.c
index 1901fed09171fcdfd821144d55297954eea99877..62788e37208c311c39e21b4d17ad9b77023e323b 100644 (file)
--- a/test/fuzz/fuzzer_example_flush.c
+++ b/test/fuzz/fuzzer_example_flush.c
@@ -1,7 +1,5 @@
-#include <stdio.h>
-#include <assert.h>
-
 #include "zbuild.h"
+#include <assert.h>
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
 #else

diff --git a/test/fuzz/fuzzer_example_large.c b/test/fuzz/fuzzer_example_large.c
index 41145972189ee51d2b4be9a9daddcfcba79c5767..f80b91963b469f445b7eefa8183792c07b676f85 100644 (file)
--- a/test/fuzz/fuzzer_example_large.c
+++ b/test/fuzz/fuzzer_example_large.c
@@ -1,8 +1,6 @@
-#include <stdio.h>
+#include "zbuild.h"
 #include <assert.h>
 #include <inttypes.h>
-
-#include "zbuild.h"
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
 #else

diff --git a/test/fuzz/fuzzer_example_small.c b/test/fuzz/fuzzer_example_small.c
index e59c720835d7853ca4281d187c0c7eeb51c3c948..d1ace3b0a2de09b71c9314761a9a2c07e73f6694 100644 (file)
--- a/test/fuzz/fuzzer_example_small.c
+++ b/test/fuzz/fuzzer_example_small.c
@@ -1,7 +1,5 @@
-#include <stdio.h>
-#include <assert.h>
-
 #include "zbuild.h"
+#include <assert.h>
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
 #else

diff --git a/test/fuzz/standalone_fuzz_target_runner.c b/test/fuzz/standalone_fuzz_target_runner.c
index 810a56072f76bb23cdf86c16a428fe8b57548313..98c46f4fcef425ec2b10b06668fe46d9c7cf13fb 100644 (file)
--- a/test/fuzz/standalone_fuzz_target_runner.c
+++ b/test/fuzz/standalone_fuzz_target_runner.c
@@ -1,7 +1,5 @@
-#include <assert.h>
-#include <stdio.h>
-
 #include "zbuild.h"
+#include <assert.h>
 
 extern int LLVMFuzzerTestOneInput(const unsigned char *data, size_t size);
 

diff --git a/test/gh1235.c b/test/gh1235.c
index 1629864515939dfb658d5966709259050f413e0e..c37379f9321aaba1ec65dc67c9185beff0b4cdb0 100644 (file)
--- a/test/gh1235.c
+++ b/test/gh1235.c
@@ -1,6 +1,5 @@
+#include "zbuild.h"
 #include <assert.h>
-#include <stdio.h>
-#include <string.h>
 #include "zutil.h"
 
 int main(void) {

diff --git a/test/infcover.c b/test/infcover.c
index 582feaebd6ee3a437846c850c4d0ad55b18bb6f8..82fb2230c3e792d885c2ab2f1dd977c3a85aebe4 100644 (file)
--- a/test/infcover.c
+++ b/test/infcover.c
@@ -5,17 +5,13 @@
 
 /* to use, do: ./configure --cover && make cover */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#undef NDEBUG
-#include <assert.h>
-#include <inttypes.h>
-
 /* get definition of internal structure so we can mess with it (see pull()),
    and so we can call inflate_trees() (see cover5()) */
 #include "zbuild.h"
 #include "zutil.h"
+#undef NDEBUG
+#include <assert.h>
+#include <inttypes.h>
 #include "inftrees.h"
 #include "inflate.h"
 

diff --git a/test/test_cve-2003-0107.cc b/test/test_cve-2003-0107.cc
index 9d9e5b00df7608f38163b8e94190a6fccb87c4e2..d5a638e80c6b0b129135877feecb345ac6b35021 100644 (file)
--- a/test/test_cve-2003-0107.cc
+++ b/test/test_cve-2003-0107.cc
@@ -1,9 +1,6 @@
 // https://www.securityfocus.com/archive/1/312869 --- originally by Richard Kettlewell
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h>
-
 #include "zbuild.h"
+#include <errno.h>
 #ifdef ZLIB_COMPAT
 #  include "zlib.h"
 #else

diff --git a/tools/makecrct.c b/tools/makecrct.c
index 812954ac0ac652cc99d27c75d703cc2b09192faa..c53d347786110b9cf2e8dad6da702df9f17ed7f7 100644 (file)
--- a/tools/makecrct.c
+++ b/tools/makecrct.c
@@ -3,9 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
 */
 
-#include <stdio.h>
-#include <inttypes.h>
 #include "zbuild.h"
+#include <inttypes.h>
 #include "zutil.h"
 
 /*

diff --git a/tools/makefixed.c b/tools/makefixed.c
index 13d4fa70d2b4122ea5a9a70aaf7040f74c750f14..c59aa17d3face1ec824e06e9fb4be83d2ba59b02 100644 (file)
--- a/tools/makefixed.c
+++ b/tools/makefixed.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include "zbuild.h"
 #include "zutil.h"
 #include "inftrees.h"

diff --git a/tools/maketrees.c b/tools/maketrees.c
index aa68c35603952ff94cdb69438adf049896a4ff6f..786f4fbee901835d489b41f3f14be996675af99b 100644 (file)
--- a/tools/maketrees.c
+++ b/tools/maketrees.c
@@ -3,7 +3,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <stdio.h>
 #include "zbuild.h"
 #include "deflate.h"
 #include "deflate_p.h"