diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 93f5714a..a035b74e 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -358,7 +358,7 @@ func (g *gen) genImpl(b *buffer) error { if g.pkgName == "gif" { b.writes("static inline void wuffs_gif__lzw_decoder__reset(wuffs_gif__lzw_decoder *self) {") b.writes("memset(self, 0, sizeof *self);") - b.writes("wuffs_gif__lzw_decoder__check_wuffs_version(self, WUFFS_VERSION, sizeof *self);") + b.writes("wuffs_gif__lzw_decoder__check_wuffs_version(self, sizeof *self, WUFFS_VERSION);") b.writes("}\n\n") } @@ -671,9 +671,9 @@ func (g *gen) writeInitializerSignature(b *buffer, n *a.Struct, public bool) err b.printf("//\n") b.printf("// It should be called before any other %s%s__* function.\n", g.pkgPrefix, structName) b.printf("//\n") - b.printf("// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.\n") + b.printf("// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.\n") } - b.printf("void %s%s__check_wuffs_version(%s%s *self, uint32_t wuffs_version, size_t sizeof_star_self)", + b.printf("void %s%s__check_wuffs_version(%s%s *self, size_t sizeof_star_self, uint32_t wuffs_version)", g.pkgPrefix, structName, g.pkgPrefix, structName) return nil } @@ -699,14 +699,14 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error { b.printf("{\n") b.printf("if (!self) { return; }\n") - b.printf("if (wuffs_version != WUFFS_VERSION) {\n") - b.printf("self->private_impl.status = %sERROR_BAD_WUFFS_VERSION;\n", g.PKGPREFIX) - b.printf("return;\n") - b.printf("}\n") b.printf("if (sizeof(*self) != sizeof_star_self) {\n") b.printf("self->private_impl.status = %sERROR_BAD_SIZEOF_RECEIVER;\n", g.PKGPREFIX) b.printf("return;\n") b.printf("}\n") + b.printf("if (wuffs_version != WUFFS_VERSION) {\n") + b.printf("self->private_impl.status = %sERROR_BAD_WUFFS_VERSION;\n", g.PKGPREFIX) + b.printf("return;\n") + b.printf("}\n") b.printf("if (self->private_impl.magic != 0) {\n") b.printf("self->private_impl.status = %sERROR_CHECK_WUFFS_VERSION_CALLED_TWICE;\n", g.PKGPREFIX) b.printf("return;\n") @@ -736,7 +736,7 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error { continue } - b.printf("%s%s__check_wuffs_version(&self->private_impl.%s%s, WUFFS_VERSION, sizeof(self->private_impl.%s%s));\n", + b.printf("%s%s__check_wuffs_version(&self->private_impl.%s%s, sizeof(self->private_impl.%s%s), WUFFS_VERSION);\n", prefix, qid[1].Str(g.tm), fPrefix, f.Name().Str(g.tm), fPrefix, f.Name().Str(g.tm)) } diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index ca041e3f..7fe568e9 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -228,7 +228,7 @@ const char* play() { } wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ .ptr = src_buffer, .len = src_len, .wi = src_len, .closed = true}); diff --git a/example/library/library.c b/example/library/library.c index f50958ec..505b8070 100644 --- a/example/library/library.c +++ b/example/library/library.c @@ -60,7 +60,7 @@ static const char* decode() { wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){}); - wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_deflate__status s = wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader); if (s) { diff --git a/example/zcat/zcat.c b/example/zcat/zcat.c index 127a8d9d..d5a0d5c5 100644 --- a/example/zcat/zcat.c +++ b/example/zcat/zcat.c @@ -56,7 +56,7 @@ static void ignore_return_value(int ignored) {} static const char* decode() { wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){}); - wuffs_gzip__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); while (true) { const int stdin_fd = 0; diff --git a/fuzz/c/std/gif_fuzzer.c b/fuzz/c/std/gif_fuzzer.c index 8d7bb06f..18790876 100644 --- a/fuzz/c/std/gif_fuzzer.c +++ b/fuzz/c/std/gif_fuzzer.c @@ -47,7 +47,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { { wuffs_gif__status s = 0; wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); wuffs_base__image_config ic = ((wuffs_base__image_config){}); diff --git a/fuzz/c/std/zlib_fuzzer.c b/fuzz/c/std/zlib_fuzzer.c index ba871516..e6ab0926 100644 --- a/fuzz/c/std/zlib_fuzzer.c +++ b/fuzz/c/std/zlib_fuzzer.c @@ -44,7 +44,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { const char* ret = NULL; wuffs_zlib__status s = 0; wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){}); - wuffs_zlib__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); // Ignore the checksum for 99.99%-ish of all input. When fuzzers generate // random input, the checkum is very unlikely to match. Still, it's useful to diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index ed56226d..52ba9eca 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1219,10 +1219,10 @@ typedef struct { // // It should be called before any other wuffs_adler32__hasher__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1796,19 +1796,19 @@ const char* wuffs_adler32__status__string(wuffs_adler32__status s) { // ---------------- Initializer Implementations void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self) { + size_t sizeof_star_self, + uint32_t wuffs_version) { if (!self) { return; } - if (wuffs_version != WUFFS_VERSION) { - self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION; - return; - } if (sizeof(*self) != sizeof_star_self) { self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER; return; } + if (wuffs_version != WUFFS_VERSION) { + self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION; + return; + } if (self->private_impl.magic != 0) { self->private_impl.status = WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index ac6ae4fe..cde854a0 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1217,11 +1217,11 @@ typedef struct { // // It should be called before any other wuffs_crc32__ieee_hasher__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_crc32__ieee_hasher__check_wuffs_version( wuffs_crc32__ieee_hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -2159,19 +2159,19 @@ static const uint32_t wuffs_crc32__ieee_table[8][256] = { void wuffs_crc32__ieee_hasher__check_wuffs_version( wuffs_crc32__ieee_hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self) { + size_t sizeof_star_self, + uint32_t wuffs_version) { if (!self) { return; } - if (wuffs_version != WUFFS_VERSION) { - self->private_impl.status = WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION; - return; - } if (sizeof(*self) != sizeof_star_self) { self->private_impl.status = WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER; return; } + if (wuffs_version != WUFFS_VERSION) { + self->private_impl.status = WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION; + return; + } if (self->private_impl.magic != 0) { self->private_impl.status = WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index bebf7bcb..217c7331 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1307,10 +1307,10 @@ typedef struct { // // It should be called before any other wuffs_deflate__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1979,19 +1979,19 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( // ---------------- Initializer Implementations void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self) { + size_t sizeof_star_self, + uint32_t wuffs_version) { if (!self) { return; } - if (wuffs_version != WUFFS_VERSION) { - self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION; - return; - } if (sizeof(*self) != sizeof_star_self) { self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER; return; } + if (wuffs_version != WUFFS_VERSION) { + self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION; + return; + } if (self->private_impl.magic != 0) { self->private_impl.status = WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index cb268c9b..58dd998f 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1351,10 +1351,10 @@ typedef struct { // // It should be called before any other wuffs_gif__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1955,13 +1955,13 @@ static const uint8_t wuffs_gif__netscape2dot0[11] = { // ---------------- Private Initializer Prototypes void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); static inline void wuffs_gif__lzw_decoder__reset(wuffs_gif__lzw_decoder* self) { memset(self, 0, sizeof *self); - wuffs_gif__lzw_decoder__check_wuffs_version(self, WUFFS_VERSION, - sizeof *self); + wuffs_gif__lzw_decoder__check_wuffs_version(self, sizeof *self, + WUFFS_VERSION); } // ---------------- Private Function Prototypes @@ -2015,19 +2015,19 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( // ---------------- Initializer Implementations void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self) { + size_t sizeof_star_self, + uint32_t wuffs_version) { if (!self) { return; } - if (wuffs_version != WUFFS_VERSION) { - self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION; - return; - } if (sizeof(*self) != sizeof_star_self) { self->private_impl.status = WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER; return; } + if (wuffs_version != WUFFS_VERSION) { + self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION; + return; + } if (self->private_impl.magic != 0) { self->private_impl.status = WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; @@ -2037,19 +2037,19 @@ void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self, } void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self) { + size_t sizeof_star_self, + uint32_t wuffs_version) { if (!self) { return; } - if (wuffs_version != WUFFS_VERSION) { - self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION; - return; - } if (sizeof(*self) != sizeof_star_self) { self->private_impl.status = WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER; return; } + if (wuffs_version != WUFFS_VERSION) { + self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION; + return; + } if (self->private_impl.magic != 0) { self->private_impl.status = WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; @@ -2057,8 +2057,8 @@ void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self, } self->private_impl.magic = WUFFS_BASE__MAGIC; wuffs_gif__lzw_decoder__check_wuffs_version(&self->private_impl.f_lzw, - WUFFS_VERSION, - sizeof(self->private_impl.f_lzw)); + sizeof(self->private_impl.f_lzw), + WUFFS_VERSION); } // ---------------- Function Implementations diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 9bd3b4fd..0f3d471d 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1226,11 +1226,11 @@ typedef struct { // // It should be called before any other wuffs_crc32__ieee_hasher__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_crc32__ieee_hasher__check_wuffs_version( wuffs_crc32__ieee_hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1411,10 +1411,10 @@ typedef struct { // // It should be called before any other wuffs_deflate__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1517,10 +1517,10 @@ typedef struct { // // It should be called before any other wuffs_gzip__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -2107,19 +2107,19 @@ const char* wuffs_gzip__status__string(wuffs_gzip__status s) { // ---------------- Initializer Implementations void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self) { + size_t sizeof_star_self, + uint32_t wuffs_version) { if (!self) { return; } - if (wuffs_version != WUFFS_VERSION) { - self->private_impl.status = WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION; - return; - } if (sizeof(*self) != sizeof_star_self) { self->private_impl.status = WUFFS_GZIP__ERROR_BAD_SIZEOF_RECEIVER; return; } + if (wuffs_version != WUFFS_VERSION) { + self->private_impl.status = WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION; + return; + } if (self->private_impl.magic != 0) { self->private_impl.status = WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; @@ -2127,11 +2127,11 @@ void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self, } self->private_impl.magic = WUFFS_BASE__MAGIC; wuffs_deflate__decoder__check_wuffs_version( - &self->private_impl.f_flate, WUFFS_VERSION, - sizeof(self->private_impl.f_flate)); + &self->private_impl.f_flate, sizeof(self->private_impl.f_flate), + WUFFS_VERSION); wuffs_crc32__ieee_hasher__check_wuffs_version( - &self->private_impl.f_checksum, WUFFS_VERSION, - sizeof(self->private_impl.f_checksum)); + &self->private_impl.f_checksum, sizeof(self->private_impl.f_checksum), + WUFFS_VERSION); } // ---------------- Function Implementations diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 95f43d9d..3e5403fe 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1228,10 +1228,10 @@ typedef struct { // // It should be called before any other wuffs_adler32__hasher__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1412,10 +1412,10 @@ typedef struct { // // It should be called before any other wuffs_deflate__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1517,10 +1517,10 @@ typedef struct { // // It should be called before any other wuffs_zlib__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -2108,19 +2108,19 @@ const char* wuffs_zlib__status__string(wuffs_zlib__status s) { // ---------------- Initializer Implementations void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self) { + size_t sizeof_star_self, + uint32_t wuffs_version) { if (!self) { return; } - if (wuffs_version != WUFFS_VERSION) { - self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION; - return; - } if (sizeof(*self) != sizeof_star_self) { self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_SIZEOF_RECEIVER; return; } + if (wuffs_version != WUFFS_VERSION) { + self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION; + return; + } if (self->private_impl.magic != 0) { self->private_impl.status = WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; @@ -2128,11 +2128,11 @@ void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self, } self->private_impl.magic = WUFFS_BASE__MAGIC; wuffs_deflate__decoder__check_wuffs_version( - &self->private_impl.f_flate, WUFFS_VERSION, - sizeof(self->private_impl.f_flate)); + &self->private_impl.f_flate, sizeof(self->private_impl.f_flate), + WUFFS_VERSION); wuffs_adler32__hasher__check_wuffs_version( - &self->private_impl.f_checksum, WUFFS_VERSION, - sizeof(self->private_impl.f_checksum)); + &self->private_impl.f_checksum, sizeof(self->private_impl.f_checksum), + WUFFS_VERSION); } // ---------------- Function Implementations diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 225f984b..a27b2caf 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -1219,10 +1219,10 @@ typedef struct { // // It should be called before any other wuffs_adler32__hasher__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index a01ac68f..feae69e3 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -1217,11 +1217,11 @@ typedef struct { // // It should be called before any other wuffs_crc32__ieee_hasher__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_crc32__ieee_hasher__check_wuffs_version( wuffs_crc32__ieee_hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index acc659d6..4292568f 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -1307,10 +1307,10 @@ typedef struct { // // It should be called before any other wuffs_deflate__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index a0e774d3..c504bdc1 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1351,10 +1351,10 @@ typedef struct { // // It should be called before any other wuffs_gif__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index 1ba58ce3..a447eba3 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -1226,11 +1226,11 @@ typedef struct { // // It should be called before any other wuffs_crc32__ieee_hasher__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_crc32__ieee_hasher__check_wuffs_version( wuffs_crc32__ieee_hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1411,10 +1411,10 @@ typedef struct { // // It should be called before any other wuffs_deflate__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1517,10 +1517,10 @@ typedef struct { // // It should be called before any other wuffs_gzip__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index ed35d7d8..6f55d847 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -1228,10 +1228,10 @@ typedef struct { // // It should be called before any other wuffs_adler32__hasher__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1412,10 +1412,10 @@ typedef struct { // // It should be called before any other wuffs_deflate__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes @@ -1517,10 +1517,10 @@ typedef struct { // // It should be called before any other wuffs_zlib__decoder__* function. // -// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self. +// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version. void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self, - uint32_t wuffs_version, - size_t sizeof_star_self); + size_t sizeof_star_self, + uint32_t wuffs_version); // ---------------- Public Function Prototypes diff --git a/test/c/std/adler32.c b/test/c/std/adler32.c index a1ee41dd..dba1e037 100644 --- a/test/c/std/adler32.c +++ b/test/c/std/adler32.c @@ -107,8 +107,8 @@ void test_wuffs_adler32_golden() { int j; for (j = 0; j < 2; j++) { wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){}); - wuffs_adler32__hasher__check_wuffs_version(&checksum, WUFFS_VERSION, - sizeof checksum); + wuffs_adler32__hasher__check_wuffs_version(&checksum, sizeof checksum, + WUFFS_VERSION); uint32_t got = 0; size_t num_fragments = 0; @@ -167,8 +167,8 @@ void test_wuffs_adler32_pi() { int i; for (i = 0; i < 64; i++) { wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){}); - wuffs_adler32__hasher__check_wuffs_version(&checksum, WUFFS_VERSION, - sizeof checksum); + wuffs_adler32__hasher__check_wuffs_version(&checksum, sizeof checksum, + WUFFS_VERSION); uint32_t got = wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){ .ptr = (uint8_t*)(digits), @@ -195,8 +195,8 @@ const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst, len = wuffs_base__u64__min(len, rlimit); } wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){}); - wuffs_adler32__hasher__check_wuffs_version(&checksum, WUFFS_VERSION, - sizeof checksum); + wuffs_adler32__hasher__check_wuffs_version(&checksum, sizeof checksum, + WUFFS_VERSION); global_wuffs_adler32_unused_u32 = wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){ .ptr = src->ptr + src->ri, diff --git a/test/c/std/crc32.c b/test/c/std/crc32.c index b39433ce..889b132a 100644 --- a/test/c/std/crc32.c +++ b/test/c/std/crc32.c @@ -107,8 +107,8 @@ void test_wuffs_crc32_ieee_golden() { int j; for (j = 0; j < 2; j++) { wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){}); - wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, WUFFS_VERSION, - sizeof checksum); + wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, sizeof checksum, + WUFFS_VERSION); uint32_t got = 0; size_t num_fragments = 0; @@ -167,8 +167,8 @@ void test_wuffs_crc32_ieee_pi() { int i; for (i = 0; i < 64; i++) { wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){}); - wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, WUFFS_VERSION, - sizeof checksum); + wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, sizeof checksum, + WUFFS_VERSION); uint32_t got = wuffs_crc32__ieee_hasher__update( &checksum, ((wuffs_base__slice_u8){ .ptr = (uint8_t*)(digits), @@ -195,8 +195,8 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst, len = wuffs_base__u64__min(len, rlimit); } wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){}); - wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, WUFFS_VERSION, - sizeof checksum); + wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, sizeof checksum, + WUFFS_VERSION); global_wuffs_crc32_unused_u32 = wuffs_crc32__ieee_hasher__update(&checksum, ((wuffs_base__slice_u8){ .ptr = src->ptr + src->ri, diff --git a/test/c/std/deflate.c b/test/c/std/deflate.c index 5a8bef02..aabea65d 100644 --- a/test/c/std/deflate.c +++ b/test/c/std/deflate.c @@ -112,7 +112,7 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst, uint64_t wlimit, uint64_t rlimit) { wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){}); - wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); while (true) { wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst); if (wlimit) { @@ -220,8 +220,8 @@ void test_wuffs_deflate_decode_split_src() { got.wi = 0; wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){}); - wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, - sizeof dec); + wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, + WUFFS_VERSION); src.closed = false; src.ri = gt->src_offset0; @@ -312,8 +312,8 @@ void test_wuffs_deflate_history_full() { int i; for (i = -2; i <= +2; i++) { wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){}); - wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, - sizeof dec); + wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, + WUFFS_VERSION); if (!do_test_wuffs_deflate_history( i, gt, &src, &got, &dec, 0, want.wi + i, @@ -379,8 +379,8 @@ void test_wuffs_deflate_history_partial() { const uint32_t fragment_length = 4; wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){}); - wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, - sizeof dec); + wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, + WUFFS_VERSION); if (!do_test_wuffs_deflate_history(i, gt, &src, &got, &dec, starting_history_index, fragment_length, @@ -463,7 +463,7 @@ void test_wuffs_deflate_table_redirect() { // 2nd is the key in the second level table (variable bits). wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){}); - wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); int i; int n = 0; diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 6556df0b..0cb37fe9 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -54,18 +54,22 @@ void test_basic_bad_receiver() { wuffs_base__io_reader src = ((wuffs_base__io_reader){}); wuffs_gif__status status = wuffs_gif__decoder__decode_config(NULL, &ic, src); if (status != WUFFS_GIF__ERROR_BAD_RECEIVER) { - FAIL("decode_config: got %d, want %d", status, - WUFFS_GIF__ERROR_BAD_RECEIVER); + FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status, + wuffs_gif__status__string(status), WUFFS_GIF__ERROR_BAD_RECEIVER, + wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_RECEIVER)); } } void test_basic_bad_sizeof_receiver() { CHECK_FOCUS(__func__); wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, 0); + wuffs_gif__decoder__check_wuffs_version(&dec, 0, WUFFS_VERSION); if (dec.private_impl.status != WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER) { - FAIL("decode_config: got %d, want %d", dec.private_impl.status, - WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER); + FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", + dec.private_impl.status, + wuffs_gif__status__string(dec.private_impl.status), + WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER, + wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER)); return; } } @@ -73,10 +77,14 @@ void test_basic_bad_sizeof_receiver() { void test_basic_bad_wuffs_version() { CHECK_FOCUS(__func__); wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION ^ 0x12345678, 0); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, + WUFFS_VERSION ^ 0x12345678); if (dec.private_impl.status != WUFFS_GIF__ERROR_BAD_WUFFS_VERSION) { - FAIL("decode_config: got %d, want %d", dec.private_impl.status, - WUFFS_GIF__ERROR_BAD_WUFFS_VERSION); + FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", + dec.private_impl.status, + wuffs_gif__status__string(dec.private_impl.status), + WUFFS_GIF__ERROR_BAD_WUFFS_VERSION, + wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_WUFFS_VERSION)); return; } } @@ -88,8 +96,11 @@ void test_basic_check_wuffs_version_not_called() { wuffs_base__io_reader src = ((wuffs_base__io_reader){}); wuffs_gif__status status = wuffs_gif__decoder__decode_config(&dec, &ic, src); if (status != WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED) { - FAIL("decode_config: got %d, want %d", status, - WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED); + FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status, + wuffs_gif__status__string(status), + WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED, + wuffs_gif__status__string( + WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED)); } } @@ -152,7 +163,7 @@ void test_basic_status_strings() { void test_basic_sub_struct_initializer() { CHECK_FOCUS(__func__); wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); if (dec.private_impl.magic != WUFFS_BASE__MAGIC) { FAIL("outer magic: got %u, want %u", dec.private_impl.magic, WUFFS_BASE__MAGIC); @@ -204,7 +215,7 @@ bool do_test_wuffs_lzw_decode(const char* src_filename, } wuffs_gif__lzw_decoder dec = ((wuffs_gif__lzw_decoder){}); - wuffs_gif__lzw_decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__lzw_decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_gif__lzw_decoder__set_literal_width(&dec, literal_width); int num_iters = 0; while (true) { @@ -331,8 +342,8 @@ bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t iters_unscaled) { dst.wi = 0; src.ri = 1; // Skip the literal width. wuffs_gif__lzw_decoder dec = ((wuffs_gif__lzw_decoder){}); - wuffs_gif__lzw_decoder__check_wuffs_version(&dec, WUFFS_VERSION, - sizeof dec); + wuffs_gif__lzw_decoder__check_wuffs_version(&dec, sizeof dec, + WUFFS_VERSION); wuffs_gif__status s = wuffs_gif__lzw_decoder__decode(&dec, dst_writer, src_reader); if (s) { @@ -360,7 +371,7 @@ void bench_wuffs_lzw_decode_100k() { const char* wuffs_gif_decode(wuffs_base__io_buffer* dst, wuffs_base__io_buffer* src) { wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); wuffs_base__image_config ic = ((wuffs_base__image_config){}); wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src); @@ -406,7 +417,7 @@ bool do_test_wuffs_gif_decode(const char* filename, } wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); { @@ -557,7 +568,7 @@ void test_wuffs_gif_call_sequence() { } wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); @@ -585,7 +596,7 @@ bool do_test_wuffs_gif_decode_animated( } wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){}); wuffs_base__image_config ic = ((wuffs_base__image_config){}); @@ -686,7 +697,7 @@ void test_wuffs_gif_decode_frame_out_of_bounds() { } wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_base__image_config ic = ((wuffs_base__image_config){}); wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); wuffs_gif__status s = @@ -756,7 +767,7 @@ void test_wuffs_gif_decode_input_is_a_png() { } wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_base__image_config ic = ((wuffs_base__image_config){}); wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); diff --git a/test/c/std/gzip.c b/test/c/std/gzip.c index 27f14a60..a2d5abbe 100644 --- a/test/c/std/gzip.c +++ b/test/c/std/gzip.c @@ -67,7 +67,7 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst, uint64_t wlimit, uint64_t rlimit) { wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){}); - wuffs_gzip__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); while (true) { wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst); @@ -115,7 +115,7 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) { int end_limit; for (end_limit = 0; end_limit < 10; end_limit++) { wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){}); - wuffs_gzip__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_gzip__decoder__set_ignore_checksum(&dec, ignore_checksum); got.wi = 0; wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got); diff --git a/test/c/std/zlib.c b/test/c/std/zlib.c index 40479537..3901c39e 100644 --- a/test/c/std/zlib.c +++ b/test/c/std/zlib.c @@ -82,7 +82,7 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst, uint64_t wlimit, uint64_t rlimit) { wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){}); - wuffs_zlib__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); while (true) { wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst); @@ -129,7 +129,7 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) { int end_limit; for (end_limit = 0; end_limit < 10; end_limit++) { wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){}); - wuffs_zlib__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); + wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION); wuffs_zlib__decoder__set_ignore_checksum(&dec, ignore_checksum); got.wi = 0; wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);