mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
Remove C destructor functions; they're no-ops.
This commit is contained in:
1 parent
04e8a73d10
commit
552fcde35a
9 files changed
+83
-166
No files matched your search
@@ -582,24 +582,18 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeCtorSignature(b *buffer, n *a.Struct, public bool, ctor bool) error {
|
||||
func (g *gen) writeCtorSignature(b *buffer, n *a.Struct, public bool) error {
|
||||
structName := n.Name().String(g.tm)
|
||||
ctorName := "destructor"
|
||||
if ctor {
|
||||
ctorName = "constructor"
|
||||
if public {
|
||||
b.printf("// %s%s_%s is a constructor function.\n", g.pkgPrefix, structName, ctorName)
|
||||
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 PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.\n")
|
||||
}
|
||||
}
|
||||
b.printf("void %s%s_%s(%s%s *self", g.pkgPrefix, structName, ctorName, g.pkgPrefix, structName)
|
||||
if ctor {
|
||||
b.printf(", uint32_t puffs_version, uint32_t for_internal_use_only")
|
||||
if public {
|
||||
b.printf("// %s%s_constructor is a constructor 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 PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.\n")
|
||||
}
|
||||
b.printf("void %s%s_constructor(%s%s *self", g.pkgPrefix, structName, g.pkgPrefix, structName)
|
||||
b.printf(", uint32_t puffs_version, uint32_t for_internal_use_only")
|
||||
b.printf(")")
|
||||
return nil
|
||||
}
|
||||
@@ -608,12 +602,10 @@ func (g *gen) writeCtorPrototype(b *buffer, n *a.Struct) error {
|
||||
if !n.Suspendible() {
|
||||
return nil
|
||||
}
|
||||
for _, ctor := range []bool{true, false} {
|
||||
if err := g.writeCtorSignature(b, n, n.Public(), ctor); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(";\n\n")
|
||||
if err := g.writeCtorSignature(b, n, n.Public()); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes(";\n\n")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -621,54 +613,45 @@ func (g *gen) writeCtorImpl(b *buffer, n *a.Struct) error {
|
||||
if !n.Suspendible() {
|
||||
return nil
|
||||
}
|
||||
for _, ctor := range []bool{true, false} {
|
||||
if err := g.writeCtorSignature(b, n, false, ctor); err != nil {
|
||||
return err
|
||||
}
|
||||
b.printf("{\n")
|
||||
b.printf("if (!self) { return; }\n")
|
||||
|
||||
if ctor {
|
||||
b.printf("if (puffs_version != PUFFS_VERSION) {\n")
|
||||
b.printf("self->private_impl.status = %sERROR_BAD_PUFFS_VERSION;\n", g.PKGPREFIX)
|
||||
b.printf("return;\n")
|
||||
b.printf("}\n")
|
||||
|
||||
b.writes("if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {" +
|
||||
"memset(self, 0, sizeof(*self)); }\n")
|
||||
b.writes("self->private_impl.magic = PUFFS_MAGIC;\n")
|
||||
|
||||
for _, f := range n.Fields() {
|
||||
f := f.Field()
|
||||
if dv := f.DefaultValue(); dv != nil {
|
||||
// TODO: set default values for array types.
|
||||
b.printf("self->private_impl.%s%s = %d;\n", fPrefix, f.Name().String(g.tm), dv.ConstValue())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Call any ctor/dtors on sub-structs.
|
||||
for _, f := range n.Fields() {
|
||||
f := f.Field()
|
||||
x := f.XType()
|
||||
if x != x.Innermost() {
|
||||
// TODO: arrays of sub-structs.
|
||||
continue
|
||||
}
|
||||
if g.structMap[x.Name()] == nil {
|
||||
continue
|
||||
}
|
||||
if ctor {
|
||||
b.printf("%s%s_constructor(&self->private_impl.%s%s,"+
|
||||
"PUFFS_VERSION, PUFFS_ALREADY_ZEROED);\n",
|
||||
g.pkgPrefix, x.Name().String(g.tm), fPrefix, f.Name().String(g.tm))
|
||||
} else {
|
||||
b.printf("%s%s_destructor(&self->private_impl.%s%s);\n",
|
||||
g.pkgPrefix, x.Name().String(g.tm), fPrefix, f.Name().String(g.tm))
|
||||
}
|
||||
}
|
||||
|
||||
b.writes("}\n\n")
|
||||
if err := g.writeCtorSignature(b, n, false); err != nil {
|
||||
return err
|
||||
}
|
||||
b.printf("{\n")
|
||||
b.printf("if (!self) { return; }\n")
|
||||
|
||||
b.printf("if (puffs_version != PUFFS_VERSION) {\n")
|
||||
b.printf("self->private_impl.status = %sERROR_BAD_PUFFS_VERSION;\n", g.PKGPREFIX)
|
||||
b.printf("return;\n")
|
||||
b.printf("}\n")
|
||||
|
||||
b.writes("if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {" +
|
||||
"memset(self, 0, sizeof(*self)); }\n")
|
||||
b.writes("self->private_impl.magic = PUFFS_MAGIC;\n")
|
||||
|
||||
for _, f := range n.Fields() {
|
||||
f := f.Field()
|
||||
if dv := f.DefaultValue(); dv != nil {
|
||||
// TODO: set default values for array types.
|
||||
b.printf("self->private_impl.%s%s = %d;\n", fPrefix, f.Name().String(g.tm), dv.ConstValue())
|
||||
}
|
||||
}
|
||||
|
||||
// Call any ctors on sub-structs.
|
||||
for _, f := range n.Fields() {
|
||||
f := f.Field()
|
||||
x := f.XType()
|
||||
if x != x.Innermost() {
|
||||
// TODO: arrays of sub-structs.
|
||||
continue
|
||||
}
|
||||
if g.structMap[x.Name()] == nil {
|
||||
continue
|
||||
}
|
||||
b.printf("%s%s_constructor(&self->private_impl.%s%s,"+
|
||||
"PUFFS_VERSION, PUFFS_ALREADY_ZEROED);\n",
|
||||
g.pkgPrefix, x.Name().String(g.tm), fPrefix, f.Name().String(g.tm))
|
||||
}
|
||||
|
||||
b.writes("}\n\n")
|
||||
return nil
|
||||
}
|
||||
@@ -56,7 +56,6 @@ int main(int argc, char** argv) {
|
||||
puffs_flate_decoder dec;
|
||||
puffs_flate_decoder_constructor(&dec, PUFFS_VERSION, 0);
|
||||
const char* status_msg = decode(&dec);
|
||||
puffs_flate_decoder_destructor(&dec);
|
||||
|
||||
int status = 0;
|
||||
if (status_msg) {
|
||||
|
||||
@@ -72,7 +72,6 @@ int main(int argc, char** argv) {
|
||||
puffs_gif_decoder dec;
|
||||
puffs_gif_decoder_constructor(&dec, PUFFS_VERSION, 0);
|
||||
const char* status_msg = decode(&dec);
|
||||
puffs_gif_decoder_destructor(&dec);
|
||||
|
||||
int status = 0;
|
||||
if (status_msg) {
|
||||
|
||||
@@ -261,8 +261,6 @@ void puffs_flate_decoder_constructor(puffs_flate_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
|
||||
void puffs_flate_decoder_destructor(puffs_flate_decoder* self);
|
||||
|
||||
// puffs_flate_zlib_decoder_constructor is a constructor function.
|
||||
//
|
||||
// It should be called before any other puffs_flate_zlib_decoder_* function.
|
||||
@@ -272,8 +270,6 @@ void puffs_flate_zlib_decoder_constructor(puffs_flate_zlib_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
|
||||
void puffs_flate_zlib_decoder_destructor(puffs_flate_zlib_decoder* self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
|
||||
@@ -618,12 +614,6 @@ void puffs_flate_decoder_constructor(puffs_flate_decoder* self,
|
||||
self->private_impl.magic = PUFFS_MAGIC;
|
||||
}
|
||||
|
||||
void puffs_flate_decoder_destructor(puffs_flate_decoder* self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void puffs_flate_zlib_decoder_constructor(puffs_flate_zlib_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only) {
|
||||
@@ -642,13 +632,6 @@ void puffs_flate_zlib_decoder_constructor(puffs_flate_zlib_decoder* self,
|
||||
PUFFS_ALREADY_ZEROED);
|
||||
}
|
||||
|
||||
void puffs_flate_zlib_decoder_destructor(puffs_flate_zlib_decoder* self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
puffs_flate_decoder_destructor(&self->private_impl.f_dec);
|
||||
}
|
||||
|
||||
// ---------------- Function Implementations
|
||||
|
||||
puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
|
||||
|
||||
@@ -229,8 +229,6 @@ void puffs_gif_lzw_decoder_constructor(puffs_gif_lzw_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
|
||||
void puffs_gif_lzw_decoder_destructor(puffs_gif_lzw_decoder* self);
|
||||
|
||||
// puffs_gif_decoder_constructor is a constructor function.
|
||||
//
|
||||
// It should be called before any other puffs_gif_decoder_* function.
|
||||
@@ -240,8 +238,6 @@ void puffs_gif_decoder_constructor(puffs_gif_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
|
||||
void puffs_gif_decoder_destructor(puffs_gif_decoder* self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
|
||||
@@ -526,12 +522,6 @@ void puffs_gif_lzw_decoder_constructor(puffs_gif_lzw_decoder* self,
|
||||
self->private_impl.f_literal_width = 8;
|
||||
}
|
||||
|
||||
void puffs_gif_lzw_decoder_destructor(puffs_gif_lzw_decoder* self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void puffs_gif_decoder_constructor(puffs_gif_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only) {
|
||||
@@ -550,13 +540,6 @@ void puffs_gif_decoder_constructor(puffs_gif_decoder* self,
|
||||
PUFFS_ALREADY_ZEROED);
|
||||
}
|
||||
|
||||
void puffs_gif_decoder_destructor(puffs_gif_decoder* self) {
|
||||
if (!self) {
|
||||
return;
|
||||
}
|
||||
puffs_gif_lzw_decoder_destructor(&self->private_impl.f_lzw);
|
||||
}
|
||||
|
||||
// ---------------- Function Implementations
|
||||
|
||||
puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
|
||||
|
||||
@@ -261,8 +261,6 @@ void puffs_flate_decoder_constructor(puffs_flate_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
|
||||
void puffs_flate_decoder_destructor(puffs_flate_decoder* self);
|
||||
|
||||
// puffs_flate_zlib_decoder_constructor is a constructor function.
|
||||
//
|
||||
// It should be called before any other puffs_flate_zlib_decoder_* function.
|
||||
@@ -272,8 +270,6 @@ void puffs_flate_zlib_decoder_constructor(puffs_flate_zlib_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
|
||||
void puffs_flate_zlib_decoder_destructor(puffs_flate_zlib_decoder* self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self,
|
||||
|
||||
@@ -229,8 +229,6 @@ void puffs_gif_lzw_decoder_constructor(puffs_gif_lzw_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
|
||||
void puffs_gif_lzw_decoder_destructor(puffs_gif_lzw_decoder* self);
|
||||
|
||||
// puffs_gif_decoder_constructor is a constructor function.
|
||||
//
|
||||
// It should be called before any other puffs_gif_decoder_* function.
|
||||
@@ -240,8 +238,6 @@ void puffs_gif_decoder_constructor(puffs_gif_decoder* self,
|
||||
uint32_t puffs_version,
|
||||
uint32_t for_internal_use_only);
|
||||
|
||||
void puffs_gif_decoder_destructor(puffs_gif_decoder* self);
|
||||
|
||||
// ---------------- Public Function Prototypes
|
||||
|
||||
puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
|
||||
|
||||
@@ -109,7 +109,6 @@ const char* puffs_flate_decode(puffs_base_buf1* dst, puffs_base_buf1* src) {
|
||||
puffs_base_reader1 src_reader = {.buf = src};
|
||||
puffs_flate_status s =
|
||||
puffs_flate_decoder_decode(&dec, dst_writer, src_reader);
|
||||
puffs_flate_decoder_destructor(&dec);
|
||||
if (s) {
|
||||
return puffs_flate_status_string(s);
|
||||
}
|
||||
@@ -123,7 +122,6 @@ const char* puffs_zlib_decode(puffs_base_buf1* dst, puffs_base_buf1* src) {
|
||||
puffs_base_reader1 src_reader = {.buf = src};
|
||||
puffs_flate_status s =
|
||||
puffs_flate_zlib_decoder_decode(&dec, dst_writer, src_reader);
|
||||
puffs_flate_zlib_decoder_destructor(&dec);
|
||||
if (s) {
|
||||
return puffs_flate_status_string(s);
|
||||
}
|
||||
@@ -197,8 +195,6 @@ void test_puffs_flate_decode_split_src() {
|
||||
puffs_flate_status s1 =
|
||||
puffs_flate_decoder_decode(&dec, dst_writer, src_reader);
|
||||
|
||||
puffs_flate_decoder_destructor(&dec);
|
||||
|
||||
if (s0 != PUFFS_FLATE_SUSPENSION_SHORT_READ) {
|
||||
FAIL("i=%d: s0: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, s0,
|
||||
puffs_flate_status_string(s0), PUFFS_FLATE_SUSPENSION_SHORT_READ,
|
||||
@@ -244,7 +240,6 @@ bool do_test_puffs_flate_history(int i,
|
||||
|
||||
puffs_flate_status got_s =
|
||||
puffs_flate_decoder_decode(dec, dst_writer, src_reader);
|
||||
puffs_flate_decoder_destructor(dec);
|
||||
// TODO: should want_s's SHORT_WRITE be LIMITED_WRITE?
|
||||
if (got_s != want_s) {
|
||||
FAIL("i=%d: starting_history_index=0x%04" PRIX32
|
||||
@@ -442,7 +437,6 @@ void test_puffs_flate_table_redirect() {
|
||||
dec.private_impl.f_code_lengths[n++] = 13;
|
||||
|
||||
puffs_flate_status s = puffs_flate_decoder_init_huff(&dec, 0, 0, n, 257);
|
||||
puffs_flate_decoder_destructor(&dec);
|
||||
if (s) {
|
||||
FAIL("%s", puffs_flate_status_string(s));
|
||||
return;
|
||||
|
||||
+31
-47
@@ -89,10 +89,8 @@ void test_basic_puffs_version_bad() {
|
||||
if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_PUFFS_VERSION) {
|
||||
FAIL("status: got %d, want %d", dec.private_impl.status,
|
||||
PUFFS_GIF_ERROR_BAD_PUFFS_VERSION);
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
cleanup0:
|
||||
puffs_gif_lzw_decoder_destructor(&dec);
|
||||
}
|
||||
|
||||
void test_basic_puffs_version_good() {
|
||||
@@ -101,15 +99,13 @@ void test_basic_puffs_version_good() {
|
||||
puffs_gif_lzw_decoder_constructor(&dec, PUFFS_VERSION, 0);
|
||||
if (dec.private_impl.magic != PUFFS_MAGIC) {
|
||||
FAIL("magic: got %u, want %u", dec.private_impl.magic, PUFFS_MAGIC);
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
if (dec.private_impl.f_literal_width != 8) {
|
||||
FAIL("f_literal_width: got %u, want %u", dec.private_impl.f_literal_width,
|
||||
8);
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
cleanup0:
|
||||
puffs_gif_lzw_decoder_destructor(&dec);
|
||||
}
|
||||
|
||||
void test_basic_status_is_error() {
|
||||
@@ -173,15 +169,13 @@ void test_basic_sub_struct_constructor() {
|
||||
puffs_gif_decoder_constructor(&dec, PUFFS_VERSION, 0);
|
||||
if (dec.private_impl.magic != PUFFS_MAGIC) {
|
||||
FAIL("outer magic: got %u, want %u", dec.private_impl.magic, PUFFS_MAGIC);
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
if (dec.private_impl.f_lzw.private_impl.magic != PUFFS_MAGIC) {
|
||||
FAIL("inner magic: got %u, want %u",
|
||||
dec.private_impl.f_lzw.private_impl.magic, PUFFS_MAGIC);
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
cleanup0:
|
||||
puffs_gif_decoder_destructor(&dec);
|
||||
}
|
||||
|
||||
// ---------------- LZW Tests
|
||||
@@ -196,26 +190,26 @@ void test_puffs_gif_lzw_decode(const char* src_filename,
|
||||
puffs_base_buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
|
||||
if (!read_file(&src, src_filename)) {
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
if (src.wi != src_size) {
|
||||
FAIL("src size: got %d, want %d", (int)(src.wi), (int)(src_size));
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
// The first byte in that file, the LZW literal width, should be 0x08.
|
||||
uint8_t literal_width = src.ptr[0];
|
||||
if (literal_width != 0x08) {
|
||||
FAIL("LZW literal width: got %d, want %d", (int)(src.ptr[0]), 0x08);
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
src.ri++;
|
||||
|
||||
if (!read_file(&want, want_filename)) {
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
if (want.wi != want_size) {
|
||||
FAIL("want size: got %d, want %d", (int)(want.wi), (int)(want_size));
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
|
||||
puffs_gif_lzw_decoder dec;
|
||||
@@ -234,44 +228,40 @@ void test_puffs_gif_lzw_decode(const char* src_filename,
|
||||
if (src.ri == src.wi) {
|
||||
if (status != PUFFS_GIF_STATUS_OK) {
|
||||
FAIL("status: got %d, want %d", status, PUFFS_GIF_STATUS_OK);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (status != PUFFS_GIF_SUSPENSION_LIMITED_READ) {
|
||||
FAIL("status: got %d, want %d", status,
|
||||
PUFFS_GIF_SUSPENSION_LIMITED_READ);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
if (src.ri < old_ri) {
|
||||
FAIL("read index src.ri went backwards");
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
if (src.ri == old_ri) {
|
||||
FAIL("no progress was made");
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (limit < 1000000) {
|
||||
if (num_iters <= 1) {
|
||||
FAIL("num_iters: got %d, want > 1", num_iters);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (num_iters != 1) {
|
||||
FAIL("num_iters: got %d, want 1", num_iters);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (!buf1s_equal("", &got, &want)) {
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
|
||||
cleanup1:
|
||||
puffs_gif_lzw_decoder_destructor(&dec);
|
||||
cleanup0:;
|
||||
}
|
||||
|
||||
void test_puffs_gif_lzw_decode_few_big_reads() {
|
||||
@@ -338,7 +328,6 @@ void bench_puffs_gif_lzw_decode(const char* filename, uint64_t reps) {
|
||||
puffs_gif_lzw_decoder_constructor(&dec, PUFFS_VERSION, 0);
|
||||
puffs_gif_status s =
|
||||
puffs_gif_lzw_decoder_decode(&dec, dst_writer, src_reader);
|
||||
puffs_gif_lzw_decoder_destructor(&dec);
|
||||
if (s) {
|
||||
FAIL("decode: %s", puffs_gif_status_string(s));
|
||||
return;
|
||||
@@ -366,7 +355,6 @@ const char* puffs_gif_decode(puffs_base_buf1* dst, puffs_base_buf1* src) {
|
||||
puffs_base_writer1 dst_writer = {.buf = dst};
|
||||
puffs_base_reader1 src_reader = {.buf = src};
|
||||
puffs_gif_status s = puffs_gif_decoder_decode(&dec, dst_writer, src_reader);
|
||||
puffs_gif_decoder_destructor(&dec);
|
||||
if (s) {
|
||||
return puffs_gif_status_string(s);
|
||||
}
|
||||
@@ -382,7 +370,7 @@ void test_puffs_gif_decode(const char* filename,
|
||||
puffs_base_buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
|
||||
|
||||
if (!read_file(&src, filename)) {
|
||||
goto cleanup0;
|
||||
return;
|
||||
}
|
||||
|
||||
puffs_gif_decoder dec;
|
||||
@@ -400,48 +388,48 @@ void test_puffs_gif_decode(const char* filename,
|
||||
if ((src.ri == src.wi) || puffs_gif_status_is_error(got)) {
|
||||
if (got != want) {
|
||||
FAIL("status: got %d, want %d", got, want);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (got != PUFFS_GIF_SUSPENSION_LIMITED_READ) {
|
||||
FAIL("status: got %d, want %d", got, PUFFS_GIF_SUSPENSION_LIMITED_READ);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
if (src.ri < old_ri) {
|
||||
FAIL("read index src.ri went backwards");
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
if (src.ri == old_ri) {
|
||||
FAIL("no progress was made");
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (want != PUFFS_GIF_STATUS_OK) {
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
|
||||
if (limit < 1000000) {
|
||||
if (num_iters <= 1) {
|
||||
FAIL("num_iters: got %d, want > 1", num_iters);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (num_iters != 1) {
|
||||
FAIL("num_iters: got %d, want 1", num_iters);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: provide a public API for getting the width and height.
|
||||
if (dec.private_impl.f_width != 160) {
|
||||
FAIL("width: got %d, want %d", dec.private_impl.f_width, 160);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
if (dec.private_impl.f_height != 120) {
|
||||
FAIL("height: got %d, want %d", dec.private_impl.f_height, 120);
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
|
||||
// TODO: provide a public API for getting the palette.
|
||||
@@ -449,23 +437,19 @@ void test_puffs_gif_decode(const char* filename,
|
||||
puffs_base_buf1 pal_want = {.ptr = global_palette_buffer, .len = 3 * 256};
|
||||
pal_got.wi = 3 * 256;
|
||||
if (!read_file(&pal_want, palette_filename)) {
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
if (!buf1s_equal("palette ", &pal_got, &pal_want)) {
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
|
||||
puffs_base_buf1 ind_want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
|
||||
if (!read_file(&ind_want, indexes_filename)) {
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
if (!buf1s_equal("indexes ", &got, &ind_want)) {
|
||||
goto cleanup1;
|
||||
return;
|
||||
}
|
||||
|
||||
cleanup1:
|
||||
puffs_gif_decoder_destructor(&dec);
|
||||
cleanup0:;
|
||||
}
|
||||
|
||||
void test_puffs_gif_decode_input_is_a_gif_few_big_reads() {
|
||||
|
||||
Reference in new issue
Block a user