diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 3e85152b..65ec5ac0 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -899,13 +899,6 @@ func (g *gen) writeCppMethods(b *buffer, n *a.Struct) error { b.printf("return %s%s__initialize(this, sizeof_star_self, wuffs_version, initialize_flags);\n}\n\n", g.pkgPrefix, structName) - // Deprecated: use wuffs_foo__bar__initialize instead of - // wuffs_foo__bar__check_wuffs_version. - b.writes("inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //\n" + - "check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) {\n") - b.printf("return %s%s__initialize(this, sizeof_star_self, wuffs_version, WUFFS_INITIALIZE__ALREADY_ZEROED);\n}\n\n", - g.pkgPrefix, structName) - structID := n.QID()[1] for _, file := range g.files { for _, tld := range file.TopLevelDecls() { @@ -972,12 +965,6 @@ func (g *gen) writeInitializerPrototype(b *buffer, n *a.Struct) error { } b.writes(";\n\n") - b.writes("// Deprecated: use wuffs_foo__bar__initialize instead of\n") - b.writes("// wuffs_foo__bar__check_wuffs_version.\n") - b.printf("wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //\n"+ - "%s%s__check_wuffs_version(%s%s *self, size_t sizeof_star_self, uint64_t wuffs_version);\n\n", - g.pkgPrefix, n.QID().Str(g.tm), g.pkgPrefix, n.QID().Str(g.tm)) - if n.Public() { if err := g.writeSizeofSignature(b, n); err != nil { return err @@ -1063,15 +1050,6 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error { b.writes("return NULL;\n") b.writes("}\n\n") - // Deprecated: use wuffs_foo__bar__initialize instead of - // wuffs_foo__bar__check_wuffs_version. - b.printf("wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //\n"+ - "%s%s__check_wuffs_version(%s%s *self, size_t sizeof_star_self, uint64_t wuffs_version) {", - g.pkgPrefix, n.QID().Str(g.tm), g.pkgPrefix, n.QID().Str(g.tm)) - b.printf("return %s%s__initialize(self, sizeof_star_self, wuffs_version, WUFFS_INITIALIZE__ALREADY_ZEROED);\n", - g.pkgPrefix, n.QID().Str(g.tm)) - b.writes("}\n\n") - if n.Public() { if err := g.writeSizeofSignature(b, n); err != nil { return err diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index bc029a2c..ac9664d8 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2607,13 +2607,6 @@ wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self, uint64_t wuffs_version, uint32_t initialize_flags); -// Deprecated: use wuffs_foo__bar__initialize instead of -// wuffs_foo__bar__check_wuffs_version. -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self, - size_t sizeof_star_self, - uint64_t wuffs_version); - size_t // sizeof__wuffs_adler32__hasher(); @@ -2683,13 +2676,6 @@ struct wuffs_adler32__hasher__struct { wuffs_version, initialize_flags); } - inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // - check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) { - return wuffs_adler32__hasher__initialize(this, sizeof_star_self, - wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); - } - inline uint32_t // update(wuffs_base__slice_u8 a_x) { return wuffs_adler32__hasher__update(this, a_x); @@ -2738,13 +2724,6 @@ wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self, uint64_t wuffs_version, uint32_t initialize_flags); -// Deprecated: use wuffs_foo__bar__initialize instead of -// wuffs_foo__bar__check_wuffs_version. -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_crc32__ieee_hasher__check_wuffs_version(wuffs_crc32__ieee_hasher* self, - size_t sizeof_star_self, - uint64_t wuffs_version); - size_t // sizeof__wuffs_crc32__ieee_hasher(); @@ -2813,13 +2792,6 @@ struct wuffs_crc32__ieee_hasher__struct { this, sizeof_star_self, wuffs_version, initialize_flags); } - inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // - check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) { - return wuffs_crc32__ieee_hasher__initialize( - this, sizeof_star_self, wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); - } - inline uint32_t // update(wuffs_base__slice_u8 a_x) { return wuffs_crc32__ieee_hasher__update(this, a_x); @@ -2889,13 +2861,6 @@ wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self, uint64_t wuffs_version, uint32_t initialize_flags); -// Deprecated: use wuffs_foo__bar__initialize instead of -// wuffs_foo__bar__check_wuffs_version. -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version); - size_t // sizeof__wuffs_deflate__decoder(); @@ -3019,13 +2984,6 @@ struct wuffs_deflate__decoder__struct { wuffs_version, initialize_flags); } - inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // - check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) { - return wuffs_deflate__decoder__initialize(this, sizeof_star_self, - wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); - } - inline wuffs_base__range_ii_u64 // workbuf_len() const { return wuffs_deflate__decoder__workbuf_len(this); @@ -3091,13 +3049,6 @@ wuffs_lzw__decoder__initialize(wuffs_lzw__decoder* self, uint64_t wuffs_version, uint32_t initialize_flags); -// Deprecated: use wuffs_foo__bar__initialize instead of -// wuffs_foo__bar__check_wuffs_version. -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_lzw__decoder__check_wuffs_version(wuffs_lzw__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version); - size_t // sizeof__wuffs_lzw__decoder(); @@ -3198,12 +3149,6 @@ struct wuffs_lzw__decoder__struct { initialize_flags); } - inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // - check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) { - return wuffs_lzw__decoder__initialize(this, sizeof_star_self, wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); - } - inline wuffs_base__empty_struct // set_literal_width(uint32_t a_lw) { return wuffs_lzw__decoder__set_literal_width(this, a_lw); @@ -3281,13 +3226,6 @@ wuffs_gif__decoder__initialize(wuffs_gif__decoder* self, uint64_t wuffs_version, uint32_t initialize_flags); -// Deprecated: use wuffs_foo__bar__initialize instead of -// wuffs_foo__bar__check_wuffs_version. -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version); - size_t // sizeof__wuffs_gif__decoder(); @@ -3477,12 +3415,6 @@ struct wuffs_gif__decoder__struct { initialize_flags); } - inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // - check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) { - return wuffs_gif__decoder__initialize(this, sizeof_star_self, wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); - } - inline wuffs_base__status // decode_image_config(wuffs_base__image_config* a_dst, wuffs_base__io_reader a_src) { @@ -3588,13 +3520,6 @@ wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self, uint64_t wuffs_version, uint32_t initialize_flags); -// Deprecated: use wuffs_foo__bar__initialize instead of -// wuffs_foo__bar__check_wuffs_version. -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version); - size_t // sizeof__wuffs_gzip__decoder(); @@ -3685,13 +3610,6 @@ struct wuffs_gzip__decoder__struct { wuffs_version, initialize_flags); } - inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // - check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) { - return wuffs_gzip__decoder__initialize(this, sizeof_star_self, - wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); - } - inline wuffs_base__empty_struct // set_ignore_checksum(bool a_ic) { return wuffs_gzip__decoder__set_ignore_checksum(this, a_ic); @@ -3763,13 +3681,6 @@ wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self, uint64_t wuffs_version, uint32_t initialize_flags); -// Deprecated: use wuffs_foo__bar__initialize instead of -// wuffs_foo__bar__check_wuffs_version. -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version); - size_t // sizeof__wuffs_zlib__decoder(); @@ -3857,13 +3768,6 @@ struct wuffs_zlib__decoder__struct { wuffs_version, initialize_flags); } - inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // - check_wuffs_version(size_t sizeof_star_self, uint64_t wuffs_version) { - return wuffs_zlib__decoder__initialize(this, sizeof_star_self, - wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); - } - inline wuffs_base__empty_struct // set_ignore_checksum(bool a_ic) { return wuffs_zlib__decoder__set_ignore_checksum(this, a_ic); @@ -5107,14 +5011,6 @@ wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self, return NULL; } -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self, - size_t sizeof_star_self, - uint64_t wuffs_version) { - return wuffs_adler32__hasher__initialize( - self, sizeof_star_self, wuffs_version, WUFFS_INITIALIZE__ALREADY_ZEROED); -} - size_t // sizeof__wuffs_adler32__hasher() { return sizeof(wuffs_adler32__hasher); @@ -6127,14 +6023,6 @@ wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self, return NULL; } -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_crc32__ieee_hasher__check_wuffs_version(wuffs_crc32__ieee_hasher* self, - size_t sizeof_star_self, - uint64_t wuffs_version) { - return wuffs_crc32__ieee_hasher__initialize( - self, sizeof_star_self, wuffs_version, WUFFS_INITIALIZE__ALREADY_ZEROED); -} - size_t // sizeof__wuffs_crc32__ieee_hasher() { return sizeof(wuffs_crc32__ieee_hasher); @@ -6426,14 +6314,6 @@ wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self, return NULL; } -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version) { - return wuffs_deflate__decoder__initialize( - self, sizeof_star_self, wuffs_version, WUFFS_INITIALIZE__ALREADY_ZEROED); -} - size_t // sizeof__wuffs_deflate__decoder() { return sizeof(wuffs_deflate__decoder); @@ -8214,14 +8094,6 @@ wuffs_lzw__decoder__initialize(wuffs_lzw__decoder* self, return NULL; } -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_lzw__decoder__check_wuffs_version(wuffs_lzw__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version) { - return wuffs_lzw__decoder__initialize(self, sizeof_star_self, wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); -} - size_t // sizeof__wuffs_lzw__decoder() { return sizeof(wuffs_lzw__decoder); @@ -8810,14 +8682,6 @@ wuffs_gif__decoder__initialize(wuffs_gif__decoder* self, return NULL; } -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version) { - return wuffs_gif__decoder__initialize(self, sizeof_star_self, wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); -} - size_t // sizeof__wuffs_gif__decoder() { return sizeof(wuffs_gif__decoder); @@ -10986,14 +10850,6 @@ wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self, return NULL; } -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version) { - return wuffs_gzip__decoder__initialize(self, sizeof_star_self, wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); -} - size_t // sizeof__wuffs_gzip__decoder() { return sizeof(wuffs_gzip__decoder); @@ -11480,14 +11336,6 @@ wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self, return NULL; } -wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT // -wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self, - size_t sizeof_star_self, - uint64_t wuffs_version) { - return wuffs_zlib__decoder__initialize(self, sizeof_star_self, wuffs_version, - WUFFS_INITIALIZE__ALREADY_ZEROED); -} - size_t // sizeof__wuffs_zlib__decoder() { return sizeof(wuffs_zlib__decoder);