diff --git a/test/c/std/deflate.c b/test/c/std/deflate.c index dded7b1a..3d65c165 100644 --- a/test/c/std/deflate.c +++ b/test/c/std/deflate.c @@ -116,11 +116,11 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst, while (true) { wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst); if (wlimit) { - wuffs_base__io_writer__set_limit(&dst_writer, wlimit); + set_writer_limit(&dst_writer, wlimit); } wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src); if (rlimit) { - wuffs_base__io_reader__set_limit(&src_reader, rlimit); + set_reader_limit(&src_reader, rlimit); } wuffs_deflate__status s = @@ -273,7 +273,7 @@ bool do_test_wuffs_deflate_history(int i, dec->private_impl.f_history_index = starting_history_index; - wuffs_base__io_writer__set_limit(&dst_writer, limit); + set_writer_limit(&dst_writer, limit); wuffs_deflate__status got_s = wuffs_deflate__decoder__decode(dec, dst_writer, src_reader); diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 2d7efd7a..438567a5 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -212,11 +212,11 @@ bool do_test_wuffs_lzw_decode(const char* src_filename, num_iters++; wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got); if (wlimit) { - wuffs_base__io_writer__set_limit(&got_writer, wlimit); + set_writer_limit(&got_writer, wlimit); } wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); if (rlimit) { - wuffs_base__io_reader__set_limit(&src_reader, rlimit); + set_reader_limit(&src_reader, rlimit); } size_t old_wi = got.wi; size_t old_ri = src.ri; @@ -435,11 +435,11 @@ bool do_test_wuffs_gif_decode(const char* filename, num_iters++; wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got); if (wlimit) { - wuffs_base__io_writer__set_limit(&got_writer, wlimit); + set_writer_limit(&got_writer, wlimit); } wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); if (rlimit) { - wuffs_base__io_reader__set_limit(&src_reader, rlimit); + set_reader_limit(&src_reader, rlimit); } size_t old_wi = got.wi; size_t old_ri = src.ri; diff --git a/test/c/std/gzip.c b/test/c/std/gzip.c index 6af72f9c..5ff5f2e1 100644 --- a/test/c/std/gzip.c +++ b/test/c/std/gzip.c @@ -72,11 +72,11 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst, while (true) { wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst); if (wlimit) { - wuffs_base__io_writer__set_limit(&dst_writer, wlimit); + set_writer_limit(&dst_writer, wlimit); } wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src); if (rlimit) { - wuffs_base__io_reader__set_limit(&src_reader, rlimit); + set_reader_limit(&src_reader, rlimit); } wuffs_gzip__status s = @@ -133,8 +133,7 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) { FAIL("end_limit=%d: not enough source data", end_limit); return false; } - wuffs_base__io_reader__set_limit(&src_reader, - src.wi - (uint64_t)(end_limit)); + set_reader_limit(&src_reader, src.wi - (uint64_t)(end_limit)); want = WUFFS_GZIP__SUSPENSION_SHORT_READ; } else { want = (bad_checksum && !ignore_checksum) @@ -205,8 +204,7 @@ void test_mimic_gzip_decode_pi() { void bench_wuffs_gzip_decode_10k() { CHECK_FOCUS(__func__); - do_bench_io_buffers(wuffs_gzip_decode, tc_dst, &gzip_midsummer_gt, 0, 0, - 300); + do_bench_io_buffers(wuffs_gzip_decode, tc_dst, &gzip_midsummer_gt, 0, 0, 300); } void bench_wuffs_gzip_decode_100k() { @@ -220,8 +218,7 @@ void bench_wuffs_gzip_decode_100k() { void bench_mimic_gzip_decode_10k() { CHECK_FOCUS(__func__); - do_bench_io_buffers(mimic_gzip_decode, tc_dst, &gzip_midsummer_gt, 0, 0, - 300); + do_bench_io_buffers(mimic_gzip_decode, tc_dst, &gzip_midsummer_gt, 0, 0, 300); } void bench_mimic_gzip_decode_100k() { diff --git a/test/c/std/zlib.c b/test/c/std/zlib.c index bd5370cf..366014fd 100644 --- a/test/c/std/zlib.c +++ b/test/c/std/zlib.c @@ -87,11 +87,11 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst, while (true) { wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst); if (wlimit) { - wuffs_base__io_writer__set_limit(&dst_writer, wlimit); + set_writer_limit(&dst_writer, wlimit); } wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src); if (rlimit) { - wuffs_base__io_reader__set_limit(&src_reader, rlimit); + set_reader_limit(&src_reader, rlimit); } wuffs_zlib__status s = @@ -147,8 +147,7 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) { FAIL("end_limit=%d: not enough source data", end_limit); return false; } - wuffs_base__io_reader__set_limit(&src_reader, - src.wi - (uint64_t)(end_limit)); + set_reader_limit(&src_reader, src.wi - (uint64_t)(end_limit)); want = WUFFS_ZLIB__SUSPENSION_SHORT_READ; } else { want = (bad_checksum && !ignore_checksum) @@ -214,8 +213,7 @@ void test_mimic_zlib_decode_pi() { void bench_wuffs_zlib_decode_10k() { CHECK_FOCUS(__func__); - do_bench_io_buffers(wuffs_zlib_decode, tc_dst, &zlib_midsummer_gt, 0, 0, - 300); + do_bench_io_buffers(wuffs_zlib_decode, tc_dst, &zlib_midsummer_gt, 0, 0, 300); } void bench_wuffs_zlib_decode_100k() { @@ -229,8 +227,7 @@ void bench_wuffs_zlib_decode_100k() { void bench_mimic_zlib_decode_10k() { CHECK_FOCUS(__func__); - do_bench_io_buffers(mimic_zlib_decode, tc_dst, &zlib_midsummer_gt, 0, 0, - 300); + do_bench_io_buffers(mimic_zlib_decode, tc_dst, &zlib_midsummer_gt, 0, 0, 300); } void bench_mimic_zlib_decode_100k() { diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index df78f632..648752d7 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -290,8 +290,7 @@ int test_main(int argc, char** argv, proc* tests, proc* benches) { // WUFFS_BASE_HEADER_H is where wuffs_base__io_buffer is defined. #ifdef WUFFS_BASE_HEADER_H -void wuffs_base__io_reader__set_limit(wuffs_base__io_reader* o, - uint64_t limit) { +void set_reader_limit(wuffs_base__io_reader* o, uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri; uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi; @@ -305,8 +304,7 @@ void wuffs_base__io_reader__set_limit(wuffs_base__io_reader* o, } } -void wuffs_base__io_writer__set_limit(wuffs_base__io_writer* o, - uint64_t limit) { +void set_writer_limit(wuffs_base__io_writer* o, uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi; uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;