diff --git a/fuzz/c/fuzzlib/fuzzlib.c b/fuzz/c/fuzzlib/fuzzlib.c index 45178f79..1f340464 100644 --- a/fuzz/c/fuzzlib/fuzzlib.c +++ b/fuzz/c/fuzzlib/fuzzlib.c @@ -68,18 +68,8 @@ llvmFuzzerTestOneInput(const uint8_t* data, size_t size) { uint32_t hash1 = jenkins_hash_u32(data + s2, size - s2); uint64_t hash = (((uint64_t)hash0) << 32) | ((uint64_t)hash1); - wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ - .data = ((wuffs_base__slice_u8){ - .ptr = (uint8_t*)(data), - .len = size, - }), - .meta = ((wuffs_base__io_buffer_meta){ - .wi = size, - .ri = 0, - .pos = 0, - .closed = true, - }), - }); + wuffs_base__io_buffer src = + wuffs_base__ptr_u8__reader((uint8_t*)data, size, true); const char* msg = fuzz(&src, hash); if (msg) { diff --git a/fuzz/c/std/bzip2_fuzzer.c b/fuzz/c/std/bzip2_fuzzer.c index 8122f136..424ce829 100644 --- a/fuzz/c/std/bzip2_fuzzer.c +++ b/fuzz/c/std/bzip2_fuzzer.c @@ -101,12 +101,8 @@ fuzz(wuffs_base__io_buffer* src, uint64_t hash) { &dec, WUFFS_BASE__QUIRK_IGNORE_CHECKSUM, hash & 0xFFFE); uint8_t dst_buffer[DST_BUFFER_ARRAY_SIZE]; - wuffs_base__io_buffer dst = ((wuffs_base__io_buffer){ - .data = ((wuffs_base__slice_u8){ - .ptr = dst_buffer, - .len = DST_BUFFER_ARRAY_SIZE, - }), - }); + wuffs_base__io_buffer dst = + wuffs_base__ptr_u8__writer(&dst_buffer[0], DST_BUFFER_ARRAY_SIZE); while (true) { dst.meta.wi = 0; diff --git a/fuzz/c/std/zlib_fuzzer.c b/fuzz/c/std/zlib_fuzzer.c index dab9bfd6..9759de04 100644 --- a/fuzz/c/std/zlib_fuzzer.c +++ b/fuzz/c/std/zlib_fuzzer.c @@ -103,12 +103,8 @@ fuzz(wuffs_base__io_buffer* src, uint64_t hash) { &dec, WUFFS_BASE__QUIRK_IGNORE_CHECKSUM, hash & 0xFFFE); uint8_t dst_buffer[DST_BUFFER_ARRAY_SIZE]; - wuffs_base__io_buffer dst = ((wuffs_base__io_buffer){ - .data = ((wuffs_base__slice_u8){ - .ptr = dst_buffer, - .len = DST_BUFFER_ARRAY_SIZE, - }), - }); + wuffs_base__io_buffer dst = + wuffs_base__ptr_u8__writer(&dst_buffer[0], DST_BUFFER_ARRAY_SIZE); while (true) { dst.meta.wi = 0;