diff --git a/example/convert-to-nia/convert-to-nia.c b/example/convert-to-nia/convert-to-nia.c index c05d69f2..cb39b543 100644 --- a/example/convert-to-nia/convert-to-nia.c +++ b/example/convert-to-nia/convert-to-nia.c @@ -424,12 +424,10 @@ fill_rectangle(wuffs_base__rect_ie_u32 rect, wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(color); wuffs_base__table_u8 tab = wuffs_base__pixel_buffer__plane(&g_pixbuf, 0); - uint32_t y; - for (y = rect.min_incl_y; y < rect.max_excl_y; y++) { + for (uint32_t y = rect.min_incl_y; y < rect.max_excl_y; y++) { uint8_t* p = tab.ptr + (y * tab.stride) + (rect.min_incl_x * BYTES_PER_PIXEL); - uint32_t x; - for (x = rect.min_incl_x; x < rect.max_excl_x; x++) { + for (uint32_t x = rect.min_incl_x; x < rect.max_excl_x; x++) { wuffs_base__poke_u32le__no_bounds_check(p, nonpremul); p += BYTES_PER_PIXEL; } @@ -461,8 +459,7 @@ print_nie_frame() { if (tab.width == tab.stride) { ignore_return_value(write(STDOUT_FD, tab.ptr, tab.width * tab.height)); } else { - size_t y; - for (y = 0; y < tab.height; y++) { + for (size_t y = 0; y < tab.height; y++) { ignore_return_value( write(STDOUT_FD, tab.ptr + (y * tab.stride), tab.width)); break; diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index 79676f0a..fcd74563 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -215,11 +215,9 @@ restore_background(wuffs_base__pixel_buffer* pb, wuffs_base__rect_ie_u32 bounds, wuffs_base__color_u32_argb_premul background_color) { size_t width4 = (size_t)(wuffs_base__pixel_config__width(&pb->pixcfg)) * 4; - size_t y; - for (y = bounds.min_incl_y; y < bounds.max_excl_y; y++) { - size_t x; + for (size_t y = bounds.min_incl_y; y < bounds.max_excl_y; y++) { uint8_t* d = g_curr_dst_buffer + (y * width4) + (bounds.min_incl_x * 4); - for (x = bounds.min_incl_x; x < bounds.max_excl_x; x++) { + for (size_t x = bounds.min_incl_x; x < bounds.max_excl_x; x++) { wuffs_base__poke_u32le__no_bounds_check(d, background_color); d += sizeof(wuffs_base__color_u32_argb_premul); } @@ -234,10 +232,8 @@ print_ascii_art(wuffs_base__pixel_buffer* pb) { uint8_t* d = g_curr_dst_buffer; uint8_t* p = g_printbuf.ptr; *p++ = '\n'; - uint32_t y; - for (y = 0; y < height; y++) { - uint32_t x; - for (x = 0; x < width; x++) { + for (uint32_t y = 0; y < height; y++) { + for (uint32_t x = 0; x < width; x++) { wuffs_base__color_u32_argb_premul c = wuffs_base__peek_u32le__no_bounds_check(d); d += sizeof(wuffs_base__color_u32_argb_premul); @@ -265,10 +261,8 @@ print_color_art(wuffs_base__pixel_buffer* pb) { uint8_t* p = g_printbuf.ptr; *p++ = '\n'; p += sprintf((char*)p, "%s", g_reset_color); - uint32_t y; - for (y = 0; y < height; y++) { - uint32_t x; - for (x = 0; x < width; x++) { + for (uint32_t y = 0; y < height; y++) { + for (uint32_t x = 0; x < width; x++) { wuffs_base__color_u32_argb_premul c = wuffs_base__peek_u32le__no_bounds_check(d); d += sizeof(wuffs_base__color_u32_argb_premul); @@ -416,10 +410,9 @@ play() { if (wuffs_base__frame_config__index(&fc) == 0) { wuffs_base__color_u32_argb_premul background_color = wuffs_base__frame_config__background_color(&fc); - size_t i; size_t n = g_dst_len / sizeof(wuffs_base__color_u32_argb_premul); uint8_t* p = g_curr_dst_buffer; - for (i = 0; i < n; i++) { + for (size_t i = 0; i < n; i++) { wuffs_base__poke_u32le__no_bounds_check(p, background_color); p += sizeof(wuffs_base__color_u32_argb_premul); } diff --git a/example/jsonptr/jsonptr.cc b/example/jsonptr/jsonptr.cc index 184177ff..1824f496 100644 --- a/example/jsonptr/jsonptr.cc +++ b/example/jsonptr/jsonptr.cc @@ -1460,8 +1460,7 @@ main(int argc, char** argv) { // Flags start with "-", unless it comes after a bare "--" arg. { bool dash_dash = false; - int a; - for (a = 1; a < argc; a++) { + for (int a = 1; a < argc; a++) { char* arg = argv[a]; if ((arg[0] == '-') && !dash_dash) { dash_dash = (arg[1] == '-') && (arg[2] == '\x00'); diff --git a/fuzz/c/fuzzlib/fuzzlib.c b/fuzz/c/fuzzlib/fuzzlib.c index d4c72efb..1fb18618 100644 --- a/fuzz/c/fuzzlib/fuzzlib.c +++ b/fuzz/c/fuzzlib/fuzzlib.c @@ -337,8 +337,7 @@ main(int argc, char** argv) { fprintf(stderr, "FAIL: %s\n", z); return 1; } - int i; - for (i = 0; i < g_flags.remaining_argc; i++) { + for (int i = 0; i < g_flags.remaining_argc; i++) { int v = visit(g_flags.remaining_argv[i]); if (v) { return v; diff --git a/fuzz/c/std/gif_fuzzer.c b/fuzz/c/std/gif_fuzzer.c index b3d01464..ba311825 100644 --- a/fuzz/c/std/gif_fuzzer.c +++ b/fuzz/c/std/gif_fuzzer.c @@ -85,8 +85,7 @@ void set_quirks(wuffs_gif__decoder* dec, uint64_t hash) { 0, }; - uint32_t i; - for (i = 0; quirks[i]; i++) { + for (uint32_t i = 0; quirks[i]; i++) { uint64_t bit = 1 << (i & 63); if (hash & bit) { wuffs_gif__decoder__set_quirk_enabled(dec, quirks[i], true); diff --git a/fuzz/c/std/json_fuzzer.cc b/fuzz/c/std/json_fuzzer.cc index 4086cd56..5cb0e226 100644 --- a/fuzz/c/std/json_fuzzer.cc +++ b/fuzz/c/std/json_fuzzer.cc @@ -261,8 +261,7 @@ uint32_t g_quirks[] = { }; void set_quirks(wuffs_json__decoder* dec, uint64_t hash) { - uint32_t i; - for (i = 0; g_quirks[i]; i++) { + for (uint32_t i = 0; g_quirks[i]; i++) { uint64_t bit = 1 << (i & 63); if (hash & bit) { wuffs_json__decoder__set_quirk_enabled(dec, g_quirks[i], true); diff --git a/script/adler32-standalone.c b/script/adler32-standalone.c index 805b2121..a2e22b96 100644 --- a/script/adler32-standalone.c +++ b/script/adler32-standalone.c @@ -175,9 +175,8 @@ main(int argc, char** argv) { // https://play.golang.org/p/IU2T58P00C const uint32_t expected_hash_of_1mib_of_zeroes = 0x00f00001UL; - int i; int num_bad = 0; - for (i = 0; i < num_reps; i++) { + for (int i = 0; i < num_reps; i++) { uint32_t actual_hash = calculate_hash(g_buffer, BUFFER_SIZE); if (!g_flags.no_check && (actual_hash != expected_hash_of_1mib_of_zeroes)) { num_bad++; diff --git a/script/bench-c-deflate-fragmentation.c b/script/bench-c-deflate-fragmentation.c index ba7e2733..73734d31 100644 --- a/script/bench-c-deflate-fragmentation.c +++ b/script/bench-c-deflate-fragmentation.c @@ -330,8 +330,7 @@ decode(bool frag_dst, bool frag_idat) { struct timeval bench_start_tv; gettimeofday(&bench_start_tv, NULL); - int i; - for (i = 0; i < reps; i++) { + for (int i = 0; i < reps; i++) { const char* msg = decode_once(frag_dst, frag_idat); if (msg) { return msg; @@ -399,8 +398,7 @@ main(int argc, char** argv) { "it, first\n" "# install Go, then run \"go get golang.org/x/perf/cmd/benchstat\".\n"); - int i; - for (i = 0; i < 5; i++) { + for (int i = 0; i < 5; i++) { msg = decode(true, true); if (msg) { return fail(msg); diff --git a/script/print-json-token-debug-format.c b/script/print-json-token-debug-format.c index 866723b6..e8dabd42 100644 --- a/script/print-json-token-debug-format.c +++ b/script/print-json-token-debug-format.c @@ -312,8 +312,7 @@ main1(int argc, char** argv) { WUFFS_JSON__QUIRK_REPLACE_INVALID_UNICODE, 0, }; - uint32_t i; - for (i = 0; quirks[i]; i++) { + for (uint32_t i = 0; quirks[i]; i++) { wuffs_base__token_decoder__set_quirk_enabled(g_dec, quirks[i], true); } } diff --git a/test/c/mimiclib/gif.c b/test/c/mimiclib/gif.c index 7511cf2b..3ed9c94e 100644 --- a/test/c/mimiclib/gif.c +++ b/test/c/mimiclib/gif.c @@ -62,8 +62,7 @@ mimic_gif_decode(uint64_t* n_bytes_out, goto cleanup1; } - int i; - for (i = 0; i < f->ImageCount; i++) { + for (int i = 0; i < f->ImageCount; i++) { // Copy the pixel data from the GifFileType* f to the dst buffer, since the // former is free'd at the end of this function. // diff --git a/test/c/mimiclib/png.c b/test/c/mimiclib/png.c index 2b3396b4..bfa4b1b0 100644 --- a/test/c/mimiclib/png.c +++ b/test/c/mimiclib/png.c @@ -64,8 +64,7 @@ mimic_png_decode(uint64_t* n_bytes_out, spng_ctx* ctx = spng_ctx_new(0); - size_t i; - for (i = 0; i < quirks_len; i++) { + for (size_t i = 0; i < quirks_len; i++) { uint32_t q = quirks_ptr[i]; if (q == WUFFS_BASE__QUIRK_IGNORE_CHECKSUM) { spng_set_crc_action(ctx, SPNG_CRC_USE, SPNG_CRC_USE); @@ -358,8 +357,7 @@ mimic_png_decode(uint64_t* n_bytes_out, goto cleanup0; } - size_t i; - for (i = 0; i < quirks_len; i++) { + for (size_t i = 0; i < quirks_len; i++) { uint32_t q = quirks_ptr[i]; if (q == WUFFS_BASE__QUIRK_IGNORE_CHECKSUM) { // TODO: configure libpng to ignore Adler-32 and CRC-32 checksums. diff --git a/test/c/std/adler32.c b/test/c/std/adler32.c index f4fcd10d..663cc911 100644 --- a/test/c/std/adler32.c +++ b/test/c/std/adler32.c @@ -131,15 +131,13 @@ test_wuffs_adler32_golden() { }, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ .data = g_src_slice_u8, }); CHECK_STRING(read_file(&src, test_cases[tc].filename)); - int j; - for (j = 0; j < 2; j++) { + for (int j = 0; j < 2; j++) { wuffs_adler32__hasher checksum; CHECK_STATUS("initialize", wuffs_adler32__hasher__initialize( @@ -164,7 +162,7 @@ test_wuffs_adler32_golden() { } while (num_bytes < src.meta.wi); if (have != test_cases[tc].want) { - RETURN_FAIL("tc=%d, j=%d, filename=\"%s\": have 0x%08" PRIX32 + RETURN_FAIL("tc=%zu, j=%d, filename=\"%s\": have 0x%08" PRIX32 ", want 0x%08" PRIX32 "\n", tc, j, test_cases[tc].filename, have, test_cases[tc].want); } @@ -208,8 +206,7 @@ test_wuffs_adler32_pi() { 0xBEAA13C1, 0xD29C13F2, 0xE6C51429, 0xFB1E1459, }; - int i; - for (i = 0; i < 100; i++) { + for (int i = 0; i < 100; i++) { wuffs_adler32__hasher checksum; CHECK_STATUS("initialize", wuffs_adler32__hasher__initialize( diff --git a/test/c/std/cbor.c b/test/c/std/cbor.c index 59981c9a..c51f906d 100644 --- a/test/c/std/cbor.c +++ b/test/c/std/cbor.c @@ -117,8 +117,7 @@ test_wuffs_cbor_decode_invalid() { "\xFE", }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__token tok_array[256]; wuffs_base__token_buffer tok_buf = wuffs_base__slice_token__writer(wuffs_base__make_slice_token( @@ -138,7 +137,7 @@ test_wuffs_cbor_decode_invalid() { wuffs_base__status status = wuffs_cbor__decoder__decode_tokens( &dec, &tok_buf, &io_buf, g_work_slice_u8); if (!wuffs_base__status__is_error(&status)) { - RETURN_FAIL("tc=%d: have \"%s\", want an error", tc, status.repr); + RETURN_FAIL("tc=%zu: have \"%s\", want an error", tc, status.repr); } } return NULL; @@ -159,8 +158,7 @@ test_wuffs_cbor_decode_valid() { "\xD0\xBF\xFF", }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__token tok_array[256]; wuffs_base__token_buffer tok_buf = wuffs_base__slice_token__writer(wuffs_base__make_slice_token( @@ -180,7 +178,7 @@ test_wuffs_cbor_decode_valid() { wuffs_base__status status = wuffs_cbor__decoder__decode_tokens( &dec, &tok_buf, &io_buf, g_work_slice_u8); if (!wuffs_base__status__is_ok(&status)) { - RETURN_FAIL("tc=%d: have \"%s\", want no error", tc, status.repr); + RETURN_FAIL("tc=%zu: have \"%s\", want no error", tc, status.repr); } } return NULL; diff --git a/test/c/std/crc32.c b/test/c/std/crc32.c index 87560fbd..d2fab749 100644 --- a/test/c/std/crc32.c +++ b/test/c/std/crc32.c @@ -131,15 +131,13 @@ test_wuffs_crc32_ieee_golden() { }, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ .data = g_src_slice_u8, }); CHECK_STRING(read_file(&src, test_cases[tc].filename)); - int j; - for (j = 0; j < 2; j++) { + for (int j = 0; j < 2; j++) { wuffs_crc32__ieee_hasher checksum; CHECK_STATUS("initialize", wuffs_crc32__ieee_hasher__initialize( @@ -164,7 +162,7 @@ test_wuffs_crc32_ieee_golden() { } while (num_bytes < src.meta.wi); if (have != test_cases[tc].want) { - RETURN_FAIL("tc=%d, j=%d, filename=\"%s\": have 0x%08" PRIX32 + RETURN_FAIL("tc=%zu, j=%d, filename=\"%s\": have 0x%08" PRIX32 ", want 0x%08" PRIX32, tc, j, test_cases[tc].filename, have, test_cases[tc].want); } @@ -206,8 +204,7 @@ do_test_xxxxx_crc32_ieee_pi(bool mimic) { 0x4D9D54B7, 0xD69454CC, 0xF8BB504D, 0xFC4E595C, }; - int i; - for (i = 0; i < 100; i++) { + for (int i = 0; i < 100; i++) { uint32_t have; wuffs_base__slice_u8 data = ((wuffs_base__slice_u8){ .ptr = (uint8_t*)(digits), diff --git a/test/c/std/deflate.c b/test/c/std/deflate.c index bf0d086d..e0430ea6 100644 --- a/test/c/std/deflate.c +++ b/test/c/std/deflate.c @@ -269,8 +269,7 @@ test_wuffs_deflate_decode_deflate_huffman_primlen_9() { CHECK_STATUS("transform_io", wuffs_deflate__decoder__transform_io( &dec, &have, &src, g_work_slice_u8)); - int i; - for (i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) { // Find the first unused (i.e. zero) entry in the i'th huffs table. int have = WUFFS_DEFLATE__HUFFS_TABLE_SIZE; while ((have > 0) && (dec.private_data.f_huffs[i][have - 1] == 0)) { @@ -354,8 +353,7 @@ test_wuffs_deflate_decode_split_src() { CHECK_STRING(read_file(&src, gt->src_filename)); CHECK_STRING(read_file(&want, gt->want_filename)); - int i; - for (i = 1; i < 32; i++) { + for (int i = 1; i < 32; i++) { size_t split = gt->src_offset0 + i; if (split >= gt->src_offset1) { RETURN_FAIL("i=%d: split was not an interior split", i); @@ -468,8 +466,7 @@ test_wuffs_deflate_history_full() { CHECK_STRING(read_file(&want, gt->want_filename)); const int full_history_size = 0x8000; - int i; - for (i = -2; i <= +2; i++) { + for (int i = -2; i <= +2; i++) { wuffs_deflate__decoder dec; CHECK_STATUS("initialize", wuffs_deflate__decoder__initialize( @@ -531,8 +528,7 @@ test_wuffs_deflate_history_partial() { 0x8000, 0x8001, 0x9234, 0xFFFB, 0xFFFC, 0xFFFD, 0xFFFE, 0xFFFF, }; - int i; - for (i = 0; i < WUFFS_TESTLIB_ARRAY_SIZE(starting_history_indexes); i++) { + for (int i = 0; i < WUFFS_TESTLIB_ARRAY_SIZE(starting_history_indexes); i++) { uint32_t starting_history_index = starting_history_indexes[i]; // The flate_pi_gt golden test file decodes to the digits of pi. @@ -564,8 +560,7 @@ test_wuffs_deflate_history_partial() { have_history_index, (int)(want_full), want_history_index); } - int j; - for (j = -2; j < (int)(fragment_length) + 2; j++) { + for (int j = -2; j < (int)(fragment_length) + 2; j++) { uint32_t index = (starting_history_index + j) & 0x7FFF; uint8_t have = dec.private_data.f_history[index]; uint8_t want = (0 <= j && j < fragment_length) ? fragment[j] : 0; @@ -633,7 +628,6 @@ test_wuffs_deflate_table_redirect() { WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); memset(&(dec.private_data.f_huffs), 0, sizeof(dec.private_data.f_huffs)); - int i; int n = 0; dec.private_data.f_code_lengths[n++] = 1; dec.private_data.f_code_lengths[n++] = 2; @@ -644,7 +638,7 @@ test_wuffs_deflate_table_redirect() { dec.private_data.f_code_lengths[n++] = 7; dec.private_data.f_code_lengths[n++] = 9; dec.private_data.f_code_lengths[n++] = 10; - for (i = 0; i < 19; i++) { + for (int i = 0; i < 19; i++) { dec.private_data.f_code_lengths[n++] = 12; } dec.private_data.f_code_lengths[n++] = 13; @@ -658,7 +652,7 @@ test_wuffs_deflate_table_redirect() { // should be zero outside of those tables. const int n_f_huffs = sizeof(dec.private_data.f_huffs[0]) / sizeof(dec.private_data.f_huffs[0][0]); - for (i = 0; i < n_f_huffs; i++) { + for (int i = 0; i < n_f_huffs; i++) { bool have = dec.private_data.f_huffs[0][i] == 0; bool want = i >= (1 << 9) + (1 << 3) + (1 << 3) + (1 << 4); if (have != want) { @@ -696,7 +690,7 @@ test_wuffs_deflate_table_redirect() { 0x80000801, 0x80000903, 0x80000801, 0x80000B03, 0x80000801, 0x80000A03, 0x80000801, 0x80000C03, }; - for (i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) { have = dec.private_data.f_huffs[0][0x0200 + i]; want = wants[i]; if (have != want) { diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 65341b64..5a0b5531 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -355,8 +355,7 @@ do_test_wuffs_gif_decode(const char* filename, } if (dst_pixfmt.repr == WUFFS_BASE__PIXEL_FORMAT__BGR) { - size_t i; - for (i = 0; i < ind_want.meta.wi; i++) { + for (size_t i = 0; i < ind_want.meta.wi; i++) { uint8_t index = ind_want.data.ptr[i]; expanded_want.data.ptr[3 * i + 0] = pal_want_array[4 * index + 0]; expanded_want.data.ptr[3 * i + 1] = pal_want_array[4 * index + 1]; @@ -364,8 +363,7 @@ do_test_wuffs_gif_decode(const char* filename, } expanded_want.meta.wi = 3 * ind_want.meta.wi; } else if (dst_pixfmt.repr == WUFFS_BASE__PIXEL_FORMAT__BGR_565) { - size_t i; - for (i = 0; i < ind_want.meta.wi; i++) { + for (size_t i = 0; i < ind_want.meta.wi; i++) { uint8_t index = ind_want.data.ptr[i]; uint32_t b5 = pal_want_array[4 * index + 0] >> 3; uint32_t g6 = pal_want_array[4 * index + 1] >> 2; @@ -376,8 +374,7 @@ do_test_wuffs_gif_decode(const char* filename, } expanded_want.meta.wi = 2 * ind_want.meta.wi; } else if (dst_pixfmt.repr == WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL) { - size_t i; - for (i = 0; i < ind_want.meta.wi; i++) { + for (size_t i = 0; i < ind_want.meta.wi; i++) { uint8_t index = ind_want.data.ptr[i]; expanded_want.data.ptr[4 * i + 0] = pal_want_array[4 * index + 0]; expanded_want.data.ptr[4 * i + 1] = pal_want_array[4 * index + 1]; @@ -386,8 +383,7 @@ do_test_wuffs_gif_decode(const char* filename, } expanded_want.meta.wi = 4 * ind_want.meta.wi; } else if (dst_pixfmt.repr == WUFFS_BASE__PIXEL_FORMAT__RGB) { - size_t i; - for (i = 0; i < ind_want.meta.wi; i++) { + for (size_t i = 0; i < ind_want.meta.wi; i++) { uint8_t index = ind_want.data.ptr[i]; expanded_want.data.ptr[3 * i + 0] = pal_want_array[4 * index + 2]; expanded_want.data.ptr[3 * i + 1] = pal_want_array[4 * index + 1]; @@ -395,8 +391,7 @@ do_test_wuffs_gif_decode(const char* filename, } expanded_want.meta.wi = 3 * ind_want.meta.wi; } else if (dst_pixfmt.repr == WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL) { - size_t i; - for (i = 0; i < ind_want.meta.wi; i++) { + for (size_t i = 0; i < ind_want.meta.wi; i++) { uint8_t index = ind_want.data.ptr[i]; expanded_want.data.ptr[4 * i + 0] = pal_want_array[4 * index + 2]; expanded_want.data.ptr[4 * i + 1] = pal_want_array[4 * index + 1]; @@ -580,8 +575,7 @@ do_test_wuffs_gif_decode_animated( CHECK_STATUS("set_from_slice", wuffs_base__pixel_buffer__set_from_slice( &pb, &ic.pixcfg, g_pixel_slice_u8)); - uint32_t i; - for (i = 0; i < want_num_frames; i++) { + for (uint32_t i = 0; i < want_num_frames; i++) { wuffs_base__frame_config fc = ((wuffs_base__frame_config){}); wuffs_base__status status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src); @@ -618,7 +612,7 @@ do_test_wuffs_gif_decode_animated( // There should be no more frames, no matter how many times we call // decode_frame. - for (i = 0; i < 3; i++) { + for (uint32_t i = 0; i < 3; i++) { wuffs_base__status status = wuffs_gif__decoder__decode_frame( &dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, g_work_slice_u8, NULL); if (status.repr != wuffs_base__note__end_of_data) { @@ -685,8 +679,7 @@ test_wuffs_gif_decode_delay_num_frames_decoded() { } src.meta.wi--; - int q; - for (q = 0; q < 2; q++) { + for (int q = 0; q < 2; q++) { src.meta.ri = 0; wuffs_gif__decoder dec; @@ -722,8 +715,7 @@ test_wuffs_gif_decode_empty_palette() { .data = g_src_slice_u8, }); CHECK_STRING(read_file(&src, "test/data/artificial/gif-empty-palette.gif")); - int q; - for (q = 0; q < 2; q++) { + for (int q = 0; q < 2; q++) { src.meta.ri = 0; wuffs_gif__decoder dec; @@ -748,8 +740,7 @@ test_wuffs_gif_decode_empty_palette() { RETURN_FAIL("q=%d: set_from_slice: \"%s\"", q, status.repr); } - int i; - for (i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) { status = wuffs_gif__decoder__decode_frame( &dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, g_work_slice_u8, NULL); if ((q == 1) && (i == 1)) { @@ -790,8 +781,7 @@ test_wuffs_gif_decode_background_color() { }); CHECK_STRING( read_file(&src, "test/data/artificial/gif-background-color.gif")); - int q; - for (q = 0; q < 2; q++) { + for (int q = 0; q < 2; q++) { src.meta.ri = 0; wuffs_gif__decoder dec; @@ -829,8 +819,7 @@ test_wuffs_gif_decode_first_frame_is_opaque() { }); CHECK_STRING( read_file(&src, "test/data/artificial/gif-frame-out-of-bounds.gif")); - int q; - for (q = 0; q < 2; q++) { + for (int q = 0; q < 2; q++) { src.meta.ri = 0; wuffs_gif__decoder dec; @@ -867,8 +856,7 @@ test_wuffs_gif_decode_frame_out_of_bounds() { }); CHECK_STRING( read_file(&src, "test/data/artificial/gif-frame-out-of-bounds.gif")); - int q; - for (q = 0; q < 2; q++) { + for (int q = 0; q < 2; q++) { src.meta.ri = 0; wuffs_gif__decoder dec; @@ -931,8 +919,7 @@ test_wuffs_gif_decode_frame_out_of_bounds() { q ? "...." : "..45..89", }; - uint32_t i; - for (i = 0; true; i++) { + for (uint32_t i = 0; true; i++) { wuffs_base__frame_config fc = ((wuffs_base__frame_config){}); { status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src); @@ -964,14 +951,13 @@ test_wuffs_gif_decode_frame_out_of_bounds() { { wuffs_base__table_u8 p = wuffs_base__pixel_buffer__plane(&pb, 0); - uint32_t y, x; - for (y = 0; y < 5; y++) { - for (x = 0; x < 5; x++) { + for (uint32_t y = 0; y < 5; y++) { + for (uint32_t x = 0; x < 5; x++) { p.ptr[(y * p.stride) + x] = 0xEE; } } - for (y = 0; y < height; y++) { - for (x = 0; x < width; x++) { + for (uint32_t y = 0; y < height; y++) { + for (uint32_t x = 0; x < width; x++) { p.ptr[(y * p.stride) + x] = 0; } } @@ -984,8 +970,8 @@ test_wuffs_gif_decode_frame_out_of_bounds() { status.repr); } - for (y = 0; y < 5; y++) { - for (x = 0; x < 5; x++) { + for (uint32_t y = 0; y < 5; y++) { + for (uint32_t x = 0; x < 5; x++) { if ((x < width) && (y < height)) { continue; } @@ -1009,8 +995,8 @@ test_wuffs_gif_decode_frame_out_of_bounds() { } char have[(width * height) + 1]; - for (y = 0; y < height; y++) { - for (x = 0; x < width; x++) { + for (uint32_t y = 0; y < height; y++) { + for (uint32_t x = 0; x < width; x++) { uint8_t index = 0x0F & p.ptr[(y * p.stride) + x]; have[(y * width) + x] = index ? ('0' + index) : '.'; } @@ -1037,8 +1023,7 @@ test_wuffs_gif_decode_zero_width_frame() { }); CHECK_STRING( read_file(&src, "test/data/artificial/gif-zero-width-frame.gif")); - int q; - for (q = 0; q < 3; q++) { + for (int q = 0; q < 3; q++) { src.meta.ri = 0; wuffs_gif__decoder dec; @@ -1525,22 +1510,20 @@ test_wuffs_gif_decode_multiple_loop_counts() { uint32_t want_num_animation_loops[4] = {1, 1, 51, 31}; - uint32_t i; - for (i = 0; true; i++) { - { - wuffs_base__status status = - wuffs_gif__decoder__decode_frame_config(&dec, NULL, &src); - if (i == WUFFS_TESTLIB_ARRAY_SIZE(want_num_animation_loops)) { - if (status.repr != wuffs_base__note__end_of_data) { - RETURN_FAIL("decode_frame_config #%" PRIu32 - ": have \"%s\", want \"%s\"", - i, status.repr, wuffs_base__note__end_of_data); - } - break; - } - if (!wuffs_base__status__is_ok(&status)) { - RETURN_FAIL("decode_frame_config #%" PRIu32 ": \"%s\"", i, status.repr); + uint32_t i = 0; + while (true) { + wuffs_base__status status = + wuffs_gif__decoder__decode_frame_config(&dec, NULL, &src); + if (i == WUFFS_TESTLIB_ARRAY_SIZE(want_num_animation_loops)) { + if (status.repr != wuffs_base__note__end_of_data) { + RETURN_FAIL("decode_frame_config #%" PRIu32 + ": have \"%s\", want \"%s\"", + i, status.repr, wuffs_base__note__end_of_data); } + break; + } + if (!wuffs_base__status__is_ok(&status)) { + RETURN_FAIL("decode_frame_config #%" PRIu32 ": \"%s\"", i, status.repr); } uint32_t have = wuffs_gif__decoder__num_animation_loops(&dec); @@ -1550,6 +1533,7 @@ test_wuffs_gif_decode_multiple_loop_counts() { ", want %" PRIu32, i, have, want); } + i++; } uint32_t have = wuffs_gif__decoder__num_animation_loops(&dec); @@ -1815,8 +1799,7 @@ do_test_wuffs_gif_io_position(bool chunked) { wuffs_base__frame_config fcs[4]; uint32_t width_wants[4] = {64, 37, 49, 49}; uint64_t pos_wants[4] = {781, 2126, 2187, 2542}; - int i; - for (i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { fcs[i] = ((wuffs_base__frame_config){}); wuffs_base__status status = wuffs_gif__decoder__decode_frame_config(&dec, &fcs[i], &src); @@ -1878,7 +1861,7 @@ do_test_wuffs_gif_io_position(bool chunked) { return NULL; } - for (i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { src.meta.ri = pos_wants[i]; status = wuffs_gif__decoder__restart_frame( @@ -1887,8 +1870,7 @@ do_test_wuffs_gif_io_position(bool chunked) { RETURN_FAIL("restart_frame #%d: \"%s\"", i, status.repr); } - int j; - for (j = i; j < 4; j++) { + for (int j = i; j < 4; j++) { wuffs_base__frame_config fc = ((wuffs_base__frame_config){}); status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src); if (!wuffs_base__status__is_ok(&status)) { diff --git a/test/c/std/gzip.c b/test/c/std/gzip.c index 42407c65..a7072ab8 100644 --- a/test/c/std/gzip.c +++ b/test/c/std/gzip.c @@ -160,8 +160,7 @@ do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) { // Decode the src data in 1 or 2 chunks, depending on whether end_limit is // or isn't zero. - int i; - for (i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) { uint64_t rlimit = UINT64_MAX; const char* want_z = NULL; if (i == 0) { diff --git a/test/c/std/json.c b/test/c/std/json.c index 356fe427..41a0209d 100644 --- a/test/c/std/json.c +++ b/test/c/std/json.c @@ -86,8 +86,7 @@ test_wuffs_core_count_leading_zeroes_u64() { {.num = 0xFFFFFFFFFFFFFFFF, .want = 0}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { uint32_t have = wuffs_base__count_leading_zeroes_u64(test_cases[tc].num); if (have != test_cases[tc].want) { RETURN_FAIL("0x%" PRIX64 ": have %" PRIu32 ", want %" PRIu32, @@ -122,8 +121,7 @@ test_wuffs_core_multiply_u64() { .want_lo = 0x89B3DE09506618CF}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__multiply_u64__output have = wuffs_base__multiply_u64(test_cases[tc].x, test_cases[tc].y); if ((have.hi != test_cases[tc].want_hi) || @@ -343,8 +341,7 @@ test_wuffs_strconv_hpd_rounded_integer() { {.want = UINT64_MAX, .str = "1234567890123456789"}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__private_implementation__high_prec_dec hpd; CHECK_STATUS("hpd__parse", wuffs_base__private_implementation__high_prec_dec__parse( @@ -389,8 +386,7 @@ test_wuffs_strconv_hpd_shift() { .want = "+314159000000000000000000000."}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__private_implementation__high_prec_dec hpd; CHECK_STATUS("hpd__parse", wuffs_base__private_implementation__high_prec_dec__parse( @@ -499,8 +495,7 @@ test_wuffs_strconv_ieee_754_bit_representation_from_u16() { }, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { double have_f64 = wuffs_base__ieee_754_bit_representation__from_u16_to_f64( test_cases[tc].u16_bits); double want_f64 = test_cases[tc].want_f64; @@ -508,7 +503,7 @@ test_wuffs_strconv_ieee_754_bit_representation_from_u16() { bool equal = ((have_f64 == want_f64) || ((have_f64 != have_f64) && (want_f64 != want_f64))); if (!equal) { - RETURN_FAIL("tc=%d: to_f64: have %g, want %g", tc, have_f64, want_f64); + RETURN_FAIL("tc=%zu: to_f64: have %g, want %g", tc, have_f64, want_f64); } uint64_t have_u64 = @@ -516,7 +511,7 @@ test_wuffs_strconv_ieee_754_bit_representation_from_u16() { uint64_t want_u64 = test_cases[tc].want_u64; // There's more than one representation of NaN. if ((have_u64 != want_u64) && (want_u64 != nan_u64)) { - RETURN_FAIL("tc=%d: to_u64: have 0x%016" PRIX64 ", want 0x%016" PRIX64, + RETURN_FAIL("tc=%zu: to_u64: have 0x%016" PRIX64 ", want 0x%016" PRIX64, tc, have_u64, want_u64); } @@ -530,13 +525,13 @@ test_wuffs_strconv_ieee_754_bit_representation_from_u16() { wuffs_base__ieee_754_bit_representation__from_u64_to_f64( want_u64 ^ ((uint64_t)noise))); if (lv.value != test_cases[tc].u16_bits) { - RETURN_FAIL("tc=%d: noise=%d: to_u16 value: have 0x%04" PRIX16 + RETURN_FAIL("tc=%zu: noise=%d: to_u16 value: have 0x%04" PRIX16 ", want 0x%04" PRIX16, tc, noise, lv.value, test_cases[tc].u16_bits); } int want_lossy = (want_f64 == want_f64) ? noise : 0; if (((int)lv.lossy) != want_lossy) { - RETURN_FAIL("tc=%d: noise=%d: to_u16 lossy: have %d, want %d", tc, + RETURN_FAIL("tc=%zu: noise=%d: to_u16 lossy: have %d, want %d", tc, noise, ((int)(lv.lossy)), want_lossy); } } @@ -621,8 +616,7 @@ test_wuffs_strconv_ieee_754_bit_representation_from_u32() { }, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { double have_f64 = wuffs_base__ieee_754_bit_representation__from_u32_to_f64( test_cases[tc].u32_bits); double want_f64 = test_cases[tc].want_f64; @@ -630,7 +624,7 @@ test_wuffs_strconv_ieee_754_bit_representation_from_u32() { bool equal = ((have_f64 == want_f64) || ((have_f64 != have_f64) && (want_f64 != want_f64))); if (!equal) { - RETURN_FAIL("tc=%d: to_f64: have %g, want %g", tc, have_f64, want_f64); + RETURN_FAIL("tc=%zu: to_f64: have %g, want %g", tc, have_f64, want_f64); } uint64_t have_u64 = @@ -638,7 +632,7 @@ test_wuffs_strconv_ieee_754_bit_representation_from_u32() { uint64_t want_u64 = test_cases[tc].want_u64; // There's more than one representation of NaN. if ((have_u64 != want_u64) && (want_u64 != nan_u64)) { - RETURN_FAIL("tc=%d: to_u64: have 0x%016" PRIX64 ", want 0x%016" PRIX64, + RETURN_FAIL("tc=%zu: to_u64: have 0x%016" PRIX64 ", want 0x%016" PRIX64, tc, have_u64, want_u64); } @@ -652,13 +646,13 @@ test_wuffs_strconv_ieee_754_bit_representation_from_u32() { wuffs_base__ieee_754_bit_representation__from_u64_to_f64( want_u64 ^ ((uint64_t)noise))); if (lv.value != test_cases[tc].u32_bits) { - RETURN_FAIL("tc=%d: noise=%d: to_u32 value: have 0x%08" PRIX32 + RETURN_FAIL("tc=%zu: noise=%d: to_u32 value: have 0x%08" PRIX32 ", want 0x%08" PRIX32, tc, noise, lv.value, test_cases[tc].u32_bits); } int want_lossy = (want_f64 == want_f64) ? noise : 0; if (((int)lv.lossy) != want_lossy) { - RETURN_FAIL("tc=%d: noise=%d: to_u32 lossy: have %d, want %d", tc, + RETURN_FAIL("tc=%zu: noise=%d: to_u32 lossy: have %d, want %d", tc, noise, ((int)(lv.lossy)), want_lossy); } } @@ -749,8 +743,7 @@ test_wuffs_strconv_base_64() { "Zm9vYmFy", // }; - size_t tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(wants); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(wants); tc++) { const bool src_closed = true; wuffs_base__transform__output e = wuffs_base__base_64__encode( @@ -828,8 +821,7 @@ test_wuffs_strconv_parse_number_f64_options() { // Test WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_MULTIPLE_LEADING_ZEROES. { - int o; - for (o = 0; o < 2; o++) { + for (int o = 0; o < 2; o++) { const char* str = "001.25"; wuffs_base__result_f64 r = wuffs_base__parse_number_f64( wuffs_base__make_slice_u8((void*)str, strlen(str)), @@ -859,8 +851,7 @@ test_wuffs_strconv_parse_number_f64_options() { // Test WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES. { - int o; - for (o = 0; o < 2; o++) { + for (int o = 0; o < 2; o++) { const char* str = "_1.2__5"; wuffs_base__result_f64 r = wuffs_base__parse_number_f64( wuffs_base__make_slice_u8((void*)str, strlen(str)), @@ -889,8 +880,7 @@ test_wuffs_strconv_parse_number_f64_options() { // Test WUFFS_BASE__PARSE_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA. { - int o; - for (o = 0; o < 2; o++) { + for (int o = 0; o < 2; o++) { const char* str = "1,75"; wuffs_base__result_f64 r = wuffs_base__parse_number_f64( wuffs_base__make_slice_u8((void*)str, strlen(str)), @@ -920,8 +910,7 @@ test_wuffs_strconv_parse_number_f64_options() { // Test WUFFS_BASE__PARSE_NUMBER_FXX__REJECT_INF_AND_NAN. { - int o; - for (o = 0; o < 4; o++) { + for (int o = 0; o < 4; o++) { const char* str = (o & 2) ? "1e999" : "nan"; wuffs_base__result_f64 r = wuffs_base__parse_number_f64( wuffs_base__make_slice_u8((void*)str, strlen(str)), @@ -1085,8 +1074,7 @@ test_wuffs_strconv_parse_number_f64_regular() { {.want = fail, .str = "nun"}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__result_f64 r = wuffs_base__parse_number_f64( wuffs_base__make_slice_u8((void*)test_cases[tc].str, strlen(test_cases[tc].str)), @@ -1138,8 +1126,7 @@ test_wuffs_strconv_parse_number_i64() { {.want = fail, .str = "9223372036854775808"}, // 1 << 63. }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__result_i64 r = wuffs_base__parse_number_i64( wuffs_base__make_slice_u8((void*)test_cases[tc].str, strlen(test_cases[tc].str)), @@ -1225,8 +1212,7 @@ test_wuffs_strconv_parse_number_u64() { {.want = fail, .str = "x"}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__result_u64 r = wuffs_base__parse_number_u64( wuffs_base__make_slice_u8((void*)test_cases[tc].str, strlen(test_cases[tc].str)), @@ -1240,8 +1226,7 @@ test_wuffs_strconv_parse_number_u64() { // Test WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_MULTIPLE_LEADING_ZEROES. { - int o; - for (o = 0; o < 2; o++) { + for (int o = 0; o < 2; o++) { const char* str = "007"; wuffs_base__result_u64 r = wuffs_base__parse_number_u64( wuffs_base__make_slice_u8((void*)str, strlen(str)), @@ -1269,8 +1254,7 @@ test_wuffs_strconv_parse_number_u64() { // Test WUFFS_BASE__PARSE_NUMBER_XXX__ALLOW_UNDERSCORES. { - int o; - for (o = 0; o < 2; o++) { + for (int o = 0; o < 2; o++) { const char* str = "56_7__8"; wuffs_base__result_u64 r = wuffs_base__parse_number_u64( wuffs_base__make_slice_u8((void*)str, strlen(str)), @@ -2135,12 +2119,10 @@ test_wuffs_strconv_render_number_f64() { }, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { double f64 = wuffs_base__ieee_754_bit_representation__from_u64_to_f64( test_cases[tc].x); - int o; - for (o = 0; o < 6; o++) { + for (int o = 0; o < 6; o++) { uint32_t precision = 0; uint32_t options = 0; const char* want = NULL; @@ -2189,8 +2171,7 @@ test_wuffs_strconv_render_number_f64() { // Test WUFFS_BASE__RENDER_NUMBER_FXX__DECIMAL_SEPARATOR_IS_A_COMMA. { - int o; - for (o = 0; o < 2; o++) { + for (int o = 0; o < 2; o++) { uint8_t dst[8] = {0}; const double f64 = 1.75; const uint32_t precision = 2; @@ -2263,8 +2244,7 @@ test_wuffs_strconv_render_number_i64() { return "g_have_slice_u8.len is too short"; } - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { size_t n = wuffs_base__render_number_i64( g_have_slice_u8, test_cases[tc].x, WUFFS_BASE__RENDER_NUMBER_XXX__DEFAULT_OPTIONS); @@ -2318,8 +2298,7 @@ test_wuffs_strconv_render_number_u64() { return "g_have_slice_u8.len is too short"; } - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { size_t n = wuffs_base__render_number_u64( g_have_slice_u8, test_cases[tc].x, WUFFS_BASE__RENDER_NUMBER_XXX__DEFAULT_OPTIONS); @@ -2466,8 +2445,7 @@ test_wuffs_strconv_utf_8_next() { {.want0 = 0x0100FFFD, .want1 = 0x0100FFFD, .str = "\xED\xBF\xBF"}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__slice_u8 s = wuffs_base__make_slice_u8( (void*)test_cases[tc].str, strlen(test_cases[tc].str)); // Override "The byte" with "\x00". @@ -2590,8 +2568,7 @@ test_wuffs_json_decode_interface() { wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); - uint32_t i; - for (i = 0; quirks[i]; i++) { + for (size_t i = 0; quirks[i]; i++) { wuffs_json__decoder__set_quirk_enabled(&dec, quirks[i], true); } CHECK_STRING(do_test__wuffs_base__token_decoder( @@ -2638,8 +2615,7 @@ const char* // test_wuffs_json_decode_end_of_data() { CHECK_FOCUS(__func__); - int i; - for (i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) { uint8_t* src_ptr = (uint8_t*)("123null89"); size_t src_len = i ? 3 : 9; @@ -2731,11 +2707,10 @@ test_wuffs_json_decode_long_numbers() { wuffs_json__decoder dec; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { size_t suffix_length = strlen(test_cases[tc].suffix); if ((suffix_length + 1) > (119 - 102)) { // +1 for the terminal NUL. - RETURN_FAIL("tc=%d: src_array is too short", tc); + RETURN_FAIL("tc=%zu: src_array is too short", tc); } bool ends_with_space = (suffix_length > 0) && (test_cases[tc].suffix[suffix_length - 1] == ' '); @@ -2776,7 +2751,7 @@ test_wuffs_json_decode_long_numbers() { } if (total_length != src.meta.ri) { RETURN_FAIL( - "tc=%d, nines_length=%zu, closed=%d: total_length: have %zu, " + "tc=%zu, nines_length=%zu, closed=%d: total_length: have %zu, " "want %zu", tc, nines_length, closed, total_length, src.meta.ri); } @@ -2792,7 +2767,7 @@ test_wuffs_json_decode_long_numbers() { if (have != want) { RETURN_FAIL( - "tc=%d, nines_length=%zu, closed=%d: have \"%s\", want \"%s\"", + "tc=%zu, nines_length=%zu, closed=%d: have \"%s\", want \"%s\"", tc, nines_length, closed, have, want); } } @@ -2861,8 +2836,7 @@ test_wuffs_json_decode_prior_valid_utf_8() { wuffs_json__decoder dec; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { size_t n = strlen(test_cases[tc]); size_t num_preceding = 0; while (num_preceding < n) { @@ -2874,7 +2848,7 @@ test_wuffs_json_decode_prior_valid_utf_8() { } num_preceding += x.byte_length; if (num_preceding > n) { - RETURN_FAIL("tc=%d: utf_8__next overflow", tc); + RETURN_FAIL("tc=%zu: utf_8__next overflow", tc); } } @@ -2922,7 +2896,7 @@ test_wuffs_json_decode_prior_valid_utf_8() { have += wuffs_base__token__length(t); } else { RETURN_FAIL( - "tc=%d, prefix=%zu, suffix=%zu, closed=%d: unexpected token", + "tc=%zu, prefix=%zu, suffix=%zu, closed=%d: unexpected token", tc, prefix, suffix, closed); } } @@ -2932,7 +2906,7 @@ test_wuffs_json_decode_prior_valid_utf_8() { } if (have != want) { RETURN_FAIL( - "tc=%d, prefix=%zu, suffix=%zu, closed=%d: have %zu, want %zu", + "tc=%zu, prefix=%zu, suffix=%zu, closed=%d: have %zu, want %zu", tc, prefix, suffix, closed, have, want); } } @@ -2999,10 +2973,8 @@ test_wuffs_json_decode_quirk_allow_backslash_etc() { }, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { - int q; - for (q = 0; q < 2; q++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (int q = 0; q < 2; q++) { wuffs_json__decoder dec; CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -3025,7 +2997,7 @@ test_wuffs_json_decode_quirk_allow_backslash_etc() { want_status_repr = wuffs_json__error__bad_c0_control_code; } if (have_status_repr != want_status_repr) { - RETURN_FAIL("tc=%d, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, + RETURN_FAIL("tc=%zu, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, q, have_status_repr, want_status_repr); } if (want_status_repr != NULL) { @@ -3043,7 +3015,7 @@ test_wuffs_json_decode_quirk_allow_backslash_etc() { } } if (have != test_cases[tc].want) { - RETURN_FAIL("tc=%d, q=%d: Unicode code point: have U+%04" PRIX32 + RETURN_FAIL("tc=%zu, q=%d: Unicode code point: have U+%04" PRIX32 ", want U+%04" PRIX32, tc, q, have, test_cases[tc].want); } @@ -3084,8 +3056,7 @@ test_wuffs_json_decode_quirk_allow_backslash_x() { .str = "\"a\\x\""}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_json__decoder dec; CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -3102,7 +3073,7 @@ test_wuffs_json_decode_quirk_allow_backslash_x() { wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) .repr; if (have_status_repr != test_cases[tc].want_status_repr) { - RETURN_FAIL("tc=%d: decode_tokens: have \"%s\", want \"%s\"", tc, + RETURN_FAIL("tc=%zu: decode_tokens: have \"%s\", want \"%s\"", tc, have_status_repr, test_cases[tc].want_status_repr); } @@ -3130,7 +3101,7 @@ test_wuffs_json_decode_quirk_allow_backslash_x() { } uint64_t want = test_cases[tc].want_code_points; if (have != want) { - RETURN_FAIL("tc=%d: have U+%08" PRIX64 ", want U+%08" PRIX64, tc, have, + RETURN_FAIL("tc=%zu: have U+%08" PRIX64 ", want U+%08" PRIX64, tc, have, want); } } @@ -3156,10 +3127,8 @@ test_wuffs_json_decode_quirk_allow_extra_comma() { {.want = "--", .str = "{,}"}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { - int q; - for (q = 0; q < 2; q++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (int q = 0; q < 2; q++) { wuffs_json__decoder dec; CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -3177,7 +3146,7 @@ test_wuffs_json_decode_quirk_allow_extra_comma() { const char* want = (test_cases[tc].want[q] != '-') ? NULL : wuffs_json__error__bad_input; if (have != want) { - RETURN_FAIL("tc=%d, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, + RETURN_FAIL("tc=%zu, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, q, have, want); } @@ -3186,17 +3155,17 @@ test_wuffs_json_decode_quirk_allow_extra_comma() { total_length += wuffs_base__token__length(&tok.data.ptr[tok.meta.ri++]); } if (total_length != src.meta.ri) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.meta.ri); } if (test_cases[tc].want[q] == 'X') { if (total_length != src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.data.len); } } else if (test_cases[tc].want[q] == '+') { if (total_length >= src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want < %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want < %zu", tc, q, total_length, src.data.len); } } @@ -3231,10 +3200,8 @@ test_wuffs_json_decode_quirk_allow_inf_nan_numbers() { {.want = "--", .str = "∞"}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { - int q; - for (q = 0; q < 2; q++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (int q = 0; q < 2; q++) { wuffs_json__decoder dec; CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -3252,7 +3219,7 @@ test_wuffs_json_decode_quirk_allow_inf_nan_numbers() { const char* want = (test_cases[tc].want[q] != '-') ? NULL : wuffs_json__error__bad_input; if (have != want) { - RETURN_FAIL("tc=%d, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, + RETURN_FAIL("tc=%zu, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, q, have, want); } @@ -3261,17 +3228,17 @@ test_wuffs_json_decode_quirk_allow_inf_nan_numbers() { total_length += wuffs_base__token__length(&tok.data.ptr[tok.meta.ri++]); } if (total_length != src.meta.ri) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.meta.ri); } if (test_cases[tc].want[q] == 'X') { if (total_length != src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.data.len); } } else if (test_cases[tc].want[q] == '+') { if (total_length >= src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want < %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want < %zu", tc, q, total_length, src.data.len); } } @@ -3300,10 +3267,8 @@ test_wuffs_json_decode_quirk_allow_comment_etc() { {.want = "----", .str = "[4/5]"}, // Lone slash. }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { - int q; - for (q = 0; q < 4; q++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (int q = 0; q < 4; q++) { wuffs_json__decoder dec; CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -3323,7 +3288,7 @@ test_wuffs_json_decode_quirk_allow_comment_etc() { const char* want = (test_cases[tc].want[q] != '-') ? NULL : wuffs_json__error__bad_input; if (have != want) { - RETURN_FAIL("tc=%d, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, + RETURN_FAIL("tc=%zu, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, q, have, want); } @@ -3332,17 +3297,17 @@ test_wuffs_json_decode_quirk_allow_comment_etc() { total_length += wuffs_base__token__length(&tok.data.ptr[tok.meta.ri++]); } if (total_length != src.meta.ri) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.meta.ri); } if (test_cases[tc].want[q] == 'X') { if (total_length != src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.data.len); } } else if (test_cases[tc].want[q] == '+') { if (total_length >= src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want < %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want < %zu", tc, q, total_length, src.data.len); } } @@ -3377,10 +3342,8 @@ test_wuffs_json_decode_quirk_allow_leading_etc() { {.want = "----", .str = "\xEFtrue"}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { - int q; - for (q = 0; q < 4; q++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (int q = 0; q < 4; q++) { wuffs_json__decoder dec; CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -3400,7 +3363,7 @@ test_wuffs_json_decode_quirk_allow_leading_etc() { const char* want = (test_cases[tc].want[q] != '-') ? NULL : wuffs_json__error__bad_input; if (have != want) { - RETURN_FAIL("tc=%d, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, + RETURN_FAIL("tc=%zu, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, q, have, want); } @@ -3409,17 +3372,17 @@ test_wuffs_json_decode_quirk_allow_leading_etc() { total_length += wuffs_base__token__length(&tok.data.ptr[tok.meta.ri++]); } if (total_length != src.meta.ri) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.meta.ri); } if (test_cases[tc].want[q] == 'X') { if (total_length != src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.data.len); } } else if (test_cases[tc].want[q] == '+') { if (total_length >= src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want < %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want < %zu", tc, q, total_length, src.data.len); } } @@ -3472,10 +3435,8 @@ test_wuffs_json_decode_quirk_allow_trailing_comments() { "515 9", // }; - int tc; - // Test ALLOW_ETC. - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { void* tc_ptr = (void*)(test_cases[tc]); size_t tc_len = strlen(test_cases[tc]); char code = test_cases[tc][0]; @@ -3499,8 +3460,8 @@ test_wuffs_json_decode_quirk_allow_trailing_comments() { wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8) .repr; if (have_repr != NULL) { - RETURN_FAIL("tc=%d, ALLOW_ETC: decode_tokens: have \"%s\", want NULL", tc, - have_repr); + RETURN_FAIL("tc=%zu, ALLOW_ETC: decode_tokens: have \"%s\", want NULL", + tc, have_repr); } size_t have_total_length = 0; @@ -3510,16 +3471,16 @@ test_wuffs_json_decode_quirk_allow_trailing_comments() { } size_t want_total_length = tc_len - ((code >= '4') ? 1 : 0); if (have_total_length != src.meta.ri) { - RETURN_FAIL("tc=%d, ALLOW_ETC: total_length: have %zu, want %zu", tc, + RETURN_FAIL("tc=%zu, ALLOW_ETC: total_length: have %zu, want %zu", tc, have_total_length, src.meta.ri); } else if (have_total_length != want_total_length) { - RETURN_FAIL("tc=%d, ALLOW_ETC: total_length: have %zu, want %zu", tc, + RETURN_FAIL("tc=%zu, ALLOW_ETC: total_length: have %zu, want %zu", tc, have_total_length, want_total_length); } } // Test EXPECT_ETC. - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { void* tc_ptr = (void*)(test_cases[tc]); size_t tc_len = strlen(test_cases[tc]); char code = test_cases[tc][0]; @@ -3541,7 +3502,7 @@ test_wuffs_json_decode_quirk_allow_trailing_comments() { const char* want_repr = ((code == '3') || (code == '5')) ? wuffs_json__error__bad_input : NULL; if (have_repr != want_repr) { - RETURN_FAIL("tc=%d, EXPECT_ETC: decode_tokens: have \"%s\", want \"%s\"", + RETURN_FAIL("tc=%zu, EXPECT_ETC: decode_tokens: have \"%s\", want \"%s\"", tc, have_repr, want_repr); } else if (have_repr != NULL) { continue; @@ -3554,10 +3515,10 @@ test_wuffs_json_decode_quirk_allow_trailing_comments() { } size_t want_total_length = tc_len - ((code == '1') ? 0 : 1); if (have_total_length != src.meta.ri) { - RETURN_FAIL("tc=%d, EXPECT_ETC: total_length: have %zu, want %zu", tc, + RETURN_FAIL("tc=%zu, EXPECT_ETC: total_length: have %zu, want %zu", tc, have_total_length, src.meta.ri); } else if (have_total_length != want_total_length) { - RETURN_FAIL("tc=%d, EXPECT_ETC: total_length: have %zu, want %zu", tc, + RETURN_FAIL("tc=%zu, EXPECT_ETC: total_length: have %zu, want %zu", tc, have_total_length, want_total_length); } } @@ -3594,10 +3555,8 @@ test_wuffs_json_decode_quirk_allow_trailing_filler() { {.want = "XXX", .str = "0"}, // }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { - int q; - for (q = 0; q < 3; q++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (int q = 0; q < 3; q++) { wuffs_json__decoder dec; CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -3617,7 +3576,7 @@ test_wuffs_json_decode_quirk_allow_trailing_filler() { const char* want = (test_cases[tc].want[q] != '-') ? NULL : wuffs_json__error__bad_input; if (have != want) { - RETURN_FAIL("tc=%d, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, + RETURN_FAIL("tc=%zu, q=%d: decode_tokens: have \"%s\", want \"%s\"", tc, q, have, want); } @@ -3626,17 +3585,17 @@ test_wuffs_json_decode_quirk_allow_trailing_filler() { total_length += wuffs_base__token__length(&tok.data.ptr[tok.meta.ri++]); } if (total_length != src.meta.ri) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.meta.ri); } if (test_cases[tc].want[q] == 'X') { if (total_length != src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want %zu", tc, q, total_length, src.data.len); } } else if (test_cases[tc].want[q] == '+') { if (total_length >= src.data.len) { - RETURN_FAIL("tc=%d, q=%d: total_length: have %zu, want < %zu", tc, q, + RETURN_FAIL("tc=%zu, q=%d: total_length: have %zu, want < %zu", tc, q, total_length, src.data.len); } } @@ -3694,8 +3653,7 @@ test_wuffs_json_decode_quirk_replace_invalid_unicode() { {.want = "a\xF0\x90\x80\x80?z", .str = "\"a\\uD800\\uDC00\\uDFFFz\""}, }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_json__decoder dec; CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -3729,7 +3687,7 @@ test_wuffs_json_decode_quirk_replace_invalid_unicode() { n = 1; } if ((have.data.len - have.meta.wi) < n) { - RETURN_FAIL("tc=%d: token too long", tc); + RETURN_FAIL("tc=%zu: token too long", tc); } memcpy(&have.data.ptr[have.meta.wi], &u[0], n); have.meta.wi += n; @@ -3740,35 +3698,35 @@ test_wuffs_json_decode_quirk_replace_invalid_unicode() { } else if (vbd & WUFFS_BASE__TOKEN__VBD__STRING__CONVERT_1_DST_1_SRC_COPY) { if ((have.data.len - have.meta.wi) < token_length) { - RETURN_FAIL("tc=%d: token too long", tc); + RETURN_FAIL("tc=%zu: token too long", tc); } memcpy(&have.data.ptr[have.meta.wi], &test_cases[tc].str[src_index], token_length); have.meta.wi += token_length; } else { - RETURN_FAIL("tc=%d: unexpected string-token conversion", tc); + RETURN_FAIL("tc=%zu: unexpected string-token conversion", tc); } } else { - RETURN_FAIL("tc=%d: unexpected token", tc); + RETURN_FAIL("tc=%zu: unexpected token", tc); } src_index += token_length; } if (src_index != src.meta.ri) { - RETURN_FAIL("tc=%d: src_index: have %" PRIu64 ", want %zu", tc, src_index, - src.meta.ri); + RETURN_FAIL("tc=%zu: src_index: have %" PRIu64 ", want %zu", tc, + src_index, src.meta.ri); } if (have.meta.wi >= have.data.len) { - RETURN_FAIL("tc=%d: too many have bytes", tc); + RETURN_FAIL("tc=%zu: too many have bytes", tc); } have.data.ptr[have.meta.wi] = '\x00'; size_t len = strlen(test_cases[tc].want); if ((len != have.meta.wi) || (memcmp(have.data.ptr, test_cases[tc].want, len) != 0)) { - RETURN_FAIL("tc=%d: have \"%s\", want \"%s\"", tc, have.data.ptr, + RETURN_FAIL("tc=%zu: have \"%s\", want \"%s\"", tc, have.data.ptr, test_cases[tc].want); } } @@ -3829,8 +3787,7 @@ test_wuffs_json_decode_unicode4_escapes() { }; wuffs_json__decoder dec; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -3844,8 +3801,7 @@ test_wuffs_json_decode_unicode4_escapes() { uint32_t have = fail; uint64_t total_length = 0; - size_t i; - for (i = tok.meta.ri; i < tok.meta.wi; i++) { + for (size_t i = tok.meta.ri; i < tok.meta.wi; i++) { wuffs_base__token* t = &tok.data.ptr[i]; total_length = wuffs_base__u64__sat_add(total_length, wuffs_base__token__length(t)); @@ -3907,8 +3863,7 @@ test_wuffs_json_decode_src_io_buffer_length() { wuffs_json__decoder dec; - int i; - for (i = WUFFS_JSON__DECODER_NUMBER_LENGTH_MAX_INCL - 2; + for (int i = WUFFS_JSON__DECODER_NUMBER_LENGTH_MAX_INCL - 2; i <= WUFFS_JSON__DECODER_NUMBER_LENGTH_MAX_INCL + 2; i++) { if (i < 0) { RETURN_FAIL("invalid test case: i=%d", i); @@ -4019,8 +3974,7 @@ test_wuffs_json_decode_string() { }; wuffs_json__decoder dec; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { CHECK_STATUS("initialize", wuffs_json__decoder__initialize( &dec, sizeof dec, WUFFS_VERSION, @@ -4034,8 +3988,7 @@ test_wuffs_json_decode_string() { wuffs_json__decoder__decode_tokens(&dec, &tok, &src, g_work_slice_u8); uint64_t total_length = 0; - size_t i; - for (i = tok.meta.ri; i < tok.meta.wi; i++) { + for (size_t i = tok.meta.ri; i < tok.meta.wi; i++) { wuffs_base__token* t = &tok.data.ptr[i]; total_length = wuffs_base__u64__sat_add(total_length, wuffs_base__token__length(t)); @@ -4071,9 +4024,8 @@ do_bench_wuffs_strconv_parse_number_f64(const char* str, wuffs_base__slice_u8 s = wuffs_base__make_slice_u8((void*)str, strlen(str)); bench_start(); - uint64_t i; uint64_t iters = iters_unscaled * g_flags.iterscale; - for (i = 0; i < iters; i++) { + for (uint64_t i = 0; i < iters; i++) { CHECK_STATUS("", wuffs_base__parse_number_f64( s, WUFFS_BASE__PARSE_NUMBER_XXX__DEFAULT_OPTIONS) .status); @@ -4114,11 +4066,9 @@ const char* // do_bench_wuffs_strconv_render_number_f64(wuffs_base__slice_u64 test_cases, uint64_t iters_unscaled) { bench_start(); - uint64_t i; uint64_t iters = iters_unscaled * g_flags.iterscale; - for (i = 0; i < iters; i++) { - size_t tc; - for (tc = 0; tc < test_cases.len; tc++) { + for (uint64_t i = 0; i < iters; i++) { + for (size_t tc = 0; tc < test_cases.len; tc++) { size_t n = wuffs_base__render_number_f64( g_have_slice_u8, wuffs_base__ieee_754_bit_representation__from_u64_to_f64( diff --git a/test/c/std/lzw.c b/test/c/std/lzw.c index c9b7598e..6cfcd31c 100644 --- a/test/c/std/lzw.c +++ b/test/c/std/lzw.c @@ -225,8 +225,7 @@ test_wuffs_lzw_decode_output_bad() { // (0x41, 0x42, 0x43) then a bad 8-bit code 0xFF. Decoding should produce 3 // bytes and consume 4 bytes. src.meta.wi = 20; - int i; - for (i = 0; i < src.meta.wi; i++) { + for (int i = 0; i < src.meta.wi; i++) { src.data.ptr[i] = 0; } src.data.ptr[0] = 0x41; @@ -271,8 +270,7 @@ test_wuffs_lzw_decode_output_empty() { // Set up src to be 20 bytes long, starting with the 9-bit end code 0x101. // Decoding should produce 0 bytes and consume 2 bytes. src.meta.wi = 20; - int i; - for (i = 0; i < src.meta.wi; i++) { + for (int i = 0; i < src.meta.wi; i++) { src.data.ptr[i] = 0; } src.data.ptr[0] = 0x01; @@ -405,9 +403,8 @@ do_bench_wuffs_lzw_decode(const char* filename, uint64_t iters_unscaled) { bench_start(); uint64_t n_bytes = 0; - uint64_t i; uint64_t iters = iters_unscaled * g_flags.iterscale; - for (i = 0; i < iters; i++) { + for (uint64_t i = 0; i < iters; i++) { have.meta.wi = 0; src.meta.ri = 1; // Skip the literal width. wuffs_lzw__decoder dec; diff --git a/test/c/std/png.c b/test/c/std/png.c index f11c477d..3ef5c33a 100644 --- a/test/c/std/png.c +++ b/test/c/std/png.c @@ -118,8 +118,7 @@ do_test_xxxxx_png_decode_bad_crc32_checksum_critical( #endif }; - int tc; - for (tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { + for (size_t tc = 0; tc < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); tc++) { wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ .data = g_src_slice_u8, }); @@ -132,7 +131,7 @@ do_test_xxxxx_png_decode_bad_crc32_checksum_critical( wuffs_base__make_pixel_format( WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL), NULL, 0, &src)) { - RETURN_FAIL("tc=%d (filename=\"%s\"): bad checksum not rejected", tc, + RETURN_FAIL("tc=%zu (filename=\"%s\"): bad checksum not rejected", tc, test_cases[tc]); } } @@ -315,16 +314,14 @@ apply_png_encode_filters(wuffs_base__slice_u8 dst_rows, (((width + 1) * height) != src_rows.len)) { return "apply_png_encode_filters: unexpected rows.len"; } - size_t y; uint8_t* src_prev = NULL; - for (y = 0; y < height; y++) { + for (size_t y = 0; y < height; y++) { uint8_t filter = src_rows.ptr[(width + 1) * y]; dst_rows.ptr[(width + 1) * y] = filter; uint8_t* dst_curr = &dst_rows.ptr[((width + 1) * y) + 1]; uint8_t* src_curr = &src_rows.ptr[((width + 1) * y) + 1]; - size_t x; - for (x = 0; x < width; x++) { + for (size_t x = 0; x < width; x++) { int32_t fa = 0; int32_t fb = 0; int32_t fc = 0; @@ -477,8 +474,7 @@ test_wuffs_png_decode_metadata_chrm_gama_srgb() { CHECK_FOCUS(__func__); wuffs_png__decoder dec; - int q; - for (q = 0; q < 4; q++) { + for (int q = 0; q < 4; q++) { wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ .data = g_src_slice_u8, }); @@ -542,8 +538,7 @@ test_wuffs_png_decode_metadata_chrm_gama_srgb() { ", want 0x%08" PRIX32, q, have_fourcc, want_fourcc); } else if (have_fourcc == WUFFS_BASE__FOURCC__CHRM) { - int i; - for (i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) { have[i] = ((uint32_t)( wuffs_base__more_information__metadata_parsed__chrm(&minfo, i))); } @@ -554,8 +549,7 @@ test_wuffs_png_decode_metadata_chrm_gama_srgb() { } } - int i; - for (i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) { if (have[i] != want[i]) { RETURN_FAIL("(q=%d, i=%d): have %" PRIu32 ", want %" PRIu32, q, i, have[i], want[i]); @@ -725,8 +719,7 @@ do_bench_wuffs_png_decode_filter(uint8_t filter, return "source data is too short"; } - uint32_t y; - for (y = 0; y < height; y++) { + for (uint32_t y = 0; y < height; y++) { workbuf.data.ptr[(1 + bytes_per_row) * y] = filter; } @@ -766,9 +759,8 @@ do_bench_wuffs_png_decode_filter(uint8_t filter, bench_start(); uint64_t n_bytes = 0; - uint64_t i; uint64_t iters = iters_unscaled * g_flags.iterscale; - for (i = 0; i < iters; i++) { + for (uint64_t i = 0; i < iters; i++) { CHECK_STATUS( "filter_and_swizzle", wuffs_png__decoder__filter_and_swizzle( diff --git a/test/c/std/wbmp.c b/test/c/std/wbmp.c index a95c4c3d..91bedc28 100644 --- a/test/c/std/wbmp.c +++ b/test/c/std/wbmp.c @@ -75,8 +75,7 @@ fill_palette_with_grays(wuffs_base__pixel_buffer* pb) { if (palette.len != 1024) { return; } - int i; - for (i = 0; i < 256; i++) { + for (int i = 0; i < 256; i++) { palette.ptr[(4 * i) + 0] = i; palette.ptr[(4 * i) + 1] = i; palette.ptr[(4 * i) + 2] = i; @@ -90,8 +89,7 @@ fill_palette_with_nrgba_transparent_yellows(wuffs_base__pixel_buffer* pb) { if (palette.len != 1024) { return; } - int i; - for (i = 0; i < 256; i++) { + for (int i = 0; i < 256; i++) { palette.ptr[(4 * i) + 0] = 0x00; palette.ptr[(4 * i) + 1] = 0x99; palette.ptr[(4 * i) + 2] = 0xCC; @@ -161,8 +159,7 @@ test_wuffs_pixel_buffer_fill_rect() { }, }; - int d; - for (d = 0; d < WUFFS_TESTLIB_ARRAY_SIZE(dsts); d++) { + for (size_t d = 0; d < WUFFS_TESTLIB_ARRAY_SIZE(dsts); d++) { // Allocate the dst_pixbuf. wuffs_base__pixel_config dst_pixcfg = ((wuffs_base__pixel_config){}); wuffs_base__pixel_config__set(&dst_pixcfg, dsts[d].pixfmt_repr, @@ -173,13 +170,10 @@ test_wuffs_pixel_buffer_fill_rect() { wuffs_base__pixel_buffer__set_from_slice( &dst_pixbuf, &dst_pixcfg, g_have_slice_u8)); - int orientation; - for (orientation = 0; orientation < 2; orientation++) { + for (int orientation = 0; orientation < 2; orientation++) { // Reset to transparent black (or its closest approximation). - uint32_t y; - for (y = 0; y < height; y++) { - uint32_t x; - for (x = 0; x < width; x++) { + for (uint32_t y = 0; y < height; y++) { + for (uint32_t x = 0; x < width; x++) { CHECK_STATUS( "set_color_u32_at", wuffs_base__pixel_buffer__set_color_u32_at(&dst_pixbuf, x, y, 0)); @@ -204,7 +198,7 @@ test_wuffs_pixel_buffer_fill_rect() { wuffs_base__pixel_buffer__color_u32_at(&dst_pixbuf, width / 2, height / 2); if (colors_differ(have_dst_pixel, want_dst_pixel, 0)) { - RETURN_FAIL("d=%d, orientation=%d: dst_pixel: have 0x%08" PRIX32 + RETURN_FAIL("d=%zu, orientation=%d: dst_pixel: have 0x%08" PRIX32 ", want 0x%08" PRIX32, d, orientation, have_dst_pixel, want_dst_pixel); } @@ -324,8 +318,7 @@ test_wuffs_pixel_swizzler_swizzle() { WUFFS_BASE__PIXEL_BLEND__SRC_OVER, }; - int s; - for (s = 0; s < WUFFS_TESTLIB_ARRAY_SIZE(srcs); s++) { + for (size_t s = 0; s < WUFFS_TESTLIB_ARRAY_SIZE(srcs); s++) { // Allocate the src_pixbuf. wuffs_base__pixel_config src_pixcfg = ((wuffs_base__pixel_config){}); wuffs_base__pixel_config__set(&src_pixcfg, srcs[s].pixfmt_repr, @@ -350,12 +343,11 @@ test_wuffs_pixel_swizzler_swizzle() { wuffs_base__pixel_buffer__color_u32_at(&src_pixbuf, width / 2, height / 2); if (have_src_pixel != srcs[s].color) { - RETURN_FAIL("s=%d: src_pixel: have 0x%08" PRIX32 ", want 0x%08" PRIX32, s, - have_src_pixel, srcs[s].color); + RETURN_FAIL("s=%zu: src_pixel: have 0x%08" PRIX32 ", want 0x%08" PRIX32, + s, have_src_pixel, srcs[s].color); } - int d; - for (d = 0; d < WUFFS_TESTLIB_ARRAY_SIZE(dsts); d++) { + for (size_t d = 0; d < WUFFS_TESTLIB_ARRAY_SIZE(dsts); d++) { // Allocate the dst_pixbuf. wuffs_base__pixel_config dst_pixcfg = ((wuffs_base__pixel_config){}); wuffs_base__pixel_config__set(&dst_pixcfg, dsts[d].pixfmt_repr, @@ -378,8 +370,7 @@ test_wuffs_pixel_swizzler_swizzle() { WUFFS_TESTLIB_ARRAY_SIZE(fallback_palette_array)); } - int b; - for (b = 0; b < WUFFS_TESTLIB_ARRAY_SIZE(blends); b++) { + for (size_t b = 0; b < WUFFS_TESTLIB_ARRAY_SIZE(blends); b++) { // Set the middle dst pixel. CHECK_STATUS("set_color_u32_at", wuffs_base__pixel_buffer__set_color_u32_at( @@ -420,7 +411,7 @@ test_wuffs_pixel_swizzler_swizzle() { wuffs_base__pixel_buffer__color_u32_at(&dst_pixbuf, width / 2, height / 2); if (colors_differ(have_dst_pixel, want_dst_pixel, tolerance)) { - RETURN_FAIL("s=%d, d=%d, b=%d: dst_pixel: have 0x%08" PRIX32 + RETURN_FAIL("s=%zu, d=%zu, b=%zu: dst_pixel: have 0x%08" PRIX32 ", want 0x%08" PRIX32 ", per-channel tolerance=%" PRId32, s, d, b, have_dst_pixel, want_dst_pixel, tolerance); } @@ -559,11 +550,9 @@ do_bench_wuffs_pixel_swizzler(uint32_t dst_pixfmt_repr, bench_start(); uint64_t n_bytes = 0; - uint64_t i; uint64_t iters = iters_unscaled * g_flags.iterscale; - for (i = 0; i < iters; i++) { - uint32_t y; - for (y = 0; y < height; y++) { + for (uint64_t i = 0; i < iters; i++) { + for (uint32_t y = 0; y < height; y++) { wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice( &swizzler, wuffs_base__make_slice_u8( diff --git a/test/c/std/zlib.c b/test/c/std/zlib.c index 22c23710..ebf07539 100644 --- a/test/c/std/zlib.c +++ b/test/c/std/zlib.c @@ -170,8 +170,7 @@ do_test_wuffs_zlib_checksum(bool ignore_checksum, uint32_t bad_checksum) { // Decode the src data in 1 or 2 chunks, depending on whether end_limit is // or isn't zero. - int i; - for (i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) { uint64_t rlimit = UINT64_MAX; const char* want_z = NULL; if (i == 0) { @@ -255,8 +254,7 @@ test_wuffs_zlib_decode_sheep() { &dec, sizeof dec, WUFFS_VERSION, WUFFS_INITIALIZE__DEFAULT_OPTIONS)); - int i; - for (i = 0; i < 3; i++) { + for (int i = 0; i < 3; i++) { wuffs_base__status status = wuffs_zlib__decoder__transform_io(&dec, &have, &src, g_work_slice_u8); diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index 3bad2e68..d6d2ee48 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -369,8 +369,7 @@ chdir_to_the_wuffs_root_directory() { // Chdir to the Wuffs root directory, assuming that we're starting from // somewhere in the Wuffs repository, so we can find the root directory by // running chdir("..") a number of times. - int n; - for (n = 0; n < 64; n++) { + for (int n = 0; n < 64; n++) { if (access("wuffs-root-directory.txt", F_OK) == 0) { return NULL; } @@ -426,11 +425,9 @@ test_main(int argc, char** argv, proc* tests, proc* benches) { "# install Go, then run \"go get golang.org/x/perf/cmd/benchstat\".\n"); } - int i; - for (i = 0; i < reps; i++) { + for (int i = 0; i < reps; i++) { g_bench_warm_up = i == 0; - proc* p; - for (p = procs; *p; p++) { + for (proc* p = procs; *p; p++) { g_proc_func_name = "unknown_func_name"; g_fail_msg[0] = 0; g_in_focus = false; @@ -562,11 +559,9 @@ copy_to_io_buffer_from_pixel_buffer(wuffs_base__io_buffer* dst, } size_t bytes_per_pixel = bits_per_pixel / 8; - uint32_t p; - for (p = 0; p < 1; p++) { + for (uint32_t p = 0; p < 1; p++) { wuffs_base__table_u8 tab = wuffs_base__pixel_buffer__plane(src, p); - uint32_t y; - for (y = r.min_incl_y; y < r.max_excl_y; y++) { + for (uint32_t y = r.min_incl_y; y < r.max_excl_y; y++) { wuffs_base__slice_u8 row = wuffs_base__table_u8__row(tab, y); if ((r.min_incl_x >= r.max_excl_x) || (r.max_excl_x > (row.len / bytes_per_pixel))) { @@ -748,8 +743,7 @@ hex_dump(char* msg, wuffs_base__io_buffer* buf, size_t i) { return msg; } size_t base = i - (i & 15); - int j; - for (j = -3 * 16; j <= +3 * 16; j += 16) { + for (int j = -3 * 16; j <= +3 * 16; j += 16) { if ((j < 0) && (base < (size_t)(-j))) { continue; } @@ -759,8 +753,7 @@ hex_dump(char* msg, wuffs_base__io_buffer* buf, size_t i) { } size_t n = buf->meta.wi - b; INCR_FAIL(msg, " %06zx:", b); - size_t k; - for (k = 0; k < 16; k++) { + for (size_t k = 0; k < 16; k++) { if (k % 2 == 0) { INCR_FAIL(msg, " "); } @@ -771,7 +764,7 @@ hex_dump(char* msg, wuffs_base__io_buffer* buf, size_t i) { } } INCR_FAIL(msg, " "); - for (k = 0; k < 16; k++) { + for (size_t k = 0; k < 16; k++) { char c = ' '; if (k < n) { c = buf->data.ptr[b + k]; @@ -797,12 +790,10 @@ check_io_buffers_equal(const char* prefix, RETURN_FAIL("%sio_buffers_equal: NULL argument", prefix); } char* msg = g_fail_msg; - size_t i; + size_t i = 0; size_t n = have->meta.wi < want->meta.wi ? have->meta.wi : want->meta.wi; - for (i = 0; i < n; i++) { - if (have->data.ptr[i] != want->data.ptr[i]) { - break; - } + while ((i < n) && (have->data.ptr[i] == want->data.ptr[i])) { + i++; } if (have->meta.wi != want->meta.wi) { INCR_FAIL(msg, "%sio_buffers_equal: wi: have %zu, want %zu.\n", prefix, @@ -893,8 +884,7 @@ proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*, bench_start(); } uint64_t n_bytes = 0; - uint64_t i; - for (i = 0; i < iters; i++) { + for (uint64_t i = 0; i < iters; i++) { have.meta.wi = 0; src.meta.ri = gt->src_offset0; const char* status = @@ -979,8 +969,7 @@ proc_token_decoder(const char* (*codec_func)(wuffs_base__token_buffer*, bench_start(); } uint64_t n_bytes = 0; - uint64_t i; - for (i = 0; i < iters; i++) { + for (uint64_t i = 0; i < iters; i++) { have.meta.wi = 0; src.meta.ri = gt->src_offset0; const char* status = @@ -1067,8 +1056,7 @@ do_run__wuffs_base__image_decoder(wuffs_base__image_decoder* b, wuffs_base__frame_config fc = ((wuffs_base__frame_config){}); wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){}); - size_t i; - for (i = 0; i < quirks_len; i++) { + for (size_t i = 0; i < quirks_len; i++) { wuffs_base__image_decoder__set_quirk_enabled(b, quirks_ptr[i], true); } @@ -1145,9 +1133,8 @@ do_bench_image_decode( bench_start(); uint64_t n_bytes = 0; - uint64_t i; uint64_t iters = iters_unscaled * g_flags.iterscale; - for (i = 0; i < iters; i++) { + for (uint64_t i = 0; i < iters; i++) { src.meta.ri = src_ri; CHECK_STRING((*decode_func)(&n_bytes, NULL, wuffs_initialize_flags, pixfmt, quirks_ptr, quirks_len, &src));