diff --git a/cmd/wuffs-c/internal/cgen/base/core-public.h b/cmd/wuffs-c/internal/cgen/base/core-public.h index 20f11a50..fe5753e2 100644 --- a/cmd/wuffs-c/internal/cgen/base/core-public.h +++ b/cmd/wuffs-c/internal/cgen/base/core-public.h @@ -342,6 +342,13 @@ wuffs_base__slice_u8__subslice_ij(wuffs_base__slice_u8 s, return ((wuffs_base__slice_u8){}); } +// ---------------- Slices and Tables (Utility) + +static inline wuffs_base__slice_u8 // +wuffs_base__utility__null_slice_u8(const wuffs_base__utility* ignored) { + return ((wuffs_base__slice_u8){}); +} + // ---------------- Bureaucracy re -Wunused-function static inline void @@ -374,4 +381,5 @@ wuffs_base__acknowledge_potentially_unused_functions__core_public() { (void)(wuffs_base__u8__min); (void)(wuffs_base__u8__sat_add); (void)(wuffs_base__u8__sat_sub); + (void)(wuffs_base__utility__null_slice_u8); } diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 00280e5c..a10a8ca4 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -78,8 +78,10 @@ const baseCorePublicH = "" + "int8_t) wuffs_base__table_u8;\ntypedef WUFFS_BASE__TABLE(uint16_t) wuffs_base__table_u16;\ntypedef WUFFS_BASE__TABLE(uint32_t) wuffs_base__table_u32;\ntypedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64;\n\n// wuffs_base__slice_u8__subslice_i returns s[i:].\n//\n// It returns an empty slice if i is out of bounds.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__slice_u8__subslice_i(wuffs_base__slice_u8 s, uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// wuffs_base__slice_u8__subslice_j returns s[:j].\n//\n// It returns an empty slice if j is out of bounds.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__slice_u8__subslice_j(wuffs_base__slice_u8 s, uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr,\n .len = j,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// wuffs_base__slice_u8__subslice_" + "ij returns s[i:j].\n//\n// It returns an empty slice if i or j is out of bounds.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__slice_u8__subslice_ij(wuffs_base__slice_u8 s,\n uint64_t i,\n uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n" + "" + + "// ---------------- Slices and Tables (Utility)\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__utility__null_slice_u8(const wuffs_base__utility* ignored) {\n return ((wuffs_base__slice_u8){});\n}\n\n" + + "" + "// ---------------- Bureaucracy re -Wunused-function\n\nstatic inline void\nwuffs_base__acknowledge_potentially_unused_functions__core_public()\n WUFFS_BASE__POTENTIALLY_UNUSED;\n\nstatic inline void\nwuffs_base__acknowledge_potentially_unused_functions__core_public() {\n (void)(wuffs_base__slice_u8__subslice_i);\n (void)(wuffs_base__slice_u8__subslice_ij);\n (void)(wuffs_base__slice_u8__subslice_j);\n (void)(wuffs_base__status__is_complete);\n (void)(wuffs_base__status__is_error);\n (void)(wuffs_base__status__is_ok);\n (void)(wuffs_base__status__is_suspension);\n (void)(wuffs_base__status__is_warning);\n (void)(wuffs_base__u16__max);\n (void)(wuffs_base__u16__min);\n (void)(wuffs_base__u16__sat_add);\n (void)(wuffs_base__u16__sat_sub);\n (void)(wuffs_base__u32__max);\n (void)(wuffs_base__u32__min);\n (void)(wuffs_base__u32__sat_add);\n (void)(wuffs_base__u32__sat_sub);\n (void)(wuffs_base__u64__max);\n (void)(wuffs_base__u64__min);\n (void)(wuffs_base__u64__sat_add);\n (void)(wuffs_base__u64__sat_sub);\n (void)(" + - "wuffs_base__u8__max);\n (void)(wuffs_base__u8__min);\n (void)(wuffs_base__u8__sat_add);\n (void)(wuffs_base__u8__sat_sub);\n}\n" + + "wuffs_base__u8__max);\n (void)(wuffs_base__u8__min);\n (void)(wuffs_base__u8__sat_add);\n (void)(wuffs_base__u8__sat_sub);\n (void)(wuffs_base__utility__null_slice_u8);\n}\n" + "" const baseMemoryPrivateH = "" + diff --git a/example/library/library.c b/example/library/library.c index cb32e499..b298b69b 100644 --- a/example/library/library.c +++ b/example/library/library.c @@ -53,6 +53,9 @@ uint8_t lgtm_ptr[] = { }; size_t lgtm_len = 20; +#define WORK_BUFFER_SIZE (32768 + 512) +uint8_t work_buffer[WORK_BUFFER_SIZE]; + // ignore_return_value suppresses errors from -Wall -Werror. static void ignore_return_value(int ignored) {} @@ -89,8 +92,11 @@ static const char* decode() { free(dec); return status; } - status = - wuffs_deflate__decoder__decode_io_writer(dec, dst_writer, src_reader); + status = wuffs_deflate__decoder__decode_io_writer(dec, dst_writer, src_reader, + ((wuffs_base__slice_u8){ + .ptr = work_buffer, + .len = WORK_BUFFER_SIZE, + })); if (status) { free(dec); return status; diff --git a/example/zcat/zcat.c b/example/zcat/zcat.c index 2296b30e..ec2d5d5a 100644 --- a/example/zcat/zcat.c +++ b/example/zcat/zcat.c @@ -69,8 +69,11 @@ for a C compiler $CC, such as clang or gcc. #define SRC_BUFFER_SIZE (128 * 1024) #endif +#define WORK_BUFFER_SIZE (32768 + 512) + uint8_t dst_buffer[DST_BUFFER_SIZE]; uint8_t src_buffer[SRC_BUFFER_SIZE]; +uint8_t work_buffer[WORK_BUFFER_SIZE]; // ignore_return_value suppresses errors from -Wall -Werror. static void ignore_return_value(int ignored) {} @@ -114,7 +117,11 @@ static const char* decode() { while (true) { status = wuffs_gzip__decoder__decode_io_writer( &dec, wuffs_base__io_buffer__writer(&dst), - wuffs_base__io_buffer__reader(&src)); + wuffs_base__io_buffer__reader(&src), + ((wuffs_base__slice_u8){ + .ptr = work_buffer, + .len = WORK_BUFFER_SIZE, + })); if (dst.meta.wi) { // TODO: handle EINTR and other write errors; see "man 2 write". diff --git a/fuzz/c/std/zlib_fuzzer.c b/fuzz/c/std/zlib_fuzzer.c index 61caf3d3..0f25df03 100644 --- a/fuzz/c/std/zlib_fuzzer.c +++ b/fuzz/c/std/zlib_fuzzer.c @@ -48,6 +48,9 @@ It should print "PASS", amongst other information, and exit(0). #include "../../../release/c/wuffs-unsupported-snapshot.c" #include "../fuzzlib/fuzzlib.c" +#define WORK_BUFFER_SIZE (32768 + 512) +uint8_t work_buffer[WORK_BUFFER_SIZE]; + const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){}); const char* status = @@ -73,8 +76,11 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { while (true) { dst.meta.wi = 0; - status = - wuffs_zlib__decoder__decode_io_writer(&dec, dst_writer, src_reader); + status = wuffs_zlib__decoder__decode_io_writer(&dec, dst_writer, src_reader, + ((wuffs_base__slice_u8){ + .ptr = work_buffer, + .len = WORK_BUFFER_SIZE, + })); if (status != wuffs_base__suspension__short_write) { break; } diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 43d44ad4..d5a680cb 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -108,6 +108,7 @@ var Funcs = []string{ "utility.make_rect_ie_u32(min_incl_x u32, min_incl_y u32, max_excl_x u32, max_excl_y u32) rect_ie_u32", "utility.null_io_reader() io_reader", "utility.null_io_writer() io_writer", + "utility.null_slice_u8() slice u8", // ---- ranges diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 1ce9bbb3..ba0478fe 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -373,6 +373,13 @@ wuffs_base__slice_u8__subslice_ij(wuffs_base__slice_u8 s, return ((wuffs_base__slice_u8){}); } +// ---------------- Slices and Tables (Utility) + +static inline wuffs_base__slice_u8 // +wuffs_base__utility__null_slice_u8(const wuffs_base__utility* ignored) { + return ((wuffs_base__slice_u8){}); +} + // ---------------- Bureaucracy re -Wunused-function static inline void @@ -405,6 +412,7 @@ wuffs_base__acknowledge_potentially_unused_functions__core_public() { (void)(wuffs_base__u8__min); (void)(wuffs_base__u8__sat_add); (void)(wuffs_base__u8__sat_sub); + (void)(wuffs_base__utility__null_slice_u8); } // ---------------- Ranges and Rects @@ -2663,7 +2671,8 @@ sizeof__wuffs_deflate__decoder(); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self, wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src); + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf); // ---------------- Struct Definitions @@ -2770,8 +2779,11 @@ struct wuffs_deflate__decoder__struct { } inline wuffs_base__status // - decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { - return wuffs_deflate__decoder__decode_io_writer(this, a_dst, a_src); + decode_io_writer(wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf) { + return wuffs_deflate__decoder__decode_io_writer(this, a_dst, a_src, + a_workbuf); } #if (__cplusplus >= 201103L) && !defined(WUFFS_IMPLEMENTATION) @@ -2829,7 +2841,8 @@ wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_lzw__decoder__decode_io_writer(wuffs_lzw__decoder* self, wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src); + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf); WUFFS_BASE__MAYBE_STATIC wuffs_base__slice_u8 // wuffs_lzw__decoder__flush(wuffs_lzw__decoder* self); @@ -2917,8 +2930,10 @@ struct wuffs_lzw__decoder__struct { } inline wuffs_base__status // - decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { - return wuffs_lzw__decoder__decode_io_writer(this, a_dst, a_src); + decode_io_writer(wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf) { + return wuffs_lzw__decoder__decode_io_writer(this, a_dst, a_src, a_workbuf); } inline wuffs_base__slice_u8 // @@ -3276,7 +3291,8 @@ wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src); + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf); // ---------------- Struct Definitions @@ -3350,8 +3366,10 @@ struct wuffs_gzip__decoder__struct { } inline wuffs_base__status // - decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { - return wuffs_gzip__decoder__decode_io_writer(this, a_dst, a_src); + decode_io_writer(wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf) { + return wuffs_gzip__decoder__decode_io_writer(this, a_dst, a_src, a_workbuf); } #if (__cplusplus >= 201103L) && !defined(WUFFS_IMPLEMENTATION) @@ -3411,7 +3429,8 @@ wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic); WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src); + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf); // ---------------- Struct Definitions @@ -3482,8 +3501,10 @@ struct wuffs_zlib__decoder__struct { } inline wuffs_base__status // - decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src) { - return wuffs_zlib__decoder__decode_io_writer(this, a_dst, a_src); + decode_io_writer(wuffs_base__io_writer a_dst, + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf) { + return wuffs_zlib__decoder__decode_io_writer(this, a_dst, a_src, a_workbuf); } #if (__cplusplus >= 201103L) && !defined(WUFFS_IMPLEMENTATION) @@ -5922,7 +5943,8 @@ sizeof__wuffs_deflate__decoder() { WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self, wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src) { + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf) { if (!self) { return wuffs_base__error__bad_receiver; } @@ -7705,7 +7727,8 @@ wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw) { WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_lzw__decoder__decode_io_writer(wuffs_lzw__decoder* self, wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src) { + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf) { if (!self) { return wuffs_base__error__bad_receiver; } @@ -10138,7 +10161,8 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, wuffs_base__status t_1 = wuffs_lzw__decoder__decode_io_writer( &self->private_impl.f_lzw, wuffs_base__utility__null_io_writer(&self->private_impl.f_util), - v_r); + v_r, + wuffs_base__utility__null_slice_u8(&self->private_impl.f_util)); iop_v_r = u_r.data.ptr + u_r.meta.ri; v_lzw_status = t_1; } @@ -10423,7 +10447,8 @@ wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic) { WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src) { + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf) { if (!self) { return wuffs_base__error__bad_receiver; } @@ -10657,7 +10682,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, iop_a_src - a_src.private_impl.buf->data.ptr; } wuffs_base__status t_7 = wuffs_deflate__decoder__decode_io_writer( - &self->private_impl.f_flate, a_dst, a_src); + &self->private_impl.f_flate, a_dst, a_src, a_workbuf); if (a_dst.private_impl.buf) { iop_a_dst = a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; @@ -10871,7 +10896,8 @@ wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic) { WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, wuffs_base__io_writer a_dst, - wuffs_base__io_reader a_src) { + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_workbuf) { if (!self) { return wuffs_base__error__bad_receiver; } @@ -10990,7 +11016,7 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, iop_a_src - a_src.private_impl.buf->data.ptr; } wuffs_base__status t_1 = wuffs_deflate__decoder__decode_io_writer( - &self->private_impl.f_flate, a_dst, a_src); + &self->private_impl.f_flate, a_dst, a_src, a_workbuf); if (a_dst.private_impl.buf) { iop_a_dst = a_dst.private_impl.buf->data.ptr + a_dst.private_impl.buf->meta.wi; diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 017dc49f..b40a27dc 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -121,7 +121,7 @@ pub struct decoder?( end_of_block base.bool, ) -pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { +pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) { var status base.status var written slice base.u8 var n_copied base.u64 diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 8e2812c2..5bdee2a3 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -715,7 +715,8 @@ pri func decoder.decode_id_part2?(dst ptr base.pixel_buffer, src base.io_reader, return "?internal error: inconsistent ri/wi" } io_bind (io:r, data:this.compressed[this.compressed_ri:this.compressed_wi]) { - lzw_status =? this.lzw.decode_io_writer?(dst:this.util.null_io_writer(), src:r) + lzw_status =? this.lzw.decode_io_writer?( + dst:this.util.null_io_writer(), src:r, workbuf:this.util.null_slice_u8()) this.compressed_ri ~sat+= r.since_mark().length() } diff --git a/std/gzip/decode_gzip.wuffs b/std/gzip/decode_gzip.wuffs index 7c44b5ca..747f1d4f 100644 --- a/std/gzip/decode_gzip.wuffs +++ b/std/gzip/decode_gzip.wuffs @@ -30,7 +30,7 @@ pub func decoder.set_ignore_checksum!(ic base.bool) { this.ignore_checksum = args.ic } -pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { +pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) { var c base.u8 var flags base.u8 var xlen base.u16 @@ -100,7 +100,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { // Decode and checksum the DEFLATE-encoded payload. while true { args.dst.set_mark!() - status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src) + status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src, workbuf:args.workbuf) if not this.ignore_checksum { checksum_got = this.checksum.update!(x:args.dst.since_mark()) decoded_length_got ~mod+= ((args.dst.since_mark().length() & 0xFFFFFFFF) as base.u32) diff --git a/std/lzw/decode_lzw.wuffs b/std/lzw/decode_lzw.wuffs index 1543ef0d..b0f65645 100644 --- a/std/lzw/decode_lzw.wuffs +++ b/std/lzw/decode_lzw.wuffs @@ -58,7 +58,7 @@ pub func decoder.set_literal_width!(lw base.u32[2..8]) { this.lw = args.lw } -pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { +pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) { var i base.u32[..8191] // Initialize read_from state. diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index f6d09e06..0520b06e 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -32,7 +32,7 @@ pub func decoder.set_ignore_checksum!(ic base.bool) { this.ignore_checksum = args.ic } -pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { +pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) { var x base.u16 var checksum_got base.u32 var status base.status @@ -55,7 +55,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) { // Decode and checksum the DEFLATE-encoded payload. while true { args.dst.set_mark!() - status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src) + status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src, workbuf:args.workbuf) if not this.ignore_checksum { checksum_got = this.checksum.update!(x:args.dst.since_mark()) } diff --git a/test/c/std/deflate.c b/test/c/std/deflate.c index 97f4d2dc..f064dea0 100644 --- a/test/c/std/deflate.c +++ b/test/c/std/deflate.c @@ -156,8 +156,8 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst, set_reader_limit(&src_reader, rlimit); } - status = - wuffs_deflate__decoder__decode_io_writer(&dec, dst_writer, src_reader); + status = wuffs_deflate__decoder__decode_io_writer( + &dec, dst_writer, src_reader, global_work_slice); if ((wlimit && (status == wuffs_base__suspension__short_write)) || (rlimit && (status == wuffs_base__suspension__short_read))) { @@ -276,14 +276,14 @@ const char* test_wuffs_deflate_decode_split_src() { src.meta.closed = false; src.meta.ri = gt->src_offset0; src.meta.wi = split; - const char* z0 = - wuffs_deflate__decoder__decode_io_writer(&dec, dst_writer, src_reader); + const char* z0 = wuffs_deflate__decoder__decode_io_writer( + &dec, dst_writer, src_reader, global_work_slice); src.meta.closed = true; src.meta.ri = split; src.meta.wi = gt->src_offset1; - const char* z1 = - wuffs_deflate__decoder__decode_io_writer(&dec, dst_writer, src_reader); + const char* z1 = wuffs_deflate__decoder__decode_io_writer( + &dec, dst_writer, src_reader, global_work_slice); if (z0 != wuffs_base__suspension__short_read) { RETURN_FAIL("i=%d: z0: got \"%s\", want \"%s\"", i, z0, @@ -324,8 +324,8 @@ const char* do_test_wuffs_deflate_history(int i, set_writer_limit(&dst_writer, limit); - const char* got_z = - wuffs_deflate__decoder__decode_io_writer(dec, dst_writer, src_reader); + const char* got_z = wuffs_deflate__decoder__decode_io_writer( + dec, dst_writer, src_reader, global_work_slice); if (got_z != want_z) { RETURN_FAIL("i=%d: starting_history_index=0x%04" PRIX32 ": decode status: got \"%s\", want \"%s\"", diff --git a/test/c/std/gzip.c b/test/c/std/gzip.c index 43964cd5..8094524e 100644 --- a/test/c/std/gzip.c +++ b/test/c/std/gzip.c @@ -104,8 +104,8 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst, set_reader_limit(&src_reader, rlimit); } - status = - wuffs_gzip__decoder__decode_io_writer(&dec, dst_writer, src_reader); + status = wuffs_gzip__decoder__decode_io_writer(&dec, dst_writer, src_reader, + global_work_slice); if ((wlimit && (status == wuffs_base__suspension__short_write)) || (rlimit && (status == wuffs_base__suspension__short_read))) { @@ -171,8 +171,8 @@ const char* do_test_wuffs_gzip_checksum(bool ignore_checksum, : NULL; } - const char* got_z = - wuffs_gzip__decoder__decode_io_writer(&dec, got_writer, src_reader); + const char* got_z = wuffs_gzip__decoder__decode_io_writer( + &dec, got_writer, src_reader, global_work_slice); if (got_z != want_z) { RETURN_FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z, want_z); diff --git a/test/c/std/lzw.c b/test/c/std/lzw.c index ad7c7626..67d726ae 100644 --- a/test/c/std/lzw.c +++ b/test/c/std/lzw.c @@ -128,7 +128,8 @@ const char* do_test_wuffs_lzw_decode(const char* src_filename, size_t old_wi = got.meta.wi; size_t old_ri = src.meta.ri; - status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader); + status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader, + global_work_slice); if (!status) { if (src.meta.ri != src.meta.wi) { RETURN_FAIL("decode returned \"ok\" but src was not exhausted"); @@ -233,7 +234,7 @@ const char* test_wuffs_lzw_decode_output_bad() { status = wuffs_lzw__decoder__decode_io_writer( &dec, wuffs_base__io_buffer__writer(&got), - wuffs_base__io_buffer__reader(&src)); + wuffs_base__io_buffer__reader(&src), global_work_slice); if (status != wuffs_lzw__error__bad_code) { RETURN_FAIL("decode: \"%s\"", status); } @@ -277,7 +278,7 @@ const char* test_wuffs_lzw_decode_output_empty() { status = wuffs_lzw__decoder__decode_io_writer( &dec, wuffs_base__io_buffer__writer(&got), - wuffs_base__io_buffer__reader(&src)); + wuffs_base__io_buffer__reader(&src), global_work_slice); if (status) { RETURN_FAIL("decode: \"%s\"", status); } @@ -330,7 +331,8 @@ const char* do_bench_wuffs_lzw_decode(const char* filename, if (status) { RETURN_FAIL("check_wuffs_version: \"%s\"", status); } - status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader); + status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader, + global_work_slice); if (status) { RETURN_FAIL("decode: \"%s\"", status); } diff --git a/test/c/std/zlib.c b/test/c/std/zlib.c index 93cc833b..636b60ec 100644 --- a/test/c/std/zlib.c +++ b/test/c/std/zlib.c @@ -104,8 +104,8 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst, set_reader_limit(&src_reader, rlimit); } - status = - wuffs_zlib__decoder__decode_io_writer(&dec, dst_writer, src_reader); + status = wuffs_zlib__decoder__decode_io_writer(&dec, dst_writer, src_reader, + global_work_slice); if ((wlimit && (status == wuffs_base__suspension__short_write)) || (rlimit && (status == wuffs_base__suspension__short_read))) { @@ -170,8 +170,8 @@ const char* do_test_wuffs_zlib_checksum(bool ignore_checksum, : NULL; } - const char* got_z = - wuffs_zlib__decoder__decode_io_writer(&dec, got_writer, src_reader); + const char* got_z = wuffs_zlib__decoder__decode_io_writer( + &dec, got_writer, src_reader, global_work_slice); if (got_z != want_z) { RETURN_FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z, want_z);