Style, indentation, and type changes.
diff --git a/regress/fuzz_main.c b/regress/fuzz_main.c index 694322e..a0859e0 100644 --- a/regress/fuzz_main.c +++ b/regress/fuzz_main.c
@@ -10,15 +10,13 @@ char *buf = NULL; long siz_buf; - if(argc < 2) - { + if (argc < 2) { fprintf(stderr, "no input file\n"); goto err; } f = fopen(argv[1], "rb"); - if(f == NULL) - { + if (f == NULL) { fprintf(stderr, "error opening input file %s\n", argv[1]); goto err; } @@ -28,17 +26,17 @@ siz_buf = ftell(f); rewind(f); - if(siz_buf < 1) goto err; + if (siz_buf < 1) { + goto err; + } buf = (char*)malloc(siz_buf); - if(buf == NULL) - { + if (buf == NULL) { fprintf(stderr, "malloc() failed\n"); goto err; } - if(fread(buf, siz_buf, 1, f) != 1) - { + if (fread(buf, siz_buf, 1, f) != 1) { fprintf(stderr, "fread() failed\n"); goto err; }
diff --git a/regress/zip_read_fuzzer.cc b/regress/zip_read_fuzzer.cc index 2fb527b..6813807 100644 --- a/regress/zip_read_fuzzer.cc +++ b/regress/zip_read_fuzzer.cc
@@ -1,5 +1,4 @@ -#include "../lib/zip.h" - +#include <zip.h> #ifdef __cplusplus extern "C" @@ -9,6 +8,9 @@ zip_source_t *src; zip_t *za; zip_error_t error; + char buf[32768]; + zip_int64_t i, n; + zip_file_t *f; zip_error_init(&error); @@ -25,18 +27,17 @@ zip_error_fini(&error); - char buf[32768]; - unsigned long n = zip_get_num_entries(za, 0); + n = zip_get_num_entries(za, 0); - zip_file_t *f; - unsigned long i; for (i = 0; i < n; i++) { f = zip_fopen_index(za, i, 0); - if (f == NULL) + if (f == NULL) { continue; + } - while (zip_fread(f, buf, 32768) > 0) + while (zip_fread(f, buf, sizeof(buf)) > 0) { ; + } zip_fclose(f); }