mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Have check_wuffs_version take the sizeof receiver
Also rename foo__initialize to foo__check_wuffs_version.
This commit is contained in:
1 parent
d59eec7936
commit
87ab36f8c4
28 files changed
+354
-361
No files matched your search
@@ -23,13 +23,6 @@
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
|
||||
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
|
||||
|
||||
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
|
||||
// to a containee struct's initializer when the container has already zeroed
|
||||
// the containee's memory.
|
||||
//
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
|
||||
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
|
||||
|
||||
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
|
||||
//
|
||||
// The order matters here. Clang also defines "__GNUC__".
|
||||
|
||||
@@ -354,6 +354,14 @@ func (g *gen) genImpl(b *buffer) error {
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: don't hard-code wuffs_gif__lzw_decoder__reset.
|
||||
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("}\n\n")
|
||||
}
|
||||
|
||||
b.writes("// ---------------- Private Function Prototypes\n\n")
|
||||
if err := g.forEachFunc(b, priOnly, (*gen).writeFuncPrototype); err != nil {
|
||||
return err
|
||||
@@ -659,15 +667,14 @@ func (g *gen) writeUse(b *buffer, n *a.Use) error {
|
||||
func (g *gen) writeInitializerSignature(b *buffer, n *a.Struct, public bool) error {
|
||||
structName := n.QID().Str(g.tm)
|
||||
if public {
|
||||
b.printf("// %s%s__initialize is an initializer function.\n", g.pkgPrefix, structName)
|
||||
b.printf("// %s%s__check_wuffs_version is an initializer function.\n", g.pkgPrefix, structName)
|
||||
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 0 for wuffs_version and for_internal_use_only.\n")
|
||||
b.printf("// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.\n")
|
||||
}
|
||||
b.printf("void %s%s__initialize(%s%s *self", g.pkgPrefix, structName, g.pkgPrefix, structName)
|
||||
b.printf(", uint32_t wuffs_version, uint32_t for_internal_use_only")
|
||||
b.printf(")")
|
||||
b.printf("void %s%s__check_wuffs_version(%s%s *self, uint32_t wuffs_version, size_t sizeof_star_self)",
|
||||
g.pkgPrefix, structName, g.pkgPrefix, structName)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -692,13 +699,11 @@ 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("if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {\n")
|
||||
b.printf("self->private_impl.status = %sERROR_BAD_WUFFS_VERSION;\n", g.PKGPREFIX)
|
||||
b.printf("return;\n")
|
||||
b.printf("}\n")
|
||||
|
||||
b.writes("if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {" +
|
||||
"memset(self, 0, sizeof(*self)); }\n")
|
||||
b.writes("self->private_impl.magic = WUFFS_BASE__MAGIC;\n")
|
||||
|
||||
// Call any ctors on sub-structs.
|
||||
@@ -723,8 +728,8 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error {
|
||||
continue
|
||||
}
|
||||
|
||||
b.printf("%s%s__initialize(&self->private_impl.%s%s, WUFFS_VERSION, WUFFS_BASE__ALREADY_ZEROED);\n",
|
||||
prefix, qid[1].Str(g.tm), fPrefix, f.Name().Str(g.tm))
|
||||
b.printf("%s%s__check_wuffs_version(&self->private_impl.%s%s, WUFFS_VERSION, sizeof(self->private_impl.%s%s));\n",
|
||||
prefix, qid[1].Str(g.tm), fPrefix, f.Name().Str(g.tm), fPrefix, f.Name().Str(g.tm))
|
||||
}
|
||||
|
||||
b.writes("}\n\n")
|
||||
|
||||
@@ -85,10 +85,10 @@ const baseHeader = "" +
|
||||
""
|
||||
|
||||
const baseImpl = "" +
|
||||
"// Copyright 2017 The Wuffs Authors.\n//\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// https://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\n#define WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(x) (void)(x)\n\n// WUFFS_BASE__MAGIC is a magic number to check that initializers are called.\n// It's not foolproof, given C doesn't automatically zero memory before use,\n// but it should catch 99.99% of cases.\n//\n// Its (non-zero) value is arbitrary, based on md5sum(\"wuffs\").\n#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)\n\n// WUFFS_BASE__ALREADY_ZEROED is passed from a " +
|
||||
"container struct's initializer\n// to a containee struct's initializer when the container has already zeroed\n// the containee's memory.\n//\n// Its (non-zero) value is arbitrary, based on md5sum(\"zeroed\").\n#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)\n\n// Denote intentional fallthroughs for -Wimplicit-fallthrough.\n//\n// The order matters here. Clang also defines \"__GNUC__\".\n#if defined(__clang__) && __cplusplus >= 201103L\n#define WUFFS_BASE__FALLTHROUGH [[clang::fallthrough]]\n#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 7)\n#define WUFFS_BASE__FALLTHROUGH __attribute__((fallthrough))\n#else\n#define WUFFS_BASE__FALLTHROUGH\n#endif\n\n// Use switch cases for coroutine suspension points, similar to the technique\n// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html\n//\n// We use trivial macros instead of an explicit assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0 case 0:;\n#define " +
|
||||
"WUFFS_BASE__COROUTINE_SUSPENSION_POINT(n) \\\n coro_susp_point = n; \\\n WUFFS_BASE__FALLTHROUGH; \\\n case n:;\n\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(n) \\\n if (status < 0) { \\\n goto exit; \\\n } else if (status == 0) { \\\n goto ok; \\\n } \\\n coro_susp_point = n; \\\n goto suspend; \\\n case n:;\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define WUFFS_BASE__LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define WUFFS_BASE__UNLIKELY(expr) (__builtin_expect(!!(expr), 0))\n#else\n#define WUFFS_BASE__LIKELY(expr) (expr)\n#define WUFFS_BASE__UNLIKELY(expr) (expr)\n#endif\n\n// Uncomment this #include for printf-de" +
|
||||
"bugging.\n// #include <stdio.h>\n\n// The helpers below are functions, instead of macros, because their arguments\n// can be an expression that we shouldn't evaluate more than once.\n//\n// They are in base-impl.h and hence copy/pasted into every generated C file,\n// instead of being in some \"base.c\" file, since a design goal is that users of\n// the generated C code can often just #include a single .c file, such as\n// \"gif.c\", without having to additionally include or otherwise build and link\n// a \"base.c\" file.\n//\n// They are static, so that linking multiple wuffs .o files won't complain about\n// duplicate function definitions.\n//\n// They are explicitly marked inline, even if modern compilers don't use the\n// inline attribute to guide optimizations such as inlining, to avoid the\n// -Wunused-function warning, and we like to compile with -Wall -Werror.\n\n" +
|
||||
"// Copyright 2017 The Wuffs Authors.\n//\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// https://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\n#define WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(x) (void)(x)\n\n// WUFFS_BASE__MAGIC is a magic number to check that initializers are called.\n// It's not foolproof, given C doesn't automatically zero memory before use,\n// but it should catch 99.99% of cases.\n//\n// Its (non-zero) value is arbitrary, based on md5sum(\"wuffs\").\n#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)\n\n// Denote intentional fallthroughs for -Wimplic" +
|
||||
"it-fallthrough.\n//\n// The order matters here. Clang also defines \"__GNUC__\".\n#if defined(__clang__) && __cplusplus >= 201103L\n#define WUFFS_BASE__FALLTHROUGH [[clang::fallthrough]]\n#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 7)\n#define WUFFS_BASE__FALLTHROUGH __attribute__((fallthrough))\n#else\n#define WUFFS_BASE__FALLTHROUGH\n#endif\n\n// Use switch cases for coroutine suspension points, similar to the technique\n// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html\n//\n// We use trivial macros instead of an explicit assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0 case 0:;\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT(n) \\\n coro_susp_point = n; \\\n WUFFS_BASE__FALLTHROUGH; \\\n case n:;\n\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(n) \\\n if (status < 0) { \\\n goto exit; " +
|
||||
" \\\n } else if (status == 0) { \\\n goto ok; \\\n } \\\n coro_susp_point = n; \\\n goto suspend; \\\n case n:;\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define WUFFS_BASE__LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define WUFFS_BASE__UNLIKELY(expr) (__builtin_expect(!!(expr), 0))\n#else\n#define WUFFS_BASE__LIKELY(expr) (expr)\n#define WUFFS_BASE__UNLIKELY(expr) (expr)\n#endif\n\n// Uncomment this #include for printf-debugging.\n// #include <stdio.h>\n\n// The helpers below are functions, instead of macros, because their arguments\n// can be an expression that we shouldn't evaluate more than once.\n//\n// They are in base-impl.h and hence copy/pasted into every generated C file,\n// instead of being in some \"base.c\" file, since a" +
|
||||
" design goal is that users of\n// the generated C code can often just #include a single .c file, such as\n// \"gif.c\", without having to additionally include or otherwise build and link\n// a \"base.c\" file.\n//\n// They are static, so that linking multiple wuffs .o files won't complain about\n// duplicate function definitions.\n//\n// They are explicitly marked inline, even if modern compilers don't use the\n// inline attribute to guide optimizations such as inlining, to avoid the\n// -Wunused-function warning, and we like to compile with -Wall -Werror.\n\n" +
|
||||
"" +
|
||||
"// ---------------- Numeric Types\n\nstatic inline uint16_t wuffs_base__load_u16be(uint8_t* p) {\n return ((uint16_t)(p[0]) << 8) | ((uint16_t)(p[1]) << 0);\n}\n\nstatic inline uint16_t wuffs_base__load_u16le(uint8_t* p) {\n return ((uint16_t)(p[0]) << 0) | ((uint16_t)(p[1]) << 8);\n}\n\nstatic inline uint32_t wuffs_base__load_u32be(uint8_t* p) {\n return ((uint32_t)(p[0]) << 24) | ((uint32_t)(p[1]) << 16) |\n ((uint32_t)(p[2]) << 8) | ((uint32_t)(p[3]) << 0);\n}\n\nstatic inline uint32_t wuffs_base__load_u32le(uint8_t* p) {\n return ((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) |\n ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24);\n}\n\nstatic inline uint64_t wuffs_base__load_u64be(uint8_t* p) {\n return ((uint64_t)(p[0]) << 56) | ((uint64_t)(p[1]) << 48) |\n ((uint64_t)(p[2]) << 40) | ((uint64_t)(p[3]) << 32) |\n ((uint64_t)(p[4]) << 24) | ((uint64_t)(p[5]) << 16) |\n ((uint64_t)(p[6]) << 8) | ((uint64_t)(p[7]) << 0);\n}\n\nstatic inline uint64_t wuffs_base__load_u64le(uint8_t* p) {" +
|
||||
"\n return ((uint64_t)(p[0]) << 0) | ((uint64_t)(p[1]) << 8) |\n ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 24) |\n ((uint64_t)(p[4]) << 32) | ((uint64_t)(p[5]) << 40) |\n ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56);\n}\n\n" +
|
||||
|
||||
@@ -88,12 +88,6 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth u
|
||||
if err := g.writeBuiltinCall(b, n, rp, depth); err != errNoSuchBuiltin {
|
||||
return err
|
||||
}
|
||||
if n.LHS().Expr().Ident() == t.IDReset {
|
||||
// TODO: don't hard-code f_lzw.
|
||||
b.writes("wuffs_gif__lzw_decoder__initialize(" +
|
||||
"&self->private_impl.f_lzw, WUFFS_VERSION, 0)")
|
||||
return nil
|
||||
}
|
||||
return g.writeExprUserDefinedCall(b, n, rp, depth)
|
||||
|
||||
case t.IDOpenBracket:
|
||||
|
||||
@@ -227,15 +227,15 @@ const char* play() {
|
||||
reset_palette_as_ascii_art();
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
wuffs_base__io_buffer src = {
|
||||
.ptr = src_buffer, .len = src_len, .wi = src_len, .closed = true};
|
||||
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
|
||||
.ptr = src_buffer, .len = src_len, .wi = src_len, .closed = true});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_gif__status s =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
if (s) {
|
||||
|
||||
@@ -48,14 +48,19 @@ static void ignore_return_value(int ignored) {}
|
||||
|
||||
static const char* decode() {
|
||||
uint8_t dst_buffer[DST_BUFFER_SIZE];
|
||||
wuffs_base__io_buffer dst = {.ptr = dst_buffer, .len = DST_BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src = {
|
||||
.ptr = lgtm_ptr, .len = lgtm_len, .wi = lgtm_len, .closed = true};
|
||||
wuffs_base__io_buffer dst =
|
||||
((wuffs_base__io_buffer){.ptr = dst_buffer, .len = DST_BUFFER_SIZE});
|
||||
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
|
||||
.ptr = lgtm_ptr,
|
||||
.len = lgtm_len,
|
||||
.wi = lgtm_len,
|
||||
.closed = true,
|
||||
});
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&dst);
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
wuffs_deflate__decoder dec;
|
||||
wuffs_deflate__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_deflate__status s =
|
||||
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
|
||||
if (s) {
|
||||
|
||||
+10
-7
@@ -55,8 +55,8 @@ char src_buffer[SRC_BUFFER_SIZE];
|
||||
static void ignore_return_value(int ignored) {}
|
||||
|
||||
static const char* decode() {
|
||||
wuffs_gzip__decoder dec;
|
||||
wuffs_gzip__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
while (true) {
|
||||
const int stdin_fd = 0;
|
||||
@@ -68,14 +68,17 @@ static const char* decode() {
|
||||
continue;
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer src = {.ptr = src_buffer,
|
||||
.len = SRC_BUFFER_SIZE,
|
||||
.wi = n_src,
|
||||
.closed = n_src == 0};
|
||||
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
|
||||
.ptr = src_buffer,
|
||||
.len = SRC_BUFFER_SIZE,
|
||||
.wi = n_src,
|
||||
.closed = n_src == 0,
|
||||
});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
while (true) {
|
||||
wuffs_base__io_buffer dst = {.ptr = dst_buffer, .len = DST_BUFFER_SIZE};
|
||||
wuffs_base__io_buffer dst =
|
||||
((wuffs_base__io_buffer){.ptr = dst_buffer, .len = DST_BUFFER_SIZE});
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&dst);
|
||||
wuffs_gzip__status s =
|
||||
wuffs_gzip__decoder__decode(&dec, dst_writer, src_reader);
|
||||
|
||||
@@ -45,12 +45,12 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
// Use a {} code block so that "goto exit" doesn't trigger "jump bypasses
|
||||
// variable initialization" warnings.
|
||||
{
|
||||
wuffs_gif__status s;
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gif__status s = 0;
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
s = wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
if (s) {
|
||||
ret = wuffs_gif__status__string(s);
|
||||
|
||||
@@ -42,9 +42,9 @@ It should print "PASS", amongst other information, and exit(0).
|
||||
|
||||
const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
const char* ret = NULL;
|
||||
wuffs_zlib__status s;
|
||||
wuffs_zlib__decoder dec;
|
||||
wuffs_zlib__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_zlib__status s = 0;
|
||||
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
|
||||
wuffs_zlib__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
// 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
|
||||
|
||||
+9
-19
@@ -1211,14 +1211,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_adler32__hasher__initialize is an initializer function.
|
||||
// wuffs_adler32__hasher__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_adler32__hasher__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1259,13 +1259,6 @@ uint32_t wuffs_adler32__hasher__update(wuffs_adler32__hasher* self,
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
|
||||
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
|
||||
|
||||
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
|
||||
// to a containee struct's initializer when the container has already zeroed
|
||||
// the containee's memory.
|
||||
//
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
|
||||
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
|
||||
|
||||
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
|
||||
//
|
||||
// The order matters here. Clang also defines "__GNUC__".
|
||||
@@ -1796,19 +1789,16 @@ const char* wuffs_adler32__status__string(wuffs_adler32__status s) {
|
||||
|
||||
// ---------------- Initializer Implementations
|
||||
|
||||
void wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only) {
|
||||
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
if (wuffs_version != WUFFS_VERSION) {
|
||||
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
|
||||
self->private_impl.status = WUFFS_ADLER32__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
|
||||
memset(self, 0, sizeof(*self));
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
}
|
||||
|
||||
|
||||
+11
-19
@@ -1209,14 +1209,15 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_crc32__ieee_hasher__initialize is an initializer function.
|
||||
// wuffs_crc32__ieee_hasher__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_crc32__ieee_hasher__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_crc32__ieee_hasher__check_wuffs_version(
|
||||
wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1257,13 +1258,6 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
|
||||
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
|
||||
|
||||
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
|
||||
// to a containee struct's initializer when the container has already zeroed
|
||||
// the containee's memory.
|
||||
//
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
|
||||
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
|
||||
|
||||
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
|
||||
//
|
||||
// The order matters here. Clang also defines "__GNUC__".
|
||||
@@ -2157,19 +2151,17 @@ static const uint32_t wuffs_crc32__ieee_table[8][256] = {
|
||||
|
||||
// ---------------- Initializer Implementations
|
||||
|
||||
void wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only) {
|
||||
void wuffs_crc32__ieee_hasher__check_wuffs_version(
|
||||
wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
if (wuffs_version != WUFFS_VERSION) {
|
||||
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
|
||||
self->private_impl.status = WUFFS_CRC32__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
|
||||
memset(self, 0, sizeof(*self));
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
}
|
||||
|
||||
|
||||
+9
-19
@@ -1299,14 +1299,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_deflate__decoder__initialize is an initializer function.
|
||||
// wuffs_deflate__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_deflate__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1349,13 +1349,6 @@ wuffs_deflate__status wuffs_deflate__decoder__decode(
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
|
||||
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
|
||||
|
||||
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
|
||||
// to a containee struct's initializer when the container has already zeroed
|
||||
// the containee's memory.
|
||||
//
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
|
||||
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
|
||||
|
||||
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
|
||||
//
|
||||
// The order matters here. Clang also defines "__GNUC__".
|
||||
@@ -1979,19 +1972,16 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
|
||||
|
||||
// ---------------- Initializer Implementations
|
||||
|
||||
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only) {
|
||||
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
if (wuffs_version != WUFFS_VERSION) {
|
||||
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
|
||||
self->private_impl.status = WUFFS_DEFLATE__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
|
||||
memset(self, 0, sizeof(*self));
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
}
|
||||
|
||||
|
||||
+26
-33
@@ -1343,14 +1343,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_gif__decoder__initialize is an initializer function.
|
||||
// wuffs_gif__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_gif__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_gif__decoder__initialize(wuffs_gif__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1402,13 +1402,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_up_to_id_part1(
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
|
||||
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
|
||||
|
||||
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
|
||||
// to a containee struct's initializer when the container has already zeroed
|
||||
// the containee's memory.
|
||||
//
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
|
||||
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
|
||||
|
||||
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
|
||||
//
|
||||
// The order matters here. Clang also defines "__GNUC__".
|
||||
@@ -1955,9 +1948,15 @@ static const uint8_t wuffs_gif__netscape2dot0[11] = {
|
||||
|
||||
// ---------------- Private Initializer Prototypes
|
||||
|
||||
void wuffs_gif__lzw_decoder__initialize(wuffs_gif__lzw_decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
// ---------------- Private Function Prototypes
|
||||
|
||||
@@ -2009,38 +2008,33 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode(
|
||||
|
||||
// ---------------- Initializer Implementations
|
||||
|
||||
void wuffs_gif__lzw_decoder__initialize(wuffs_gif__lzw_decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only) {
|
||||
void wuffs_gif__lzw_decoder__check_wuffs_version(wuffs_gif__lzw_decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
if (wuffs_version != WUFFS_VERSION) {
|
||||
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
|
||||
self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
|
||||
memset(self, 0, sizeof(*self));
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
}
|
||||
|
||||
void wuffs_gif__decoder__initialize(wuffs_gif__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only) {
|
||||
void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
if (wuffs_version != WUFFS_VERSION) {
|
||||
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
|
||||
self->private_impl.status = WUFFS_GIF__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
|
||||
memset(self, 0, sizeof(*self));
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
wuffs_gif__lzw_decoder__initialize(&self->private_impl.f_lzw, WUFFS_VERSION,
|
||||
WUFFS_BASE__ALREADY_ZEROED);
|
||||
wuffs_gif__lzw_decoder__check_wuffs_version(&self->private_impl.f_lzw,
|
||||
WUFFS_VERSION,
|
||||
sizeof(self->private_impl.f_lzw));
|
||||
}
|
||||
|
||||
// ---------------- Function Implementations
|
||||
@@ -3383,8 +3377,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
|
||||
}
|
||||
}
|
||||
if (self->private_impl.f_previous_lzw_decode_ended_abruptly) {
|
||||
wuffs_gif__lzw_decoder__initialize(&self->private_impl.f_lzw,
|
||||
WUFFS_VERSION, 0);
|
||||
wuffs_gif__lzw_decoder__reset(&self->private_impl.f_lzw);
|
||||
}
|
||||
{
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
|
||||
|
||||
+26
-34
@@ -1218,14 +1218,15 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_crc32__ieee_hasher__initialize is an initializer function.
|
||||
// wuffs_crc32__ieee_hasher__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_crc32__ieee_hasher__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_crc32__ieee_hasher__check_wuffs_version(
|
||||
wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1398,14 +1399,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_deflate__decoder__initialize is an initializer function.
|
||||
// wuffs_deflate__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_deflate__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1500,14 +1501,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_gzip__decoder__initialize is an initializer function.
|
||||
// wuffs_gzip__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_gzip__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1552,13 +1553,6 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self,
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
|
||||
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
|
||||
|
||||
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
|
||||
// to a containee struct's initializer when the container has already zeroed
|
||||
// the containee's memory.
|
||||
//
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
|
||||
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
|
||||
|
||||
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
|
||||
//
|
||||
// The order matters here. Clang also defines "__GNUC__".
|
||||
@@ -2098,25 +2092,23 @@ const char* wuffs_gzip__status__string(wuffs_gzip__status s) {
|
||||
|
||||
// ---------------- Initializer Implementations
|
||||
|
||||
void wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only) {
|
||||
void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
if (wuffs_version != WUFFS_VERSION) {
|
||||
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
|
||||
self->private_impl.status = WUFFS_GZIP__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
|
||||
memset(self, 0, sizeof(*self));
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
wuffs_deflate__decoder__initialize(&self->private_impl.f_flate, WUFFS_VERSION,
|
||||
WUFFS_BASE__ALREADY_ZEROED);
|
||||
wuffs_crc32__ieee_hasher__initialize(&self->private_impl.f_checksum,
|
||||
WUFFS_VERSION,
|
||||
WUFFS_BASE__ALREADY_ZEROED);
|
||||
wuffs_deflate__decoder__check_wuffs_version(
|
||||
&self->private_impl.f_flate, WUFFS_VERSION,
|
||||
sizeof(self->private_impl.f_flate));
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(
|
||||
&self->private_impl.f_checksum, WUFFS_VERSION,
|
||||
sizeof(self->private_impl.f_checksum));
|
||||
}
|
||||
|
||||
// ---------------- Function Implementations
|
||||
|
||||
+25
-33
@@ -1220,14 +1220,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_adler32__hasher__initialize is an initializer function.
|
||||
// wuffs_adler32__hasher__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_adler32__hasher__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1400,14 +1400,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_deflate__decoder__initialize is an initializer function.
|
||||
// wuffs_deflate__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_deflate__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1501,14 +1501,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_zlib__decoder__initialize is an initializer function.
|
||||
// wuffs_zlib__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_zlib__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1553,13 +1553,6 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("wuffs").
|
||||
#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)
|
||||
|
||||
// WUFFS_BASE__ALREADY_ZEROED is passed from a container struct's initializer
|
||||
// to a containee struct's initializer when the container has already zeroed
|
||||
// the containee's memory.
|
||||
//
|
||||
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
|
||||
#define WUFFS_BASE__ALREADY_ZEROED ((uint32_t)0x68602EF1)
|
||||
|
||||
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
|
||||
//
|
||||
// The order matters here. Clang also defines "__GNUC__".
|
||||
@@ -2100,24 +2093,23 @@ const char* wuffs_zlib__status__string(wuffs_zlib__status s) {
|
||||
|
||||
// ---------------- Initializer Implementations
|
||||
|
||||
void wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only) {
|
||||
void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
if (wuffs_version != WUFFS_VERSION) {
|
||||
if ((wuffs_version != WUFFS_VERSION) || (sizeof(*self) != sizeof_star_self)) {
|
||||
self->private_impl.status = WUFFS_ZLIB__ERROR_BAD_WUFFS_VERSION;
|
||||
return;
|
||||
}
|
||||
if (for_internal_use_only != WUFFS_BASE__ALREADY_ZEROED) {
|
||||
memset(self, 0, sizeof(*self));
|
||||
}
|
||||
self->private_impl.magic = WUFFS_BASE__MAGIC;
|
||||
wuffs_deflate__decoder__initialize(&self->private_impl.f_flate, WUFFS_VERSION,
|
||||
WUFFS_BASE__ALREADY_ZEROED);
|
||||
wuffs_adler32__hasher__initialize(&self->private_impl.f_checksum,
|
||||
WUFFS_VERSION, WUFFS_BASE__ALREADY_ZEROED);
|
||||
wuffs_deflate__decoder__check_wuffs_version(
|
||||
&self->private_impl.f_flate, WUFFS_VERSION,
|
||||
sizeof(self->private_impl.f_flate));
|
||||
wuffs_adler32__hasher__check_wuffs_version(
|
||||
&self->private_impl.f_checksum, WUFFS_VERSION,
|
||||
sizeof(self->private_impl.f_checksum));
|
||||
}
|
||||
|
||||
// ---------------- Function Implementations
|
||||
|
||||
+5
-5
@@ -1211,14 +1211,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_adler32__hasher__initialize is an initializer function.
|
||||
// wuffs_adler32__hasher__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_adler32__hasher__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
|
||||
+6
-5
@@ -1209,14 +1209,15 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_crc32__ieee_hasher__initialize is an initializer function.
|
||||
// wuffs_crc32__ieee_hasher__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_crc32__ieee_hasher__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_crc32__ieee_hasher__check_wuffs_version(
|
||||
wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
|
||||
+5
-5
@@ -1299,14 +1299,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_deflate__decoder__initialize is an initializer function.
|
||||
// wuffs_deflate__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_deflate__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
|
||||
+5
-5
@@ -1343,14 +1343,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_gif__decoder__initialize is an initializer function.
|
||||
// wuffs_gif__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_gif__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_gif__decoder__initialize(wuffs_gif__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_gif__decoder__check_wuffs_version(wuffs_gif__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
|
||||
+16
-15
@@ -1218,14 +1218,15 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_crc32__ieee_hasher__initialize is an initializer function.
|
||||
// wuffs_crc32__ieee_hasher__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_crc32__ieee_hasher__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_crc32__ieee_hasher__check_wuffs_version(
|
||||
wuffs_crc32__ieee_hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1398,14 +1399,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_deflate__decoder__initialize is an initializer function.
|
||||
// wuffs_deflate__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_deflate__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1500,14 +1501,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_gzip__decoder__initialize is an initializer function.
|
||||
// wuffs_gzip__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_gzip__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_gzip__decoder__initialize(wuffs_gzip__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_gzip__decoder__check_wuffs_version(wuffs_gzip__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
|
||||
+15
-15
@@ -1220,14 +1220,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_adler32__hasher__initialize is an initializer function.
|
||||
// wuffs_adler32__hasher__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_adler32__hasher__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_adler32__hasher__check_wuffs_version(wuffs_adler32__hasher* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1400,14 +1400,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_deflate__decoder__initialize is an initializer function.
|
||||
// wuffs_deflate__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_deflate__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_deflate__decoder__initialize(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_deflate__decoder__check_wuffs_version(wuffs_deflate__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
@@ -1501,14 +1501,14 @@ typedef struct {
|
||||
|
||||
// ---------------- Public Initializer Prototypes
|
||||
|
||||
// wuffs_zlib__decoder__initialize is an initializer function.
|
||||
// wuffs_zlib__decoder__check_wuffs_version is an initializer function.
|
||||
//
|
||||
// It should be called before any other wuffs_zlib__decoder__* function.
|
||||
//
|
||||
// Pass WUFFS_VERSION and 0 for wuffs_version and for_internal_use_only.
|
||||
void wuffs_zlib__decoder__initialize(wuffs_zlib__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
// Pass WUFFS_VERSION and sizeof(*self) for wuffs_version and sizeof_star_self.
|
||||
void wuffs_zlib__decoder__check_wuffs_version(wuffs_zlib__decoder* self,
|
||||
uint32_t wuffs_version,
|
||||
size_t sizeof_star_self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
|
||||
+12
-8
@@ -98,17 +98,19 @@ void test_wuffs_adler32_golden() {
|
||||
|
||||
int i;
|
||||
for (i = 0; i < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); i++) {
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
if (!read_file(&src, test_cases[i].filename)) {
|
||||
return;
|
||||
}
|
||||
|
||||
int j;
|
||||
for (j = 0; j < 2; j++) {
|
||||
wuffs_adler32__hasher checksum;
|
||||
wuffs_adler32__hasher__initialize(&checksum, WUFFS_VERSION, 0);
|
||||
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
|
||||
wuffs_adler32__hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
|
||||
uint32_t got;
|
||||
uint32_t got = 0;
|
||||
size_t num_fragments = 0;
|
||||
size_t num_bytes = 0;
|
||||
do {
|
||||
@@ -164,8 +166,9 @@ void test_wuffs_adler32_pi() {
|
||||
|
||||
int i;
|
||||
for (i = 0; i < 64; i++) {
|
||||
wuffs_adler32__hasher checksum;
|
||||
wuffs_adler32__hasher__initialize(&checksum, WUFFS_VERSION, 0);
|
||||
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
|
||||
wuffs_adler32__hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
uint32_t got =
|
||||
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = (uint8_t*)(digits),
|
||||
@@ -191,8 +194,9 @@ const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
|
||||
if (rlimit) {
|
||||
len = wuffs_base__u64__min(len, rlimit);
|
||||
}
|
||||
wuffs_adler32__hasher checksum;
|
||||
wuffs_adler32__hasher__initialize(&checksum, WUFFS_VERSION, 0);
|
||||
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
|
||||
wuffs_adler32__hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
global_wuffs_adler32_unused_u32 =
|
||||
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = src->ptr + src->ri,
|
||||
|
||||
+12
-8
@@ -98,17 +98,19 @@ void test_wuffs_crc32_ieee_golden() {
|
||||
|
||||
int i;
|
||||
for (i = 0; i < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); i++) {
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
if (!read_file(&src, test_cases[i].filename)) {
|
||||
return;
|
||||
}
|
||||
|
||||
int j;
|
||||
for (j = 0; j < 2; j++) {
|
||||
wuffs_crc32__ieee_hasher checksum;
|
||||
wuffs_crc32__ieee_hasher__initialize(&checksum, WUFFS_VERSION, 0);
|
||||
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
|
||||
uint32_t got;
|
||||
uint32_t got = 0;
|
||||
size_t num_fragments = 0;
|
||||
size_t num_bytes = 0;
|
||||
do {
|
||||
@@ -164,8 +166,9 @@ void test_wuffs_crc32_ieee_pi() {
|
||||
|
||||
int i;
|
||||
for (i = 0; i < 64; i++) {
|
||||
wuffs_crc32__ieee_hasher checksum;
|
||||
wuffs_crc32__ieee_hasher__initialize(&checksum, WUFFS_VERSION, 0);
|
||||
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
uint32_t got = wuffs_crc32__ieee_hasher__update(
|
||||
&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = (uint8_t*)(digits),
|
||||
@@ -191,8 +194,9 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
|
||||
if (rlimit) {
|
||||
len = wuffs_base__u64__min(len, rlimit);
|
||||
}
|
||||
wuffs_crc32__ieee_hasher checksum;
|
||||
wuffs_crc32__ieee_hasher__initialize(&checksum, WUFFS_VERSION, 0);
|
||||
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
|
||||
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, WUFFS_VERSION,
|
||||
sizeof checksum);
|
||||
global_wuffs_crc32_unused_u32 =
|
||||
wuffs_crc32__ieee_hasher__update(&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = src->ptr + src->ri,
|
||||
|
||||
+35
-25
@@ -111,8 +111,8 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__io_buffer* src,
|
||||
uint64_t wlimit,
|
||||
uint64_t rlimit) {
|
||||
wuffs_deflate__decoder dec;
|
||||
wuffs_deflate__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
while (true) {
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
|
||||
if (wlimit) {
|
||||
@@ -192,9 +192,12 @@ void test_wuffs_deflate_decode_romeo_fixed() {
|
||||
void test_wuffs_deflate_decode_split_src() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer got =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer want =
|
||||
((wuffs_base__io_buffer){.ptr = global_want_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
golden_test* gt = &deflate_256_bytes_gt;
|
||||
if (!read_file(&src, gt->src_filename)) {
|
||||
@@ -204,7 +207,6 @@ void test_wuffs_deflate_decode_split_src() {
|
||||
return;
|
||||
}
|
||||
|
||||
wuffs_deflate__decoder dec;
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&got);
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
@@ -217,7 +219,9 @@ void test_wuffs_deflate_decode_split_src() {
|
||||
}
|
||||
got.wi = 0;
|
||||
|
||||
wuffs_deflate__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION,
|
||||
sizeof dec);
|
||||
|
||||
src.closed = false;
|
||||
src.ri = gt->src_offset0;
|
||||
@@ -267,7 +271,6 @@ bool do_test_wuffs_deflate_history(int i,
|
||||
got->ri = 0;
|
||||
got->wi = 0;
|
||||
|
||||
wuffs_deflate__decoder__initialize(dec, WUFFS_VERSION, 0);
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(got);
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
|
||||
|
||||
@@ -290,9 +293,12 @@ bool do_test_wuffs_deflate_history(int i,
|
||||
void test_wuffs_deflate_history_full() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer got =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer want =
|
||||
((wuffs_base__io_buffer){.ptr = global_want_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
golden_test* gt = &deflate_pi_gt;
|
||||
if (!read_file(&src, gt->src_filename)) {
|
||||
@@ -305,7 +311,10 @@ void test_wuffs_deflate_history_full() {
|
||||
const int full_history_size = 0x8000;
|
||||
int i;
|
||||
for (i = -2; i <= +2; i++) {
|
||||
wuffs_deflate__decoder dec;
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION,
|
||||
sizeof dec);
|
||||
|
||||
if (!do_test_wuffs_deflate_history(
|
||||
i, gt, &src, &got, &dec, 0, want.wi + i,
|
||||
i >= 0 ? WUFFS_DEFLATE__STATUS_OK
|
||||
@@ -323,20 +332,20 @@ void test_wuffs_deflate_history_full() {
|
||||
continue;
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer history_got = {
|
||||
wuffs_base__io_buffer history_got = ((wuffs_base__io_buffer){
|
||||
.ptr = dec.private_impl.f_history,
|
||||
.len = full_history_size,
|
||||
.wi = full_history_size,
|
||||
};
|
||||
});
|
||||
if (want.wi < full_history_size - i) {
|
||||
FAIL("i=%d: want file is too short", i);
|
||||
return;
|
||||
}
|
||||
wuffs_base__io_buffer history_want = {
|
||||
wuffs_base__io_buffer history_want = ((wuffs_base__io_buffer){
|
||||
.ptr = global_want_buffer + want.wi - (full_history_size - i),
|
||||
.len = full_history_size,
|
||||
.wi = full_history_size,
|
||||
};
|
||||
});
|
||||
if (!io_buffers_equal("", &history_got, &history_want)) {
|
||||
return;
|
||||
}
|
||||
@@ -346,8 +355,10 @@ void test_wuffs_deflate_history_full() {
|
||||
void test_wuffs_deflate_history_partial() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer got =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
golden_test* gt = &deflate_pi_gt;
|
||||
if (!read_file(&src, gt->src_filename)) {
|
||||
@@ -367,7 +378,10 @@ void test_wuffs_deflate_history_partial() {
|
||||
const char* fragment = "3.14";
|
||||
const uint32_t fragment_length = 4;
|
||||
|
||||
wuffs_deflate__decoder dec;
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION,
|
||||
sizeof dec);
|
||||
|
||||
if (!do_test_wuffs_deflate_history(i, gt, &src, &got, &dec,
|
||||
starting_history_index, fragment_length,
|
||||
WUFFS_DEFLATE__SUSPENSION_SHORT_WRITE)) {
|
||||
@@ -448,12 +462,8 @@ void test_wuffs_deflate_table_redirect() {
|
||||
// 1st is the key in the first level table (9 bits).
|
||||
// 2nd is the key in the second level table (variable bits).
|
||||
|
||||
wuffs_deflate__decoder dec;
|
||||
wuffs_deflate__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
|
||||
// The initializer should zero out dec's fields, but to be paranoid, we zero
|
||||
// it out explicitly.
|
||||
memset(&dec.private_impl.f_huffs[0], 0, sizeof(dec.private_impl.f_huffs[0]));
|
||||
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
|
||||
wuffs_deflate__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
int i;
|
||||
int n = 0;
|
||||
|
||||
+64
-47
@@ -50,8 +50,8 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the
|
||||
|
||||
void test_basic_bad_receiver() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
wuffs_base__io_reader src = {{0}};
|
||||
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(NULL, &ic, src);
|
||||
if (status != WUFFS_GIF__ERROR_BAD_RECEIVER) {
|
||||
FAIL("decode_config: got %d, want %d", status,
|
||||
@@ -61,9 +61,9 @@ void test_basic_bad_receiver() {
|
||||
|
||||
void test_basic_initializer_not_called() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_gif__decoder dec = {{0}};
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
wuffs_base__io_reader src = {{0}};
|
||||
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,
|
||||
@@ -73,8 +73,9 @@ void test_basic_initializer_not_called() {
|
||||
|
||||
void test_basic_wuffs_version_bad() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, 0, 0); // 0 is not WUFFS_VERSION.
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, 0,
|
||||
0); // 0 is not WUFFS_VERSION.
|
||||
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);
|
||||
@@ -84,8 +85,8 @@ void test_basic_wuffs_version_bad() {
|
||||
|
||||
void test_basic_wuffs_version_good() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
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;
|
||||
@@ -150,8 +151,8 @@ void test_basic_status_strings() {
|
||||
|
||||
void test_basic_sub_struct_initializer() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
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("outer magic: got %u, want %u", dec.private_impl.magic,
|
||||
WUFFS_BASE__MAGIC);
|
||||
@@ -172,9 +173,12 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
|
||||
uint64_t want_size,
|
||||
uint64_t wlimit,
|
||||
uint64_t rlimit) {
|
||||
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer got =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer want =
|
||||
((wuffs_base__io_buffer){.ptr = global_want_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
if (!read_file(&src, src_filename)) {
|
||||
return false;
|
||||
@@ -199,8 +203,8 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
|
||||
return false;
|
||||
}
|
||||
|
||||
wuffs_gif__lzw_decoder dec;
|
||||
wuffs_gif__lzw_decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
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__set_literal_width(&dec, literal_width);
|
||||
int num_iters = 0;
|
||||
while (true) {
|
||||
@@ -299,8 +303,10 @@ void test_wuffs_lzw_decode_pi() {
|
||||
// ---------------- LZW Benches
|
||||
|
||||
bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t iters_unscaled) {
|
||||
wuffs_base__io_buffer dst = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer dst =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&dst);
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
@@ -324,8 +330,9 @@ bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t iters_unscaled) {
|
||||
for (i = 0; i < iters; i++) {
|
||||
dst.wi = 0;
|
||||
src.ri = 1; // Skip the literal width.
|
||||
wuffs_gif__lzw_decoder dec;
|
||||
wuffs_gif__lzw_decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gif__lzw_decoder dec = ((wuffs_gif__lzw_decoder){});
|
||||
wuffs_gif__lzw_decoder__check_wuffs_version(&dec, WUFFS_VERSION,
|
||||
sizeof dec);
|
||||
wuffs_gif__status s =
|
||||
wuffs_gif__lzw_decoder__decode(&dec, dst_writer, src_reader);
|
||||
if (s) {
|
||||
@@ -352,10 +359,10 @@ 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__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
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 =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
@@ -389,19 +396,21 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
const char* palette_filename,
|
||||
const char* indexes_filename,
|
||||
uint64_t rlimit) {
|
||||
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer got =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
if (!read_file(&src, filename)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
{
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
wuffs_gif__status status =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
@@ -540,14 +549,15 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
void test_wuffs_gif_call_sequence() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
if (!read_file(&src, "../../data/bricks-dither.gif")) {
|
||||
return;
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
@@ -574,11 +584,11 @@ bool do_test_wuffs_gif_decode_animated(
|
||||
return false;
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
wuffs_gif__status status =
|
||||
@@ -669,14 +679,15 @@ void test_wuffs_gif_decode_animated_small() {
|
||||
|
||||
void test_wuffs_gif_decode_frame_out_of_bounds() {
|
||||
CHECK_FOCUS(__func__);
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
if (!read_file(&src, "../../data/artificial/gif-frame-out-of-bounds.gif")) {
|
||||
return;
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
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 =
|
||||
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
|
||||
@@ -737,15 +748,16 @@ void test_wuffs_gif_decode_input_is_a_gif_many_small_reads() {
|
||||
void test_wuffs_gif_decode_input_is_a_png() {
|
||||
CHECK_FOCUS(__func__);
|
||||
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
if (!read_file(&src, "../../data/bricks-dither.png")) {
|
||||
return;
|
||||
}
|
||||
|
||||
wuffs_gif__decoder dec;
|
||||
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_base__image_config ic = {{0}};
|
||||
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
|
||||
wuffs_gif__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_base__image_config ic = ((wuffs_base__image_config){});
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
wuffs_gif__status status =
|
||||
@@ -763,13 +775,15 @@ void test_wuffs_gif_decode_input_is_a_png() {
|
||||
#ifdef WUFFS_MIMIC
|
||||
|
||||
bool do_test_mimic_gif_decode(const char* filename) {
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
if (!read_file(&src, filename)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
src.ri = 0;
|
||||
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer got =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
const char* got_msg = wuffs_gif_decode(&got, &src);
|
||||
if (got_msg) {
|
||||
FAIL("%s", got_msg);
|
||||
@@ -777,7 +791,8 @@ bool do_test_mimic_gif_decode(const char* filename) {
|
||||
}
|
||||
|
||||
src.ri = 0;
|
||||
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer want =
|
||||
((wuffs_base__io_buffer){.ptr = global_want_buffer, .len = BUFFER_SIZE});
|
||||
const char* want_msg = mimic_gif_decode(&want, &src);
|
||||
if (want_msg) {
|
||||
FAIL("%s", want_msg);
|
||||
@@ -851,8 +866,10 @@ bool do_bench_gif_decode(const char* (*decode_func)(wuffs_base__io_buffer*,
|
||||
wuffs_base__io_buffer*),
|
||||
const char* filename,
|
||||
uint64_t iters_unscaled) {
|
||||
wuffs_base__io_buffer dst = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer dst =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
if (!read_file(&src, filename)) {
|
||||
return false;
|
||||
|
||||
+8
-6
@@ -66,8 +66,8 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__io_buffer* src,
|
||||
uint64_t wlimit,
|
||||
uint64_t rlimit) {
|
||||
wuffs_gzip__decoder dec;
|
||||
wuffs_gzip__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
while (true) {
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
|
||||
@@ -94,8 +94,10 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
|
||||
}
|
||||
|
||||
bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
|
||||
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer got =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
if (!read_file(&src, gzip_midsummer_gt.src_filename)) {
|
||||
return false;
|
||||
@@ -112,8 +114,8 @@ 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__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
|
||||
wuffs_gzip__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_gzip__decoder__set_ignore_checksum(&dec, ignore_checksum);
|
||||
got.wi = 0;
|
||||
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
|
||||
|
||||
+8
-6
@@ -81,8 +81,8 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__io_buffer* src,
|
||||
uint64_t wlimit,
|
||||
uint64_t rlimit) {
|
||||
wuffs_zlib__decoder dec;
|
||||
wuffs_zlib__decoder__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
|
||||
wuffs_zlib__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
|
||||
while (true) {
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
|
||||
@@ -109,8 +109,10 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
|
||||
}
|
||||
|
||||
bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
|
||||
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer got =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
if (!read_file(&src, zlib_midsummer_gt.src_filename)) {
|
||||
return false;
|
||||
@@ -126,8 +128,8 @@ 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__initialize(&dec, WUFFS_VERSION, 0);
|
||||
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
|
||||
wuffs_zlib__decoder__check_wuffs_version(&dec, WUFFS_VERSION, sizeof dec);
|
||||
wuffs_zlib__decoder__set_ignore_checksum(&dec, ignore_checksum);
|
||||
got.wi = 0;
|
||||
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
|
||||
|
||||
@@ -520,9 +520,12 @@ bool proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
|
||||
return false;
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
|
||||
wuffs_base__io_buffer src =
|
||||
((wuffs_base__io_buffer){.ptr = global_src_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer got =
|
||||
((wuffs_base__io_buffer){.ptr = global_got_buffer, .len = BUFFER_SIZE});
|
||||
wuffs_base__io_buffer want =
|
||||
((wuffs_base__io_buffer){.ptr = global_want_buffer, .len = BUFFER_SIZE});
|
||||
|
||||
if (!gt->src_filename) {
|
||||
src.closed = true;
|
||||
|
||||
Reference in new issue
Block a user