Make the status type a struct, not an int32_t

This commit is contained in:
Nigel Tao committed 2018-08-11 13:27:29 +10:00
1 parent 9c0b2d2f5c
commit 2a32a86a6c
26 files changed
+791 -668

No files matched your search

+8 -8
View File
@@ -128,9 +128,9 @@ void test_wuffs_adler32_golden() {
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_adler32__status__string(z.code));
return;
}
@@ -193,9 +193,9 @@ void test_wuffs_adler32_pi() {
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_adler32__status__string(z.code));
return;
}
uint32_t got =
@@ -226,8 +226,8 @@ const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
wuffs_adler32__hasher checksum = ((wuffs_adler32__hasher){});
wuffs_base__status z = wuffs_adler32__hasher__check_wuffs_version(
&checksum, sizeof checksum, WUFFS_VERSION);
if (z) {
return wuffs_adler32__status__string(z);
if (z.code) {
return wuffs_adler32__status__string(z.code);
}
global_wuffs_adler32_unused_u32 =
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
+8 -8
View File
@@ -128,9 +128,9 @@ void test_wuffs_crc32_ieee_golden() {
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_crc32__status__string(z.code));
return;
}
@@ -193,9 +193,9 @@ void test_wuffs_crc32_ieee_pi() {
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_crc32__status__string(z.code));
return;
}
uint32_t got = wuffs_crc32__ieee_hasher__update(
@@ -226,8 +226,8 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
wuffs_crc32__ieee_hasher checksum = ((wuffs_crc32__ieee_hasher){});
wuffs_base__status z = wuffs_crc32__ieee_hasher__check_wuffs_version(
&checksum, sizeof checksum, WUFFS_VERSION);
if (z) {
return wuffs_crc32__status__string(z);
if (z.code) {
return wuffs_crc32__status__string(z.code);
}
global_wuffs_crc32_unused_u32 =
wuffs_crc32__ieee_hasher__update(&checksum, ((wuffs_base__slice_u8){
+34 -31
View File
@@ -133,9 +133,9 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
return false;
}
@@ -152,14 +152,14 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
wuffs_base__status z =
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
if (z == WUFFS_BASE__STATUS_OK) {
if (z.code == WUFFS_BASE__STATUS_OK) {
return NULL;
}
if ((wlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
if ((wlimit && (z.code == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z.code == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
continue;
}
return wuffs_deflate__status__string(z);
return wuffs_deflate__status__string(z.code);
}
}
@@ -248,9 +248,9 @@ void test_wuffs_deflate_decode_split_src() {
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
return;
}
@@ -266,16 +266,17 @@ void test_wuffs_deflate_decode_split_src() {
wuffs_base__status z1 =
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
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,
if (z0.code != WUFFS_BASE__SUSPENSION_SHORT_READ) {
FAIL("i=%d: z0: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, z0.code,
wuffs_deflate__status__string(z0.code),
WUFFS_BASE__SUSPENSION_SHORT_READ,
wuffs_deflate__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ));
return;
}
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,
if (z1.code != WUFFS_BASE__STATUS_OK) {
FAIL("i=%d: z1: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, z1.code,
wuffs_deflate__status__string(z1.code), WUFFS_BASE__STATUS_OK,
wuffs_deflate__status__string(WUFFS_BASE__STATUS_OK));
return;
}
@@ -295,7 +296,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_z) {
int32_t want_z_code) {
src->ri = gt->src_offset0;
src->wi = gt->src_offset1;
got->ri = 0;
@@ -310,11 +311,12 @@ bool do_test_wuffs_deflate_history(int i,
wuffs_base__status got_z =
wuffs_deflate__decoder__decode(dec, dst_writer, src_reader);
if (got_z != want_z) {
if (got_z.code != want_z_code) {
FAIL("i=%d: starting_history_index=0x%04" PRIX32
": decode status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
i, starting_history_index, got_z, wuffs_deflate__status__string(got_z),
want_z, wuffs_deflate__status__string(want_z));
i, starting_history_index, got_z.code,
wuffs_deflate__status__string(got_z.code), want_z_code,
wuffs_deflate__status__string(want_z_code));
return false;
}
return true;
@@ -344,9 +346,9 @@ void test_wuffs_deflate_history_full() {
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
return;
}
@@ -416,9 +418,9 @@ void test_wuffs_deflate_history_partial() {
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
return;
}
@@ -505,9 +507,9 @@ void test_wuffs_deflate_table_redirect() {
wuffs_deflate__decoder dec = ((wuffs_deflate__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
return;
}
@@ -529,8 +531,9 @@ void test_wuffs_deflate_table_redirect() {
dec.private_impl.f_code_lengths[n++] = 13;
z = wuffs_deflate__decoder__init_huff(&dec, 0, 0, n, 257);
if (z) {
FAIL("init_huff: %" PRIi32 " (%s)", z, wuffs_deflate__status__string(z));
if (z.code) {
FAIL("init_huff: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
return;
}
+106 -96
View File
@@ -74,9 +74,10 @@ void test_basic_bad_receiver() {
wuffs_base__io_reader src = ((wuffs_base__io_reader){});
wuffs_base__status z =
wuffs_gif__decoder__decode_image_config(NULL, &ic, src);
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,
if (z.code != WUFFS_BASE__ERROR_BAD_RECEIVER) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
z.code, wuffs_gif__status__string(z.code),
WUFFS_BASE__ERROR_BAD_RECEIVER,
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_RECEIVER));
}
}
@@ -86,9 +87,10 @@ void test_basic_bad_sizeof_receiver() {
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
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,
if (z.code != WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
z.code, wuffs_gif__status__string(z.code),
WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER,
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_SIZEOF_RECEIVER));
return;
}
@@ -99,9 +101,10 @@ void test_basic_bad_wuffs_version() {
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
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,
if (z.code != WUFFS_BASE__ERROR_BAD_WUFFS_VERSION) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
z.code, wuffs_gif__status__string(z.code),
WUFFS_BASE__ERROR_BAD_WUFFS_VERSION,
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_WUFFS_VERSION));
return;
}
@@ -114,9 +117,9 @@ void test_basic_check_wuffs_version_not_called() {
wuffs_base__io_reader src = ((wuffs_base__io_reader){});
wuffs_base__status z =
wuffs_gif__decoder__decode_image_config(&dec, &ic, src);
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),
if (z.code != WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_MISSING) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
z.code, wuffs_gif__status__string(z.code),
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_MISSING,
wuffs_gif__status__string(
WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_MISSING));
@@ -125,19 +128,23 @@ void test_basic_check_wuffs_version_not_called() {
void test_basic_status_is_error() {
CHECK_FOCUS(__func__);
if (wuffs_base__status__is_error(WUFFS_BASE__STATUS_OK)) {
if (wuffs_base__status__is_error(
WUFFS_BASE__MAKE_STATUS(WUFFS_BASE__STATUS_OK))) {
FAIL("is_error(OK) returned true");
return;
}
if (!wuffs_base__status__is_error(WUFFS_BASE__ERROR_BAD_WUFFS_VERSION)) {
if (!wuffs_base__status__is_error(
WUFFS_BASE__MAKE_STATUS(WUFFS_BASE__ERROR_BAD_WUFFS_VERSION))) {
FAIL("is_error(BAD_WUFFS_VERSION) returned false");
return;
}
if (wuffs_base__status__is_error(WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
if (wuffs_base__status__is_error(
WUFFS_BASE__MAKE_STATUS(WUFFS_BASE__SUSPENSION_SHORT_WRITE))) {
FAIL("is_error(SHORT_WRITE) returned true");
return;
}
if (!wuffs_base__status__is_error(WUFFS_GIF__ERROR_BAD_HEADER)) {
if (!wuffs_base__status__is_error(
WUFFS_BASE__MAKE_STATUS(WUFFS_GIF__ERROR_BAD_HEADER))) {
FAIL("is_error(BAD_HEADER) returned false");
return;
}
@@ -196,9 +203,9 @@ void test_basic_sub_struct_initializer() {
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
return;
}
if (dec.private_impl.magic != WUFFS_BASE__MAGIC) {
@@ -220,16 +227,16 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
wuffs_base__status z =
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
return wuffs_gif__status__string(z);
if (z.code) {
return wuffs_gif__status__string(z.code);
}
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);
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z) {
return wuffs_gif__status__string(z);
if (z.code) {
return wuffs_gif__status__string(z.code);
}
z = wuffs_base__pixel_buffer__set_from_slice(
&pb, wuffs_base__image_config__pixel_config(&ic),
@@ -237,23 +244,23 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
if (z) {
return wuffs_gif__status__string(z);
if (z.code) {
return wuffs_gif__status__string(z.code);
}
while (true) {
z = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (z) {
if (z == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
if (z.code) {
if (z.code == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
break;
}
return wuffs_gif__status__string(z);
return wuffs_gif__status__string(z.code);
}
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
if (z) {
return wuffs_gif__status__string(z);
if (z.code) {
return wuffs_gif__status__string(z.code);
}
const char* msg = copy_to_io_buffer_from_pixel_buffer(
@@ -281,9 +288,9 @@ bool do_test_wuffs_gif_decode(const char* filename,
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
return false;
}
@@ -294,9 +301,9 @@ 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);
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));
if (z.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
return false;
}
if (wuffs_base__image_config__pixel_format(&ic) !=
@@ -333,8 +340,8 @@ bool do_test_wuffs_gif_decode(const char* filename,
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
if (z) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z));
if (z.code) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z.code));
return false;
}
}
@@ -351,12 +358,13 @@ bool do_test_wuffs_gif_decode(const char* filename,
wuffs_base__status z =
wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (z == WUFFS_BASE__STATUS_OK) {
if (z.code == WUFFS_BASE__STATUS_OK) {
break;
}
if (z != WUFFS_BASE__SUSPENSION_SHORT_READ) {
if (z.code != WUFFS_BASE__SUSPENSION_SHORT_READ) {
FAIL("decode_frame_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
z, wuffs_gif__status__string(z), WUFFS_BASE__SUSPENSION_SHORT_READ,
z.code, wuffs_gif__status__string(z.code),
WUFFS_BASE__SUSPENSION_SHORT_READ,
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ));
return false;
}
@@ -382,12 +390,12 @@ bool do_test_wuffs_gif_decode(const char* filename,
wuffs_base__status z = wuffs_gif__decoder__decode_frame(
&dec, &pb, 0, 0, src_reader, ((wuffs_base__slice_u8){}));
if (z == WUFFS_BASE__STATUS_OK) {
if (z.code == WUFFS_BASE__STATUS_OK) {
break;
}
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,
if (z.code != WUFFS_BASE__SUSPENSION_SHORT_READ) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code), WUFFS_BASE__SUSPENSION_SHORT_READ,
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_SHORT_READ));
return false;
}
@@ -453,9 +461,10 @@ bool do_test_wuffs_gif_decode(const char* filename,
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__status 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,
if (z.code != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code),
WUFFS_BASE__SUSPENSION_END_OF_DATA,
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_END_OF_DATA));
return false;
}
@@ -481,26 +490,27 @@ void test_wuffs_gif_call_sequence() {
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
return;
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
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,
if (z.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
z.code, wuffs_gif__status__string(z.code), WUFFS_BASE__STATUS_OK,
wuffs_gif__status__string(WUFFS_BASE__STATUS_OK));
return;
}
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,
if (z.code != WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
z.code, wuffs_gif__status__string(z.code),
WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE,
wuffs_gif__status__string(WUFFS_BASE__ERROR_INVALID_CALL_SEQUENCE));
return;
}
@@ -520,9 +530,9 @@ bool do_test_wuffs_gif_decode_animated(
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
return false;
}
@@ -531,9 +541,9 @@ bool do_test_wuffs_gif_decode_animated(
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
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));
if (z.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
return false;
}
@@ -548,8 +558,8 @@ bool do_test_wuffs_gif_decode_animated(
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
if (z) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z));
if (z.code) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z.code));
return false;
}
@@ -557,17 +567,17 @@ bool do_test_wuffs_gif_decode_animated(
for (i = 0; i < want_num_frames; i++) {
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
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));
if (z.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_frame_config #%" PRIu32 ": got %" PRIi32 " (%s)", i, z.code,
wuffs_gif__status__string(z.code));
return false;
}
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));
if (z.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_frame #%" PRIu32 ": got %" PRIi32 " (%s)", i, z.code,
wuffs_gif__status__string(z.code));
return false;
}
@@ -589,9 +599,9 @@ bool do_test_wuffs_gif_decode_animated(
// There should be no more frames.
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,
if (z.code != WUFFS_BASE__SUSPENSION_END_OF_DATA) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code), WUFFS_BASE__SUSPENSION_END_OF_DATA,
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_END_OF_DATA));
return false;
}
@@ -646,16 +656,16 @@ void test_wuffs_gif_decode_frame_out_of_bounds() {
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
return;
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z) {
FAIL("decode_image_config: %s", wuffs_gif__status__string(z));
if (z.code) {
FAIL("decode_image_config: %s", wuffs_gif__status__string(z.code));
return;
}
@@ -721,18 +731,18 @@ void test_wuffs_gif_decode_input_is_a_png() {
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
return;
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
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,
if (z.code != WUFFS_GIF__ERROR_BAD_HEADER) {
FAIL("decode_image_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
z.code, wuffs_gif__status__string(z.code), WUFFS_GIF__ERROR_BAD_HEADER,
wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_HEADER));
return;
}
@@ -749,9 +759,9 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
wuffs_gif__decoder dec = ((wuffs_gif__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
return false;
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
@@ -760,8 +770,8 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
if (!frame_config) {
wuffs_base__image_config ic = ((wuffs_base__image_config){});
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));
if (z.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: %s", wuffs_gif__status__string(z.code));
return false;
}
@@ -771,8 +781,8 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
if (z) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z));
if (z.code) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z.code));
return false;
}
}
@@ -794,7 +804,7 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
break;
}
wuffs_base__status z = 0;
wuffs_base__status z = ((wuffs_base__status){});
if (frame_config) {
z = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader);
} else {
@@ -802,14 +812,14 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
((wuffs_base__slice_u8){}));
}
if (z == WUFFS_BASE__STATUS_OK) {
if (z.code == WUFFS_BASE__STATUS_OK) {
want++;
continue;
} else if (z == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
} else if (z.code == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
end_of_data = true;
continue;
}
FAIL("%s: %s", method, wuffs_gif__status__string(z));
FAIL("%s: %s", method, wuffs_gif__status__string(z.code));
return false;
}
+17 -17
View File
@@ -88,8 +88,8 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
wuffs_base__status z =
wuffs_gzip__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
return wuffs_gzip__status__string(z);
if (z.code) {
return wuffs_gzip__status__string(z.code);
}
while (true) {
@@ -105,14 +105,14 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
wuffs_base__status z =
wuffs_gzip__decoder__decode(&dec, dst_writer, src_reader);
if (z == WUFFS_BASE__STATUS_OK) {
if (z.code == WUFFS_BASE__STATUS_OK) {
return NULL;
}
if ((wlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
if ((wlimit && (z.code == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z.code == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
continue;
}
return wuffs_gzip__status__string(z);
return wuffs_gzip__status__string(z.code);
}
}
@@ -140,9 +140,9 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
wuffs_gzip__decoder dec = ((wuffs_gzip__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gzip__status__string(z.code));
return false;
}
wuffs_gzip__decoder__set_ignore_checksum(&dec, ignore_checksum);
@@ -155,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_z = 0;
int32_t want_z_code = 0;
if (i == 0) {
if (end_limit == 0) {
continue;
@@ -165,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_z = WUFFS_BASE__SUSPENSION_SHORT_READ;
want_z_code = WUFFS_BASE__SUSPENSION_SHORT_READ;
} else {
want_z = (bad_checksum && !ignore_checksum)
? WUFFS_GZIP__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
want_z_code = (bad_checksum && !ignore_checksum)
? WUFFS_GZIP__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
}
wuffs_base__status got_z =
wuffs_gzip__decoder__decode(&dec, got_writer, src_reader);
if (got_z != want_z) {
if (got_z.code != want_z_code) {
FAIL("end_limit=%d: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
end_limit, got_z, wuffs_gzip__status__string(got_z), want_z,
wuffs_gzip__status__string(want_z));
end_limit, got_z.code, wuffs_gzip__status__string(got_z.code),
want_z_code, wuffs_gzip__status__string(want_z_code));
return false;
}
}
+14 -12
View File
@@ -103,9 +103,9 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
wuffs_lzw__decoder dec = ((wuffs_lzw__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_lzw__status__string(z.code));
return false;
}
wuffs_lzw__decoder__set_literal_width(&dec, literal_width);
@@ -124,18 +124,19 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
size_t old_ri = src.ri;
z = wuffs_lzw__decoder__decode(&dec, got_writer, src_reader);
if (z == WUFFS_BASE__STATUS_OK) {
if (z.code == WUFFS_BASE__STATUS_OK) {
if (src.ri != src.wi) {
FAIL("decode returned \"ok\" but src was not exhausted");
return false;
}
break;
}
if ((z != WUFFS_BASE__SUSPENSION_SHORT_READ) &&
(z != WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
if ((z.code != WUFFS_BASE__SUSPENSION_SHORT_READ) &&
(z.code != WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
FAIL("decode: got %" PRIi32 " (%s), want %" PRIi32 " (%s) or %" PRIi32
" (%s)",
z, wuffs_lzw__status__string(z), WUFFS_BASE__SUSPENSION_SHORT_READ,
z.code, wuffs_lzw__status__string(z.code),
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));
@@ -234,14 +235,15 @@ bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t iters_unscaled) {
wuffs_lzw__decoder dec = ((wuffs_lzw__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_lzw__status__string(z.code));
return false;
}
z = wuffs_lzw__decoder__decode(&dec, dst_writer, src_reader);
if (z) {
FAIL("decode: %" PRIi32 " (%s)", z, wuffs_lzw__status__string(z));
if (z.code) {
FAIL("decode: %" PRIi32 " (%s)", z.code,
wuffs_lzw__status__string(z.code));
return false;
}
n_bytes += dst.wi;
+17 -17
View File
@@ -88,8 +88,8 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
wuffs_base__status z =
wuffs_zlib__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
if (z) {
return wuffs_zlib__status__string(z);
if (z.code) {
return wuffs_zlib__status__string(z.code);
}
while (true) {
@@ -105,14 +105,14 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__status z =
wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
if (z == WUFFS_BASE__STATUS_OK) {
if (z.code == WUFFS_BASE__STATUS_OK) {
return NULL;
}
if ((wlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
if ((wlimit && (z.code == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z.code == WUFFS_BASE__SUSPENSION_SHORT_READ))) {
continue;
}
return wuffs_zlib__status__string(z);
return wuffs_zlib__status__string(z.code);
}
}
@@ -139,9 +139,9 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
wuffs_zlib__decoder dec = ((wuffs_zlib__decoder){});
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));
if (z.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_zlib__status__string(z.code));
return false;
}
wuffs_zlib__decoder__set_ignore_checksum(&dec, ignore_checksum);
@@ -154,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_z = 0;
int32_t want_z_code = 0;
if (i == 0) {
if (end_limit == 0) {
continue;
@@ -164,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_z = WUFFS_BASE__SUSPENSION_SHORT_READ;
want_z_code = WUFFS_BASE__SUSPENSION_SHORT_READ;
} else {
want_z = (bad_checksum && !ignore_checksum)
? WUFFS_ZLIB__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
want_z_code = (bad_checksum && !ignore_checksum)
? WUFFS_ZLIB__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
}
wuffs_base__status got_z =
wuffs_zlib__decoder__decode(&dec, got_writer, src_reader);
if (got_z != want_z) {
if (got_z.code != want_z_code) {
FAIL("end_limit=%d: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
end_limit, got_z, wuffs_zlib__status__string(got_z), want_z,
wuffs_zlib__status__string(want_z));
end_limit, got_z.code, wuffs_zlib__status__string(got_z.code),
want_z_code, wuffs_zlib__status__string(want_z_code));
return false;
}
}