From 1211e16e3c0c1f8944062484a4b502db4a774746 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 29 May 2018 14:33:15 +1000 Subject: [PATCH] Add more error codes for check_wuffs_version --- cmd/wuffs-c/internal/cgen/cgen.go | 10 ++- cmd/wuffs-c/internal/cgen/func.go | 2 +- gen/c/std/adler32.c | 52 +++++++++----- gen/c/std/crc32.c | 52 +++++++++----- gen/c/std/deflate.c | 52 +++++++++----- gen/c/std/gif.c | 66 +++++++++++------ gen/c/std/gzip.c | 115 ++++++++++++++++++------------ gen/c/std/zlib.c | 115 ++++++++++++++++++------------ gen/h/std/adler32.h | 30 ++++---- gen/h/std/crc32.h | 30 ++++---- gen/h/std/deflate.h | 30 ++++---- gen/h/std/gif.h | 30 ++++---- gen/h/std/gzip.h | 90 +++++++++++++---------- gen/h/std/zlib.h | 90 +++++++++++++---------- lang/builtin/builtin.go | 4 +- test/c/std/gif.c | 44 ++++++------ 16 files changed, 492 insertions(+), 320 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index cf2e680e..93f5714a 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -699,10 +699,18 @@ 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) || (sizeof(*self) != sizeof_star_self)) {\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 (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") + b.printf("}\n") b.writes("self->private_impl.magic = WUFFS_BASE__MAGIC;\n") diff --git a/cmd/wuffs-c/internal/cgen/func.go b/cmd/wuffs-c/internal/cgen/func.go index 6c5f6c69..d015e7ff 100644 --- a/cmd/wuffs-c/internal/cgen/func.go +++ b/cmd/wuffs-c/internal/cgen/func.go @@ -192,7 +192,7 @@ func (g *gen) writeFuncImplHeader(b *buffer) error { b.writes("}") b.printf("if (self->private_impl.magic != WUFFS_BASE__MAGIC) {"+ - "self->private_impl.status = %sERROR_INITIALIZER_NOT_CALLED; }", g.PKGPREFIX) + "self->private_impl.status = %sERROR_CHECK_WUFFS_VERSION_NOT_CALLED; }", g.PKGPREFIX) b.writes("if (self->private_impl.status < 0) {") if g.currFunk.suspendible { diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 18b50632..ed56226d 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1168,20 +1168,24 @@ typedef int32_t wuffs_adler32__status; #define wuffs_adler32__packageid 681002 // 0x000A642A -#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000 -#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_ADLER32__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000 +#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_ADLER32__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 14 // 0x0000000E bool wuffs_adler32__status__is_error(wuffs_adler32__status s); @@ -1738,12 +1742,14 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( return ((wuffs_base__empty_struct){}); } -static const char* wuffs_base__status__strings[13] = { +static const char* wuffs_base__status__strings[15] = { "ok", "bad wuffs version", + "bad sizeof receiver", "bad receiver", "bad argument", - "initializer not called", + "check_wuffs_version not called", + "check_wuffs_version called twice", "invalid I/O operation", "closed for writes", "unexpected EOF", @@ -1770,7 +1776,7 @@ const char* wuffs_adler32__status__string(wuffs_adler32__status s) { switch ((s >> 10) & 0x1FFFFF) { case 0: a = wuffs_base__status__strings; - n = 13; + n = 15; break; case wuffs_adler32__packageid: a = wuffs_adler32__status__strings; @@ -1795,10 +1801,19 @@ void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self, if (!self) { return; } - if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) { + 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 (self->private_impl.magic != 0) { + self->private_impl.status = + WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; + return; + } self->private_impl.magic = WUFFS_BASE__MAGIC; } @@ -1812,7 +1827,8 @@ uint32_t wuffs_adler32__hasher__update(wuffs_adler32__hasher* self, return 0; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_ADLER32__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = + WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return 0; diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 05396050..ac6ae4fe 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1168,19 +1168,23 @@ typedef int32_t wuffs_crc32__status; #define wuffs_crc32__packageid 810620 // 0x000C5E7C -#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000 -#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_CRC32__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_CRC32__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_CRC32__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000 +#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_CRC32__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_CRC32__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 14 // 0x0000000E bool wuffs_crc32__status__is_error(wuffs_crc32__status s); @@ -1737,12 +1741,14 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( return ((wuffs_base__empty_struct){}); } -static const char* wuffs_base__status__strings[13] = { +static const char* wuffs_base__status__strings[15] = { "ok", "bad wuffs version", + "bad sizeof receiver", "bad receiver", "bad argument", - "initializer not called", + "check_wuffs_version not called", + "check_wuffs_version called twice", "invalid I/O operation", "closed for writes", "unexpected EOF", @@ -1769,7 +1775,7 @@ const char* wuffs_crc32__status__string(wuffs_crc32__status s) { switch ((s >> 10) & 0x1FFFFF) { case 0: a = wuffs_base__status__strings; - n = 13; + n = 15; break; case wuffs_crc32__packageid: a = wuffs_crc32__status__strings; @@ -2158,10 +2164,19 @@ void wuffs_crc32__ieee_hasher__check_wuffs_version( if (!self) { return; } - if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) { + 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 (self->private_impl.magic != 0) { + self->private_impl.status = + WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; + return; + } self->private_impl.magic = WUFFS_BASE__MAGIC; } @@ -2175,7 +2190,8 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self, return 0; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_CRC32__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = + WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return 0; diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 2b7b2485..bebf7bcb 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1168,20 +1168,24 @@ typedef int32_t wuffs_deflate__status; #define wuffs_deflate__packageid 848533 // 0x000CF295 -#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 -#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_DEFLATE__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 +#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ -1278585856 // 0xB3CA5400 @@ -1828,12 +1832,14 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( return ((wuffs_base__empty_struct){}); } -static const char* wuffs_base__status__strings[13] = { +static const char* wuffs_base__status__strings[15] = { "ok", "bad wuffs version", + "bad sizeof receiver", "bad receiver", "bad argument", - "initializer not called", + "check_wuffs_version not called", + "check_wuffs_version called twice", "invalid I/O operation", "closed for writes", "unexpected EOF", @@ -1878,7 +1884,7 @@ const char* wuffs_deflate__status__string(wuffs_deflate__status s) { switch ((s >> 10) & 0x1FFFFF) { case 0: a = wuffs_base__status__strings; - n = 13; + n = 15; break; case wuffs_deflate__packageid: a = wuffs_deflate__status__strings; @@ -1978,10 +1984,19 @@ void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self, if (!self) { return; } - if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) { + 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 (self->private_impl.magic != 0) { + self->private_impl.status = + WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; + return; + } self->private_impl.magic = WUFFS_BASE__MAGIC; } @@ -1997,7 +2012,8 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( return WUFFS_DEFLATE__ERROR_BAD_RECEIVER; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_DEFLATE__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = + WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return self->private_impl.status; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 587c0835..cb268c9b 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1168,19 +1168,23 @@ typedef int32_t wuffs_gif__status; #define wuffs_gif__packageid 1017222 // 0x000F8586 -#define WUFFS_GIF__STATUS_OK 0 // 0x00000000 -#define WUFFS_GIF__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_GIF__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_GIF__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_GIF__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_GIF__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_GIF__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_GIF__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_GIF__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_GIF__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_GIF__STATUS_OK 0 // 0x00000000 +#define WUFFS_GIF__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_GIF__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_GIF__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_GIF__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_GIF__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_GIF__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_GIF__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_GIF__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_GIF__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_GIF__ERROR_BAD_BLOCK -1105848320 // 0xBE161800 #define WUFFS_GIF__ERROR_BAD_EXTENSION_LABEL -1105848319 // 0xBE161801 @@ -1881,12 +1885,14 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( return ((wuffs_base__empty_struct){}); } -static const char* wuffs_base__status__strings[13] = { +static const char* wuffs_base__status__strings[15] = { "ok", "bad wuffs version", + "bad sizeof receiver", "bad receiver", "bad argument", - "initializer not called", + "check_wuffs_version not called", + "check_wuffs_version called twice", "invalid I/O operation", "closed for writes", "unexpected EOF", @@ -1925,7 +1931,7 @@ const char* wuffs_gif__status__string(wuffs_gif__status s) { switch ((s >> 10) & 0x1FFFFF) { case 0: a = wuffs_base__status__strings; - n = 13; + n = 15; break; case wuffs_gif__packageid: a = wuffs_gif__status__strings; @@ -2014,10 +2020,19 @@ void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self, if (!self) { return; } - if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) { + 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 (self->private_impl.magic != 0) { + self->private_impl.status = + WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; + return; + } self->private_impl.magic = WUFFS_BASE__MAGIC; } @@ -2027,10 +2042,19 @@ void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self, if (!self) { return; } - if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) { + 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 (self->private_impl.magic != 0) { + self->private_impl.status = + WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; + return; + } self->private_impl.magic = WUFFS_BASE__MAGIC; wuffs_gif__lzw_decoder__check_wuffs_version(&self->private_impl.f_lzw, WUFFS_VERSION, @@ -2049,7 +2073,7 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( return WUFFS_GIF__ERROR_BAD_RECEIVER; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return self->private_impl.status; @@ -2126,7 +2150,7 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame( return WUFFS_GIF__ERROR_BAD_RECEIVER; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return self->private_impl.status; @@ -2197,7 +2221,7 @@ wuffs_gif__status wuffs_gif__decoder__decode_up_to_id_part1( return WUFFS_GIF__ERROR_BAD_RECEIVER; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return self->private_impl.status; diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 217d3839..9bd3b4fd 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1177,19 +1177,23 @@ typedef int32_t wuffs_crc32__status; #define wuffs_crc32__packageid 810620 // 0x000C5E7C -#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000 -#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_CRC32__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_CRC32__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_CRC32__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000 +#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_CRC32__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_CRC32__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 14 // 0x0000000E bool wuffs_crc32__status__is_error(wuffs_crc32__status s); @@ -1268,20 +1272,24 @@ typedef int32_t wuffs_deflate__status; #define wuffs_deflate__packageid 848533 // 0x000CF295 -#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 -#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_DEFLATE__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 +#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ -1278585856 // 0xB3CA5400 @@ -1441,19 +1449,23 @@ typedef int32_t wuffs_gzip__status; #define wuffs_gzip__packageid 1041911 // 0x000FE5F7 -#define WUFFS_GZIP__STATUS_OK 0 // 0x00000000 -#define WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_GZIP__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_GZIP__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_GZIP__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_GZIP__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_GZIP__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_GZIP__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_GZIP__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_GZIP__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_GZIP__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_GZIP__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_GZIP__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_GZIP__STATUS_OK 0 // 0x00000000 +#define WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_GZIP__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_GZIP__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_GZIP__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_GZIP__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_GZIP__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_GZIP__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_GZIP__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_GZIP__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_GZIP__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_GZIP__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_GZIP__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_GZIP__ERROR_BAD_HEADER -1080566784 // 0xBF97DC00 #define WUFFS_GZIP__ERROR_CHECKSUM_MISMATCH -1080566783 // 0xBF97DC01 @@ -2032,12 +2044,14 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( return ((wuffs_base__empty_struct){}); } -static const char* wuffs_base__status__strings[13] = { +static const char* wuffs_base__status__strings[15] = { "ok", "bad wuffs version", + "bad sizeof receiver", "bad receiver", "bad argument", - "initializer not called", + "check_wuffs_version not called", + "check_wuffs_version called twice", "invalid I/O operation", "closed for writes", "unexpected EOF", @@ -2069,7 +2083,7 @@ const char* wuffs_gzip__status__string(wuffs_gzip__status s) { switch ((s >> 10) & 0x1FFFFF) { case 0: a = wuffs_base__status__strings; - n = 13; + n = 15; break; case wuffs_gzip__packageid: a = wuffs_gzip__status__strings; @@ -2098,10 +2112,19 @@ void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self, if (!self) { return; } - if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) { + 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 (self->private_impl.magic != 0) { + self->private_impl.status = + WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; + return; + } self->private_impl.magic = WUFFS_BASE__MAGIC; wuffs_deflate__decoder__check_wuffs_version( &self->private_impl.f_flate, WUFFS_VERSION, @@ -2121,7 +2144,8 @@ void wuffs_gzip__decoder__set_ignore_checksum(wuffs_gzip__decoder* self, return; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_GZIP__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = + WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return; @@ -2139,7 +2163,8 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, return WUFFS_GZIP__ERROR_BAD_RECEIVER; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_GZIP__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = + WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return self->private_impl.status; diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 5824033a..95f43d9d 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1177,20 +1177,24 @@ typedef int32_t wuffs_adler32__status; #define wuffs_adler32__packageid 681002 // 0x000A642A -#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000 -#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_ADLER32__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000 +#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_ADLER32__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 14 // 0x0000000E bool wuffs_adler32__status__is_error(wuffs_adler32__status s); @@ -1269,20 +1273,24 @@ typedef int32_t wuffs_deflate__status; #define wuffs_deflate__packageid 848533 // 0x000CF295 -#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 -#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_DEFLATE__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 +#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ -1278585856 // 0xB3CA5400 @@ -1442,19 +1450,23 @@ typedef int32_t wuffs_zlib__status; #define wuffs_zlib__packageid 2064249 // 0x001F7F79 -#define WUFFS_ZLIB__STATUS_OK 0 // 0x00000000 -#define WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_ZLIB__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_ZLIB__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_ZLIB__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_ZLIB__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_ZLIB__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_ZLIB__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_ZLIB__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_ZLIB__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_ZLIB__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_ZLIB__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_ZLIB__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_ZLIB__STATUS_OK 0 // 0x00000000 +#define WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_ZLIB__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_ZLIB__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_ZLIB__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_ZLIB__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_ZLIB__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_ZLIB__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_ZLIB__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_ZLIB__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_ZLIB__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_ZLIB__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_ZLIB__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH -33692672 // 0xFDFDE400 #define WUFFS_ZLIB__ERROR_INVALID_COMPRESSION_METHOD -33692671 // 0xFDFDE401 @@ -2032,12 +2044,14 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( return ((wuffs_base__empty_struct){}); } -static const char* wuffs_base__status__strings[13] = { +static const char* wuffs_base__status__strings[15] = { "ok", "bad wuffs version", + "bad sizeof receiver", "bad receiver", "bad argument", - "initializer not called", + "check_wuffs_version not called", + "check_wuffs_version called twice", "invalid I/O operation", "closed for writes", "unexpected EOF", @@ -2070,7 +2084,7 @@ const char* wuffs_zlib__status__string(wuffs_zlib__status s) { switch ((s >> 10) & 0x1FFFFF) { case 0: a = wuffs_base__status__strings; - n = 13; + n = 15; break; case wuffs_zlib__packageid: a = wuffs_zlib__status__strings; @@ -2099,10 +2113,19 @@ void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self, if (!self) { return; } - if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) { + 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 (self->private_impl.magic != 0) { + self->private_impl.status = + WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE; + return; + } self->private_impl.magic = WUFFS_BASE__MAGIC; wuffs_deflate__decoder__check_wuffs_version( &self->private_impl.f_flate, WUFFS_VERSION, @@ -2122,7 +2145,8 @@ void wuffs_zlib__decoder__set_ignore_checksum(wuffs_zlib__decoder* self, return; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_ZLIB__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = + WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return; @@ -2140,7 +2164,8 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, return WUFFS_ZLIB__ERROR_BAD_RECEIVER; } if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = WUFFS_ZLIB__ERROR_INITIALIZER_NOT_CALLED; + self->private_impl.status = + WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; } if (self->private_impl.status < 0) { return self->private_impl.status; diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 011c01f9..225f984b 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -1168,20 +1168,24 @@ typedef int32_t wuffs_adler32__status; #define wuffs_adler32__packageid 681002 // 0x000A642A -#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000 -#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_ADLER32__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000 +#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_ADLER32__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 14 // 0x0000000E bool wuffs_adler32__status__is_error(wuffs_adler32__status s); diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index c2164800..a01ac68f 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -1168,19 +1168,23 @@ typedef int32_t wuffs_crc32__status; #define wuffs_crc32__packageid 810620 // 0x000C5E7C -#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000 -#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_CRC32__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_CRC32__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_CRC32__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000 +#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_CRC32__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_CRC32__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 14 // 0x0000000E bool wuffs_crc32__status__is_error(wuffs_crc32__status s); diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index e4837364..acc659d6 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -1168,20 +1168,24 @@ typedef int32_t wuffs_deflate__status; #define wuffs_deflate__packageid 848533 // 0x000CF295 -#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 -#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_DEFLATE__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 +#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ -1278585856 // 0xB3CA5400 diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 890355d1..a0e774d3 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1168,19 +1168,23 @@ typedef int32_t wuffs_gif__status; #define wuffs_gif__packageid 1017222 // 0x000F8586 -#define WUFFS_GIF__STATUS_OK 0 // 0x00000000 -#define WUFFS_GIF__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_GIF__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_GIF__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_GIF__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_GIF__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_GIF__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_GIF__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_GIF__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_GIF__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_GIF__STATUS_OK 0 // 0x00000000 +#define WUFFS_GIF__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_GIF__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_GIF__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_GIF__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_GIF__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_GIF__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_GIF__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_GIF__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_GIF__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_GIF__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_GIF__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_GIF__ERROR_BAD_BLOCK -1105848320 // 0xBE161800 #define WUFFS_GIF__ERROR_BAD_EXTENSION_LABEL -1105848319 // 0xBE161801 diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index 1d4eab44..1ba58ce3 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -1177,19 +1177,23 @@ typedef int32_t wuffs_crc32__status; #define wuffs_crc32__packageid 810620 // 0x000C5E7C -#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000 -#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_CRC32__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_CRC32__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_CRC32__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_CRC32__STATUS_OK 0 // 0x00000000 +#define WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_CRC32__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_CRC32__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_CRC32__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_CRC32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_CRC32__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_CRC32__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_CRC32__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_CRC32__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_CRC32__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_CRC32__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_CRC32__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_CRC32__SUSPENSION_END_OF_DATA 14 // 0x0000000E bool wuffs_crc32__status__is_error(wuffs_crc32__status s); @@ -1268,20 +1272,24 @@ typedef int32_t wuffs_deflate__status; #define wuffs_deflate__packageid 848533 // 0x000CF295 -#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 -#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_DEFLATE__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 +#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ -1278585856 // 0xB3CA5400 @@ -1441,19 +1449,23 @@ typedef int32_t wuffs_gzip__status; #define wuffs_gzip__packageid 1041911 // 0x000FE5F7 -#define WUFFS_GZIP__STATUS_OK 0 // 0x00000000 -#define WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_GZIP__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_GZIP__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_GZIP__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_GZIP__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_GZIP__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_GZIP__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_GZIP__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_GZIP__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_GZIP__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_GZIP__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_GZIP__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_GZIP__STATUS_OK 0 // 0x00000000 +#define WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_GZIP__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_GZIP__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_GZIP__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_GZIP__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_GZIP__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_GZIP__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_GZIP__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_GZIP__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_GZIP__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_GZIP__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_GZIP__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_GZIP__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_GZIP__ERROR_BAD_HEADER -1080566784 // 0xBF97DC00 #define WUFFS_GZIP__ERROR_CHECKSUM_MISMATCH -1080566783 // 0xBF97DC01 diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 0c06c053..ed35d7d8 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -1177,20 +1177,24 @@ typedef int32_t wuffs_adler32__status; #define wuffs_adler32__packageid 681002 // 0x000A642A -#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000 -#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_ADLER32__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_ADLER32__STATUS_OK 0 // 0x00000000 +#define WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_ADLER32__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_ADLER32__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_ADLER32__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_ADLER32__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_ADLER32__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_ADLER32__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_ADLER32__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_ADLER32__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_ADLER32__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_ADLER32__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_ADLER32__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_ADLER32__SUSPENSION_END_OF_DATA 14 // 0x0000000E bool wuffs_adler32__status__is_error(wuffs_adler32__status s); @@ -1269,20 +1273,24 @@ typedef int32_t wuffs_deflate__status; #define wuffs_deflate__packageid 848533 // 0x000CF295 -#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 -#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_DEFLATE__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 9 // 0x00000009 +#define WUFFS_DEFLATE__STATUS_OK 0 // 0x00000000 +#define WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_DEFLATE__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_DEFLATE__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_DEFLATE__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_DEFLATE__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_DEFLATE__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_DEFLATE__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_DEFLATE__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_DEFLATE__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE 11 // 0x0000000B #define WUFFS_DEFLATE__ERROR_CANNOT_RETURN_A_SUSPENSION \ - -2147483638 // 0x8000000A -#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 12 // 0x0000000C + -2147483636 // 0x8000000C +#define WUFFS_DEFLATE__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_DEFLATE__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_DEFLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \ -1278585856 // 0xB3CA5400 @@ -1442,19 +1450,23 @@ typedef int32_t wuffs_zlib__status; #define wuffs_zlib__packageid 2064249 // 0x001F7F79 -#define WUFFS_ZLIB__STATUS_OK 0 // 0x00000000 -#define WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 -#define WUFFS_ZLIB__ERROR_BAD_RECEIVER -2147483646 // 0x80000002 -#define WUFFS_ZLIB__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003 -#define WUFFS_ZLIB__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004 -#define WUFFS_ZLIB__ERROR_INVALID_I_O_OPERATION -2147483643 // 0x80000005 -#define WUFFS_ZLIB__ERROR_CLOSED_FOR_WRITES -2147483642 // 0x80000006 -#define WUFFS_ZLIB__ERROR_UNEXPECTED_EOF -2147483641 // 0x80000007 -#define WUFFS_ZLIB__SUSPENSION_SHORT_READ 8 // 0x00000008 -#define WUFFS_ZLIB__SUSPENSION_SHORT_WRITE 9 // 0x00000009 -#define WUFFS_ZLIB__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483638 // 0x8000000A -#define WUFFS_ZLIB__ERROR_INVALID_CALL_SEQUENCE -2147483637 // 0x8000000B -#define WUFFS_ZLIB__SUSPENSION_END_OF_DATA 12 // 0x0000000C +#define WUFFS_ZLIB__STATUS_OK 0 // 0x00000000 +#define WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION -2147483647 // 0x80000001 +#define WUFFS_ZLIB__ERROR_BAD_SIZEOF_RECEIVER -2147483646 // 0x80000002 +#define WUFFS_ZLIB__ERROR_BAD_RECEIVER -2147483645 // 0x80000003 +#define WUFFS_ZLIB__ERROR_BAD_ARGUMENT -2147483644 // 0x80000004 +#define WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED \ + -2147483643 // 0x80000005 +#define WUFFS_ZLIB__ERROR_CHECK_WUFFS_VERSION_CALLED_TWICE \ + -2147483642 // 0x80000006 +#define WUFFS_ZLIB__ERROR_INVALID_I_O_OPERATION -2147483641 // 0x80000007 +#define WUFFS_ZLIB__ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008 +#define WUFFS_ZLIB__ERROR_UNEXPECTED_EOF -2147483639 // 0x80000009 +#define WUFFS_ZLIB__SUSPENSION_SHORT_READ 10 // 0x0000000A +#define WUFFS_ZLIB__SUSPENSION_SHORT_WRITE 11 // 0x0000000B +#define WUFFS_ZLIB__ERROR_CANNOT_RETURN_A_SUSPENSION -2147483636 // 0x8000000C +#define WUFFS_ZLIB__ERROR_INVALID_CALL_SEQUENCE -2147483635 // 0x8000000D +#define WUFFS_ZLIB__SUSPENSION_END_OF_DATA 14 // 0x0000000E #define WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH -33692672 // 0xFDFDE400 #define WUFFS_ZLIB__ERROR_INVALID_COMPRESSION_METHOD -33692671 // 0xFDFDE401 diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 9f73bfe3..48f95af1 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -39,9 +39,11 @@ var StatusList = [...]Status{ // TODO: sort these somehow, when the list has stabilized? {0, "ok"}, {t.IDError, "bad wuffs version"}, + {t.IDError, "bad sizeof receiver"}, {t.IDError, "bad receiver"}, {t.IDError, "bad argument"}, - {t.IDError, "initializer not called"}, + {t.IDError, "check_wuffs_version not called"}, + {t.IDError, "check_wuffs_version called twice"}, {t.IDError, "invalid I/O operation"}, {t.IDError, "closed for writes"}, // TODO: is this unused? Should callee or caller check closed-ness? {t.IDError, "unexpected EOF"}, // Used if reading when closed == true. diff --git a/test/c/std/gif.c b/test/c/std/gif.c index ead4eb49..6556df0b 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -59,23 +59,21 @@ void test_basic_bad_receiver() { } } -void test_basic_initializer_not_called() { +void test_basic_bad_sizeof_receiver() { CHECK_FOCUS(__func__); wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_base__image_config ic = ((wuffs_base__image_config){}); - 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_INITIALIZER_NOT_CALLED) { - FAIL("decode_config: got %d, want %d", status, - WUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED); + wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, 0); + 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); + return; } } -void test_basic_wuffs_version_bad() { +void test_basic_bad_wuffs_version() { CHECK_FOCUS(__func__); wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, 0, - 0); // 0 is not WUFFS_VERSION. + wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION ^ 0x12345678, 0); 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); @@ -83,13 +81,15 @@ void test_basic_wuffs_version_bad() { } } -void test_basic_wuffs_version_good() { +void test_basic_check_wuffs_version_not_called() { CHECK_FOCUS(__func__); wuffs_gif__decoder dec = ((wuffs_gif__decoder){}); - wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec); - if (dec.private_impl.magic != WUFFS_BASE__MAGIC) { - FAIL("magic: got %u, want %u", dec.private_impl.magic, WUFFS_BASE__MAGIC); - return; + wuffs_base__image_config ic = ((wuffs_base__image_config){}); + 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); } } @@ -957,13 +957,13 @@ proc tests[] = { // These basic tests are really testing the Wuffs compiler. They aren't // specific to the std/gif code, but putting them here is as good as any // other place. - test_basic_bad_receiver, // - test_basic_initializer_not_called, // - test_basic_wuffs_version_bad, // - test_basic_wuffs_version_good, // - test_basic_status_is_error, // - test_basic_status_strings, // - test_basic_sub_struct_initializer, // + test_basic_bad_receiver, // + test_basic_bad_sizeof_receiver, // + test_basic_bad_wuffs_version, // + test_basic_check_wuffs_version_not_called, // + test_basic_status_is_error, // + test_basic_status_strings, // + test_basic_sub_struct_initializer, // test_wuffs_lzw_decode_many_big_reads, // test_wuffs_lzw_decode_many_small_writes_reads, //