Have check_wuffs_version return a status code

This commit is contained in:
Nigel Tao committed 2018-08-05 22:29:54 +10:00
1 parent 845ffbeb86
commit fd43e777bc
21 files changed
+628 -466

No files matched your search

+19 -6
View File
@@ -126,8 +126,13 @@ void test_wuffs_adler32_golden() {
int j;
for (j = 0; j < 2; j++) {
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
wuffs_adler32__hasher__check_wuffs_version(&checksum, sizeof checksum,
WUFFS_VERSION);
wuffs_base__status z = wuffs_adler32__hasher__check_wuffs_version(
&checksum, sizeof checksum, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_adler32__status__string(z));
return;
}
uint32_t got = 0;
size_t num_fragments = 0;
@@ -186,8 +191,13 @@ void test_wuffs_adler32_pi() {
int i;
for (i = 0; i < 64; i++) {
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
wuffs_adler32__hasher__check_wuffs_version(&checksum, sizeof checksum,
WUFFS_VERSION);
wuffs_base__status z = wuffs_adler32__hasher__check_wuffs_version(
&checksum, sizeof checksum, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_adler32__status__string(z));
return;
}
uint32_t got =
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
.ptr = (uint8_t*)(digits),
@@ -214,8 +224,11 @@ const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
len = wuffs_base__u64__min(len, rlimit);
}
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
wuffs_adler32__hasher__check_wuffs_version(&checksum, sizeof checksum,
WUFFS_VERSION);
wuffs_base__status z = wuffs_adler32__hasher__check_wuffs_version(
&checksum, sizeof checksum, WUFFS_VERSION);
if (z) {
return wuffs_adler32__status__string(z);
}
global_wuffs_adler32_unused_u32 =
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
.ptr = src->ptr + src->ri,
+19 -6
View File
@@ -126,8 +126,13 @@ void test_wuffs_crc32_ieee_golden() {
int j;
for (j = 0; j < 2; j++) {
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, sizeof checksum,
WUFFS_VERSION);
wuffs_base__status z = wuffs_crc32__ieee_hasher__check_wuffs_version(
&checksum, sizeof checksum, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_crc32__status__string(z));
return;
}
uint32_t got = 0;
size_t num_fragments = 0;
@@ -186,8 +191,13 @@ void test_wuffs_crc32_ieee_pi() {
int i;
for (i = 0; i < 64; i++) {
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, sizeof checksum,
WUFFS_VERSION);
wuffs_base__status z = wuffs_crc32__ieee_hasher__check_wuffs_version(
&checksum, sizeof checksum, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_crc32__status__string(z));
return;
}
uint32_t got = wuffs_crc32__ieee_hasher__update(
&checksum, ((wuffs_base__slice_u8){
.ptr = (uint8_t*)(digits),
@@ -214,8 +224,11 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
len = wuffs_base__u64__min(len, rlimit);
}
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
wuffs_crc32__ieee_hasher__check_wuffs_version(&checksum, sizeof checksum,
WUFFS_VERSION);
wuffs_base__status z = wuffs_crc32__ieee_hasher__check_wuffs_version(
&checksum, sizeof checksum, WUFFS_VERSION);
if (z) {
return wuffs_crc32__status__string(z);
}
global_wuffs_crc32_unused_u32 =
wuffs_crc32__ieee_hasher__update(&checksum, ((wuffs_base__slice_u8){
.ptr = src->ptr + src->ri,
+57 -29
View File
@@ -131,7 +131,14 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_deflate__status__string(z));
return false;
}
while (true) {
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
if (wlimit) {
@@ -142,17 +149,17 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
set_reader_limit(&src_reader, rlimit);
}
wuffs_base__status s =
wuffs_base__status z =
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
if (s == WUFFS_BASE__STATUS_OK) {
if (z == WUFFS_BASE__STATUS_OK) {
return NULL;
}
if ((wlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
if ((wlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
continue;
}
return wuffs_deflate__status__string(s);
return wuffs_deflate__status__string(z);
}
}
@@ -239,31 +246,36 @@ void test_wuffs_deflate_decode_split_src() {
got.wi = 0;
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec,
WUFFS_VERSION);
wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_deflate__status__string(z));
return;
}
src.closed = false;
src.ri = gt->src_offset0;
src.wi = split;
wuffs_base__status s0 =
wuffs_base__status z0 =
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
src.closed = true;
src.ri = split;
src.wi = gt->src_offset1;
wuffs_base__status s1 =
wuffs_base__status z1 =
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
if (s0 != WUFFS_BASE__SUSPENSION_SHORT_READ) {
FAIL("i=%d: s0: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, s0,
wuffs_deflate__status__string(s0), WUFFS_BASE__SUSPENSION_SHORT_READ,
if (z0 != WUFFS_BASE__SUSPENSION_SHORT_READ) {
FAIL("i=%d: z0: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, z0,
wuffs_deflate__status__string(z0), WUFFS_BASE__SUSPENSION_SHORT_READ,
wuffs_deflate__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ));
return;
}
if (s1 != WUFFS_BASE__STATUS_OK) {
FAIL("i=%d: s1: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, s1,
wuffs_deflate__status__string(s1), WUFFS_BASE__STATUS_OK,
if (z1 != WUFFS_BASE__STATUS_OK) {
FAIL("i=%d: z1: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, z1,
wuffs_deflate__status__string(z1), WUFFS_BASE__STATUS_OK,
wuffs_deflate__status__string(WUFFS_BASE__STATUS_OK));
return;
}
@@ -283,7 +295,7 @@ bool do_test_wuffs_deflate_history(int i,
wuffs_deflate__decoder* dec,
uint32_t starting_history_index,
uint64_t limit,
wuffs_base__status want_s) {
wuffs_base__status want_z) {
src->ri = gt->src_offset0;
src->wi = gt->src_offset1;
got->ri = 0;
@@ -296,13 +308,13 @@ bool do_test_wuffs_deflate_history(int i,
set_writer_limit(&dst_writer, limit);
wuffs_base__status got_s =
wuffs_base__status got_z =
wuffs_deflate__decoder__decode(dec, dst_writer, src_reader);
if (got_s != want_s) {
if (got_z != want_z) {
FAIL("i=%d: starting_history_index=0x%04" PRIX32
": decode status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
i, starting_history_index, got_s, wuffs_deflate__status__string(got_s),
want_s, wuffs_deflate__status__string(want_s));
i, starting_history_index, got_z, wuffs_deflate__status__string(got_z),
want_z, wuffs_deflate__status__string(want_z));
return false;
}
return true;
@@ -330,8 +342,13 @@ void test_wuffs_deflate_history_full() {
int i;
for (i = -2; i <= +2; i++) {
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec,
WUFFS_VERSION);
wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_deflate__status__string(z));
return;
}
if (!do_test_wuffs_deflate_history(
i, gt, &src, &got, &dec, 0, want.wi + i,
@@ -397,8 +414,13 @@ void test_wuffs_deflate_history_partial() {
const uint32_t fragment_length = 4;
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec,
WUFFS_VERSION);
wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_deflate__status__string(z));
return;
}
if (!do_test_wuffs_deflate_history(i, gt, &src, &got, &dec,
starting_history_index, fragment_length,
@@ -481,7 +503,13 @@ void test_wuffs_deflate_table_redirect() {
// 2nd is the key in the second level table (variable bits).
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
wuffs_deflate__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z = wuffs_deflate__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_deflate__status__string(z));
return;
}
int i;
int n = 0;
@@ -500,9 +528,9 @@ void test_wuffs_deflate_table_redirect() {
dec.private_impl.f_code_lengths[n++] = 13;
dec.private_impl.f_code_lengths[n++] = 13;
wuffs_base__status s = wuffs_deflate__decoder__init_huff(&dec, 0, 0, n, 257);
if (s) {
FAIL("%s", wuffs_deflate__status__string(s));
z = wuffs_deflate__decoder__init_huff(&dec, 0, 0, n, 257);
if (z) {
FAIL("init_huff: %" PRIi32 " (%s)", z, wuffs_deflate__status__string(z));
return;
}
+147 -115
View File
@@ -72,12 +72,11 @@ void test_basic_bad_receiver() {
CHECK_FOCUS(__func__);
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src = ((wuffs_base__io_reader){});
wuffs_base__status status =
wuffs_base__status z =
wuffs_gif__decoder__decode_image_config(NULL, &ic, src);
if (status != WUFFS_BASE__ERROR_BAD_RECEIVER) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
status, wuffs_gif__status__string(status),
WUFFS_BASE__ERROR_BAD_RECEIVER,
if (z != WUFFS_BASE__ERROR_BAD_RECEIVER) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z), WUFFS_BASE__ERROR_BAD_RECEIVER,
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_RECEIVER));
}
}
@@ -85,12 +84,11 @@ void test_basic_bad_receiver() {
void test_basic_bad_sizeof_receiver() {
CHECK_FOCUS(__func__);
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, 0, WUFFS_VERSION);
if (dec.private_impl.status != WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
dec.private_impl.status,
wuffs_gif__status__string(dec.private_impl.status),
WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER,
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, 0, WUFFS_VERSION);
if (z != WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z), WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER,
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER));
return;
}
@@ -99,13 +97,11 @@ void test_basic_bad_sizeof_receiver() {
void test_basic_bad_wuffs_version() {
CHECK_FOCUS(__func__);
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec,
WUFFS_VERSION ^ 0x123456789ABC);
if (dec.private_impl.status != WUFFS_BASE__ERROR_BAD_WUFFS_VERSION) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
dec.private_impl.status,
wuffs_gif__status__string(dec.private_impl.status),
WUFFS_BASE__ERROR_BAD_WUFFS_VERSION,
wuffs_base__status z = wuffs_gif__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION ^ 0x123456789ABC);
if (z != WUFFS_BASE__ERROR_BAD_WUFFS_VERSION) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z), WUFFS_BASE__ERROR_BAD_WUFFS_VERSION,
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_WUFFS_VERSION));
return;
}
@@ -116,14 +112,14 @@ void test_basic_check_wuffs_version_not_called() {
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_base__status status =
wuffs_base__status z =
wuffs_gif__decoder__decode_image_config(&dec, &ic, src);
if (status != WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
status, wuffs_gif__status__string(status),
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED,
if (z != WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_MISSING) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z),
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_MISSING,
wuffs_gif__status__string(
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED));
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_MISSING));
}
}
@@ -198,14 +194,20 @@ void test_basic_status_used_package() {
void test_basic_sub_struct_initializer() {
CHECK_FOCUS(__func__);
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z));
return;
}
if (dec.private_impl.magic != WUFFS_BASE__MAGIC) {
FAIL("outer magic: got %u, want %u", dec.private_impl.magic,
WUFFS_BASE__MAGIC);
FAIL("outer magic: got %" PRIu32 ", want %" PRIu32 "",
dec.private_impl.magic, WUFFS_BASE__MAGIC);
return;
}
if (dec.private_impl.f_lzw.private_impl.magic != WUFFS_BASE__MAGIC) {
FAIL("inner magic: got %u, want %u",
FAIL("inner magic: got %" PRIu32 ", want %" PRIu32,
dec.private_impl.f_lzw.private_impl.magic, WUFFS_BASE__MAGIC);
return;
}
@@ -216,39 +218,42 @@ void test_basic_sub_struct_initializer() {
const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src) {
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
return wuffs_gif__status__string(z);
}
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
wuffs_base__status s =
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (s) {
return wuffs_gif__status__string(s);
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z) {
return wuffs_gif__status__string(z);
}
s = wuffs_base__pixel_buffer__set_from_slice(
z = wuffs_base__pixel_buffer__set_from_slice(
&pb, wuffs_base__image_config__pixel_config(&ic),
((wuffs_base__slice_u8){
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
if (s) {
return wuffs_gif__status__string(s);
if (z) {
return wuffs_gif__status__string(z);
}
while (true) {
s = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (s) {
if (s == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
z = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (z) {
if (z == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
break;
}
return wuffs_gif__status__string(s);
return wuffs_gif__status__string(z);
}
s = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
if (s) {
return wuffs_gif__status__string(s);
if (z) {
return wuffs_gif__status__string(z);
}
const char* msg = copy_to_io_buffer_from_pixel_buffer(
@@ -274,7 +279,13 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z));
return false;
}
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
@@ -282,11 +293,10 @@ bool do_test_wuffs_gif_decode(const char* filename,
{
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status status =
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (status != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status));
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z));
return false;
}
if (wuffs_base__image_config__pixel_format(&ic) !=
@@ -317,14 +327,14 @@ bool do_test_wuffs_gif_decode(const char* filename,
FAIL("first_frame_is_opaque: got false, want true");
return false;
}
status = wuffs_base__pixel_buffer__set_from_slice(
z = wuffs_base__pixel_buffer__set_from_slice(
&pb, wuffs_base__image_config__pixel_config(&ic),
((wuffs_base__slice_u8){
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
if (status) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(status));
if (z) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z));
return false;
}
}
@@ -338,16 +348,15 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
size_t old_ri = src.ri;
wuffs_base__status status =
wuffs_base__status z =
wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (status == WUFFS_BASE__STATUS_OK) {
if (z == WUFFS_BASE__STATUS_OK) {
break;
}
if (status != WUFFS_BASE__SUSPENSION_SHORT_READ) {
if (z != WUFFS_BASE__SUSPENSION_SHORT_READ) {
FAIL("decode_frame_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
status, wuffs_gif__status__string(status),
WUFFS_BASE__SUSPENSION_SHORT_READ,
z, wuffs_gif__status__string(z), WUFFS_BASE__SUSPENSION_SHORT_READ,
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ));
return false;
}
@@ -370,15 +379,15 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
size_t old_ri = src.ri;
wuffs_base__status status = wuffs_gif__decoder__decode_frame(
wuffs_base__status z = wuffs_gif__decoder__decode_frame(
&dec, &pb, 0, 0, src_reader, ((wuffs_base__slice_u8){}));
if (status == WUFFS_BASE__STATUS_OK) {
if (z == WUFFS_BASE__STATUS_OK) {
break;
}
if (status != WUFFS_BASE__SUSPENSION_SHORT_READ) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status), WUFFS_BASE__SUSPENSION_SHORT_READ,
if (z != WUFFS_BASE__SUSPENSION_SHORT_READ) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z), WUFFS_BASE__SUSPENSION_SHORT_READ,
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ));
return false;
}
@@ -442,12 +451,11 @@ bool do_test_wuffs_gif_decode(const char* filename,
return false;
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status status = wuffs_gif__decoder__decode_frame(
wuffs_base__status z = wuffs_gif__decoder__decode_frame(
&dec, &pb, 0, 0, src_reader, ((wuffs_base__slice_u8){}));
if (status != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status),
WUFFS_BASE__SUSPENSION_END_OF_DATA,
if (z != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z), WUFFS_BASE__SUSPENSION_END_OF_DATA,
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_END_OF_DATA));
return false;
}
@@ -471,24 +479,28 @@ void test_wuffs_gif_call_sequence() {
}
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z));
return;
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status status =
wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
if (status != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
status, wuffs_gif__status__string(status), WUFFS_BASE__STATUS_OK,
z = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
if (z != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z), WUFFS_BASE__STATUS_OK,
wuffs_gif__status__string(WUFFS_BASE__STATUS_OK));
return;
}
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
if (status != WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
status, wuffs_gif__status__string(status),
WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE,
z = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
if (z != WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z), WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE,
wuffs_gif__status__string(WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE));
return;
}
@@ -506,17 +518,22 @@ bool do_test_wuffs_gif_decode_animated(
}
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z));
return false;
}
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status status =
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (status != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status));
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z));
return false;
}
@@ -525,32 +542,32 @@ bool do_test_wuffs_gif_decode_animated(
wuffs_base__image_config__num_loops(&ic), want_num_loops);
return false;
}
status = wuffs_base__pixel_buffer__set_from_slice(
z = wuffs_base__pixel_buffer__set_from_slice(
&pb, wuffs_base__image_config__pixel_config(&ic),
((wuffs_base__slice_u8){
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
if (status) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(status));
if (z) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z));
return false;
}
uint32_t i;
for (i = 0; i < want_num_frames; i++) {
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (status != WUFFS_BASE__STATUS_OK) {
FAIL("decode_frame_config #%" PRIu32 ": got %" PRIi32 " (%s)", i, status,
wuffs_gif__status__string(status));
z = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (z != WUFFS_BASE__STATUS_OK) {
FAIL("decode_frame_config #%" PRIu32 ": got %" PRIi32 " (%s)", i, z,
wuffs_gif__status__string(z));
return false;
}
status = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
if (status != WUFFS_BASE__STATUS_OK) {
FAIL("decode_frame #%" PRIu32 ": got %" PRIi32 " (%s)", i, status,
wuffs_gif__status__string(status));
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
if (z != WUFFS_BASE__STATUS_OK) {
FAIL("decode_frame #%" PRIu32 ": got %" PRIi32 " (%s)", i, z,
wuffs_gif__status__string(z));
return false;
}
@@ -570,11 +587,11 @@ bool do_test_wuffs_gif_decode_animated(
}
// There should be no more frames.
status = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
if (status != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status), WUFFS_BASE__SUSPENSION_END_OF_DATA,
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
if (z != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z), WUFFS_BASE__SUSPENSION_END_OF_DATA,
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_END_OF_DATA));
return false;
}
@@ -627,13 +644,18 @@ void test_wuffs_gif_decode_frame_out_of_bounds() {
}
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z));
return;
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status s =
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (s) {
FAIL("decode_image_config: %s", wuffs_gif__status__string(s));
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z) {
FAIL("decode_image_config: %s", wuffs_gif__status__string(z));
return;
}
@@ -697,15 +719,20 @@ void test_wuffs_gif_decode_input_is_a_png() {
}
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z));
return;
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status status =
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (status != WUFFS_GIF__ERROR_BAD_HEADER) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
status, wuffs_gif__status__string(status), WUFFS_GIF__ERROR_BAD_HEADER,
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z != WUFFS_GIF__ERROR_BAD_HEADER) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z), WUFFS_GIF__ERROR_BAD_HEADER,
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_HEADER));
return;
}
@@ -720,14 +747,19 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
}
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_gif__status__string(z));
return false;
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
if (!frame_config) {
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__status z =
wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: %s", wuffs_gif__status__string(z));
return false;
+26 -16
View File
@@ -86,7 +86,11 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
return wuffs_gzip__status__string(z);
}
while (true) {
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
@@ -98,17 +102,17 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
set_reader_limit(&src_reader, rlimit);
}
wuffs_base__status s =
wuffs_base__status z =
wuffs_gzip__decoder__decode(&dec, dst_writer, src_reader);
if (s == WUFFS_BASE__STATUS_OK) {
if (z == WUFFS_BASE__STATUS_OK) {
return NULL;
}
if ((wlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
if ((wlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
continue;
}
return wuffs_gzip__status__string(s);
return wuffs_gzip__status__string(z);
}
}
@@ -134,7 +138,13 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
int end_limit;
for (end_limit = 0; end_limit < 10; end_limit++) {
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z = wuffs_gzip__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_gzip__status__string(z));
return false;
}
wuffs_gzip__decoder__set_ignore_checksum(&dec, ignore_checksum);
got.wi = 0;
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
@@ -145,7 +155,7 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
int i;
for (i = 0; i < 2; i++) {
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status want = 0;
wuffs_base__status want_z = 0;
if (i == 0) {
if (end_limit == 0) {
continue;
@@ -155,19 +165,19 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
return false;
}
set_reader_limit(&src_reader, src.wi - (uint64_t)(end_limit));
want = WUFFS_BASE__SUSPENSION_SHORT_READ;
want_z = WUFFS_BASE__SUSPENSION_SHORT_READ;
} else {
want = (bad_checksum && !ignore_checksum)
? WUFFS_GZIP__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
want_z = (bad_checksum && !ignore_checksum)
? WUFFS_GZIP__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
}
wuffs_base__status status =
wuffs_base__status got_z =
wuffs_gzip__decoder__decode(&dec, got_writer, src_reader);
if (status != want) {
if (got_z != want_z) {
FAIL("end_limit=%d: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
end_limit, status, wuffs_gzip__status__string(status), want,
wuffs_gzip__status__string(want));
end_limit, got_z, wuffs_gzip__status__string(got_z), want_z,
wuffs_gzip__status__string(want_z));
return false;
}
}
+22 -13
View File
@@ -101,7 +101,13 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
}
wuffs_lzw__decoder dec = ((wuffs_lzw__decoder){});
wuffs_lzw__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_lzw__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_lzw__status__string(z));
return false;
}
wuffs_lzw__decoder__set_literal_width(&dec, literal_width);
int num_iters = 0;
while (true) {
@@ -117,21 +123,19 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
size_t old_wi = got.wi;
size_t old_ri = src.ri;
wuffs_base__status status =
wuffs_lzw__decoder__decode(&dec, got_writer, src_reader);
if (status == WUFFS_BASE__STATUS_OK) {
z = wuffs_lzw__decoder__decode(&dec, got_writer, src_reader);
if (z == WUFFS_BASE__STATUS_OK) {
if (src.ri != src.wi) {
FAIL("decode returned \"ok\" but src was not exhausted");
return false;
}
break;
}
if ((status != WUFFS_BASE__SUSPENSION_SHORT_READ) &&
(status != WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
if ((z != WUFFS_BASE__SUSPENSION_SHORT_READ) &&
(z != WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
FAIL("decode: got %" PRIi32 " (%s), want %" PRIi32 " (%s) or %" PRIi32
" (%s)",
status, wuffs_lzw__status__string(status),
WUFFS_BASE__SUSPENSION_SHORT_READ,
z, wuffs_lzw__status__string(z), WUFFS_BASE__SUSPENSION_SHORT_READ,
wuffs_lzw__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ),
WUFFS_BASE__SUSPENSION_SHORT_WRITE,
wuffs_lzw__status__string(WUFFS_BASE__SUSPENSION_SHORT_WRITE));
@@ -228,11 +232,16 @@ bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t iters_unscaled) {
dst.wi = 0;
src.ri = 1; // Skip the literal width.
wuffs_lzw__decoder dec = ((wuffs_lzw__decoder){});
wuffs_lzw__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status s =
wuffs_lzw__decoder__decode(&dec, dst_writer, src_reader);
if (s) {
FAIL("decode: %" PRIi32 " (%s)", s, wuffs_lzw__status__string(s));
wuffs_base__status z = wuffs_lzw__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_lzw__status__string(z));
return false;
}
z = wuffs_lzw__decoder__decode(&dec, dst_writer, src_reader);
if (z) {
FAIL("decode: %" PRIi32 " (%s)", z, wuffs_lzw__status__string(z));
return false;
}
n_bytes += dst.wi;
+26 -16
View File
@@ -86,7 +86,11 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z =
wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
return wuffs_zlib__status__string(z);
}
while (true) {
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
@@ -98,17 +102,17 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
set_reader_limit(&src_reader, rlimit);
}
wuffs_base__status s =
wuffs_base__status z =
wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
if (s == WUFFS_BASE__STATUS_OK) {
if (z == WUFFS_BASE__STATUS_OK) {
return NULL;
}
if ((wlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
if ((wlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
continue;
}
return wuffs_zlib__status__string(s);
return wuffs_zlib__status__string(z);
}
}
@@ -133,7 +137,13 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
int end_limit;
for (end_limit = 0; end_limit < 10; end_limit++) {
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__status z = wuffs_zlib__decoder__check_wuffs_version(
&dec, sizeof dec, WUFFS_VERSION);
if (z) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z,
wuffs_zlib__status__string(z));
return false;
}
wuffs_zlib__decoder__set_ignore_checksum(&dec, ignore_checksum);
got.wi = 0;
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
@@ -144,7 +154,7 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
int i;
for (i = 0; i < 2; i++) {
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status want = 0;
wuffs_base__status want_z = 0;
if (i == 0) {
if (end_limit == 0) {
continue;
@@ -154,19 +164,19 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
return false;
}
set_reader_limit(&src_reader, src.wi - (uint64_t)(end_limit));
want = WUFFS_BASE__SUSPENSION_SHORT_READ;
want_z = WUFFS_BASE__SUSPENSION_SHORT_READ;
} else {
want = (bad_checksum && !ignore_checksum)
? WUFFS_ZLIB__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
want_z = (bad_checksum && !ignore_checksum)
? WUFFS_ZLIB__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
}
wuffs_base__status status =
wuffs_base__status got_z =
wuffs_zlib__decoder__decode(&dec, got_writer, src_reader);
if (status != want) {
if (got_z != want_z) {
FAIL("end_limit=%d: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
end_limit, status, wuffs_zlib__status__string(status), want,
wuffs_zlib__status__string(want));
end_limit, got_z, wuffs_zlib__status__string(got_z), want_z,
wuffs_zlib__status__string(want_z));
return false;
}
}