diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 8c3a25a1..943be141 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2674,6 +2674,9 @@ sizeof__wuffs_deflate__decoder(); // ---------------- Public Function Prototypes +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_deflate__decoder__workbuf_len(const wuffs_deflate__decoder* self); + WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self, wuffs_base__io_writer a_dst, @@ -2710,6 +2713,7 @@ struct wuffs_deflate__decoder__struct { uint32_t f_history_index; uint8_t f_code_lengths[320]; bool f_end_of_block; + wuffs_base__utility f_util; struct { uint32_t coro_susp_point; @@ -2784,6 +2788,11 @@ struct wuffs_deflate__decoder__struct { wuffs_version); } + inline wuffs_base__range_ii_u64 // + workbuf_len() const { + return wuffs_deflate__decoder__workbuf_len(this); + } + inline wuffs_base__status // decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src, @@ -2850,6 +2859,9 @@ sizeof__wuffs_lzw__decoder(); WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw); +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_lzw__decoder__workbuf_len(const wuffs_lzw__decoder* self); + WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_lzw__decoder__decode_io_writer(wuffs_lzw__decoder* self, wuffs_base__io_writer a_dst, @@ -2897,6 +2909,7 @@ struct wuffs_lzw__decoder__struct { uint16_t f_prefixes[4096]; uint16_t f_lm1s[4096]; uint8_t f_output[8199]; + wuffs_base__utility f_util; struct { uint32_t coro_susp_point; @@ -2941,6 +2954,11 @@ struct wuffs_lzw__decoder__struct { return wuffs_lzw__decoder__set_literal_width(this, a_lw); } + inline wuffs_base__range_ii_u64 // + workbuf_len() const { + return wuffs_lzw__decoder__workbuf_len(this); + } + inline wuffs_base__status // decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src, @@ -3312,6 +3330,9 @@ sizeof__wuffs_gzip__decoder(); WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic); +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_gzip__decoder__workbuf_len(const wuffs_gzip__decoder* self); + WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, wuffs_base__io_writer a_dst, @@ -3343,6 +3364,7 @@ struct wuffs_gzip__decoder__struct { wuffs_deflate__decoder f_flate; wuffs_crc32__ieee_hasher f_checksum; bool f_ignore_checksum; + wuffs_base__utility f_util; struct { uint32_t coro_susp_point; @@ -3389,6 +3411,11 @@ struct wuffs_gzip__decoder__struct { return wuffs_gzip__decoder__set_ignore_checksum(this, a_ic); } + inline wuffs_base__range_ii_u64 // + workbuf_len() const { + return wuffs_gzip__decoder__workbuf_len(this); + } + inline wuffs_base__status // decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src, @@ -3456,6 +3483,9 @@ sizeof__wuffs_zlib__decoder(); WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct // wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic); +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_zlib__decoder__workbuf_len(const wuffs_zlib__decoder* self); + WUFFS_BASE__MAYBE_STATIC wuffs_base__status // wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, wuffs_base__io_writer a_dst, @@ -3487,6 +3517,7 @@ struct wuffs_zlib__decoder__struct { wuffs_deflate__decoder f_flate; wuffs_adler32__hasher f_checksum; bool f_ignore_checksum; + wuffs_base__utility f_util; struct { uint32_t coro_susp_point; @@ -3530,6 +3561,11 @@ struct wuffs_zlib__decoder__struct { return wuffs_zlib__decoder__set_ignore_checksum(this, a_ic); } + inline wuffs_base__range_ii_u64 // + workbuf_len() const { + return wuffs_zlib__decoder__workbuf_len(this); + } + inline wuffs_base__status // decode_io_writer(wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src, @@ -5974,6 +6010,21 @@ sizeof__wuffs_deflate__decoder() { // ---------------- Function Implementations +// -------- func deflate.decoder.workbuf_len + +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_deflate__decoder__workbuf_len(const wuffs_deflate__decoder* self) { + if (!self) { + return ((wuffs_base__range_ii_u64){}); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return ((wuffs_base__range_ii_u64){}); + } + + return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util, + 33280, 33280); +} + // -------- func deflate.decoder.decode_io_writer WUFFS_BASE__MAYBE_STATIC wuffs_base__status // @@ -7758,6 +7809,21 @@ wuffs_lzw__decoder__set_literal_width(wuffs_lzw__decoder* self, uint32_t a_lw) { return ((wuffs_base__empty_struct){}); } +// -------- func lzw.decoder.workbuf_len + +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_lzw__decoder__workbuf_len(const wuffs_lzw__decoder* self) { + if (!self) { + return ((wuffs_base__range_ii_u64){}); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return ((wuffs_base__range_ii_u64){}); + } + + return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util, 0, + 0); +} + // -------- func lzw.decoder.decode_io_writer WUFFS_BASE__MAYBE_STATIC wuffs_base__status // @@ -10482,6 +10548,21 @@ wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, bool a_ic) { return ((wuffs_base__empty_struct){}); } +// -------- func gzip.decoder.workbuf_len + +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_gzip__decoder__workbuf_len(const wuffs_gzip__decoder* self) { + if (!self) { + return ((wuffs_base__range_ii_u64){}); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return ((wuffs_base__range_ii_u64){}); + } + + return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util, + 33280, 33280); +} + // -------- func gzip.decoder.decode_io_writer WUFFS_BASE__MAYBE_STATIC wuffs_base__status // @@ -10931,6 +11012,21 @@ wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, bool a_ic) { return ((wuffs_base__empty_struct){}); } +// -------- func zlib.decoder.workbuf_len + +WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 // +wuffs_zlib__decoder__workbuf_len(const wuffs_zlib__decoder* self) { + if (!self) { + return ((wuffs_base__range_ii_u64){}); + } + if (self->private_impl.magic != WUFFS_BASE__MAGIC) { + return ((wuffs_base__range_ii_u64){}); + } + + return wuffs_base__utility__make_range_ii_u64(&self->private_impl.f_util, + 33280, 33280); +} + // -------- func zlib.decoder.decode_io_writer WUFFS_BASE__MAYBE_STATIC wuffs_base__status // diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 18c56fbc..f1e4956d 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -121,8 +121,16 @@ pub struct decoder?( // // TODO: can decode_huffman_xxx signal this in band instead of out of band? end_of_block base.bool, + + util base.utility, ) +pub func decoder.workbuf_len() base.range_ii_u64 { + return this.util.make_range_ii_u64( + min_incl:decoder_workbuf_len_max_incl, + max_incl:decoder_workbuf_len_max_incl) +} + 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 diff --git a/std/gzip/decode_gzip.wuffs b/std/gzip/decode_gzip.wuffs index 296f6d8d..a1e84377 100644 --- a/std/gzip/decode_gzip.wuffs +++ b/std/gzip/decode_gzip.wuffs @@ -27,12 +27,19 @@ pub struct decoder?( flate deflate.decoder, checksum crc32.ieee_hasher, ignore_checksum base.bool, + util base.utility, ) pub func decoder.set_ignore_checksum!(ic base.bool) { this.ignore_checksum = args.ic } +pub func decoder.workbuf_len() base.range_ii_u64 { + return this.util.make_range_ii_u64( + min_incl:decoder_workbuf_len_max_incl, + max_incl:decoder_workbuf_len_max_incl) +} + 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 diff --git a/std/lzw/decode_lzw.wuffs b/std/lzw/decode_lzw.wuffs index 5a46871c..f7ec8986 100644 --- a/std/lzw/decode_lzw.wuffs +++ b/std/lzw/decode_lzw.wuffs @@ -56,12 +56,18 @@ pub struct decoder?( // output[output_ri:output_wi] is the buffered output, connecting read_from // with write_to and flush. output array[8192 + 7] base.u8, + + util base.utility, ) pub func decoder.set_literal_width!(lw base.u32[2..8]) { this.lw = args.lw } +pub func decoder.workbuf_len() base.range_ii_u64 { + return this.util.make_range_ii_u64(min_incl:0, max_incl:0) +} + pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) { var i base.u32[..8191] diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index ff42ad00..f7d749d0 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -29,12 +29,19 @@ pub struct decoder?( flate deflate.decoder, checksum adler32.hasher, ignore_checksum base.bool, + util base.utility, ) pub func decoder.set_ignore_checksum!(ic base.bool) { this.ignore_checksum = args.ic } +pub func decoder.workbuf_len() base.range_ii_u64 { + return this.util.make_range_ii_u64( + min_incl:decoder_workbuf_len_max_incl, + max_incl:decoder_workbuf_len_max_incl) +} + 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