Make the status type a const char*, not a struct

This commit is contained in:
Nigel Tao committed 2018-08-12 16:05:14 +10:00
1 parent e0311e3bb2
commit b840c80040
24 files changed
+624 -815

No files matched your search

+6 -8
View File
@@ -128,9 +128,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_adler32__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return;
}
@@ -193,9 +192,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_adler32__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return;
}
uint32_t got =
@@ -226,8 +224,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.code) {
return wuffs_adler32__status__string(z.code);
if (z) {
return z;
}
global_wuffs_adler32_unused_u32 =
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
+6 -8
View File
@@ -128,9 +128,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_crc32__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return;
}
@@ -193,9 +192,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_crc32__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return;
}
uint32_t got = wuffs_crc32__ieee_hasher__update(
@@ -226,8 +224,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.code) {
return wuffs_crc32__status__string(z.code);
if (z) {
return z;
}
global_wuffs_crc32_unused_u32 =
wuffs_crc32__ieee_hasher__update(&checksum, ((wuffs_base__slice_u8){
+26 -42
View File
@@ -133,9 +133,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return false;
}
@@ -152,14 +151,11 @@ 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.code == WUFFS_BASE__STATUS_OK) {
return NULL;
}
if ((wlimit && (z.code == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z.code == 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(z.code);
return z;
}
}
@@ -248,9 +244,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return;
}
@@ -266,18 +261,14 @@ void test_wuffs_deflate_decode_split_src() {
wuffs_base__status z1 =
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
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));
if (z0 != wuffs_base__suspension__short_read) {
FAIL("i=%d: z0: got \"%s\", want \"%s\"", i, z0,
wuffs_base__suspension__short_read);
return;
}
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));
if (z1) {
FAIL("i=%d: z1: got \"%s\"", i, z1);
return;
}
@@ -296,7 +287,7 @@ bool do_test_wuffs_deflate_history(int i,
wuffs_deflate__decoder* dec,
uint32_t starting_history_index,
uint64_t limit,
int32_t want_z_code) {
const char* want_z) {
src->ri = gt->src_offset0;
src->wi = gt->src_offset1;
got->ri = 0;
@@ -311,12 +302,10 @@ 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.code != want_z_code) {
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_z.code,
wuffs_deflate__status__string(got_z.code), want_z_code,
wuffs_deflate__status__string(want_z_code));
": decode status: got \"%s\", want \"%s\"",
i, starting_history_index, got_z, want_z);
return false;
}
return true;
@@ -346,16 +335,14 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return;
}
if (!do_test_wuffs_deflate_history(
i, gt, &src, &got, &dec, 0, want.wi + i,
i >= 0 ? WUFFS_BASE__STATUS_OK
: WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
i >= 0 ? NULL : wuffs_base__suspension__short_write)) {
return;
}
@@ -418,15 +405,14 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return;
}
if (!do_test_wuffs_deflate_history(i, gt, &src, &got, &dec,
starting_history_index, fragment_length,
WUFFS_BASE__SUSPENSION_SHORT_WRITE)) {
wuffs_base__suspension__short_write)) {
return;
}
@@ -507,9 +493,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return;
}
@@ -531,9 +516,8 @@ 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.code) {
FAIL("init_huff: %" PRIi32 " (%s)", z.code,
wuffs_deflate__status__string(z.code));
if (z) {
FAIL("init_huff: \"%s\"", z);
return;
}
+90 -139
View File
@@ -74,11 +74,9 @@ 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.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));
if (z != wuffs_base__error__bad_receiver) {
FAIL("decode_image_config: got \"%s\", want \"%s\"", z,
wuffs_base__error__bad_receiver);
}
}
@@ -87,11 +85,9 @@ 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.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));
if (z != wuffs_base__error__bad_sizeof_receiver) {
FAIL("decode_image_config: got \"%s\", want \"%s\"", z,
wuffs_base__error__bad_sizeof_receiver);
return;
}
}
@@ -101,11 +97,9 @@ 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.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));
if (z != wuffs_base__error__bad_wuffs_version) {
FAIL("decode_image_config: got \"%s\", want \"%s\"", z,
wuffs_base__error__bad_wuffs_version);
return;
}
}
@@ -117,34 +111,27 @@ 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.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));
if (z != wuffs_base__error__check_wuffs_version_missing) {
FAIL("decode_image_config: got \"%s\", want \"%s\"", z,
wuffs_base__error__check_wuffs_version_missing);
}
}
void test_basic_status_is_error() {
CHECK_FOCUS(__func__);
if (wuffs_base__status__is_error(
WUFFS_BASE__MAKE_STATUS(WUFFS_BASE__STATUS_OK))) {
FAIL("is_error(OK) returned true");
if (wuffs_base__status__is_error(NULL)) {
FAIL("is_error(NULL) returned true");
return;
}
if (!wuffs_base__status__is_error(
WUFFS_BASE__MAKE_STATUS(WUFFS_BASE__ERROR_BAD_WUFFS_VERSION))) {
if (!wuffs_base__status__is_error(wuffs_base__error__bad_wuffs_version)) {
FAIL("is_error(BAD_WUFFS_VERSION) returned false");
return;
}
if (wuffs_base__status__is_error(
WUFFS_BASE__MAKE_STATUS(WUFFS_BASE__SUSPENSION_SHORT_WRITE))) {
if (wuffs_base__status__is_error(wuffs_base__suspension__short_write)) {
FAIL("is_error(SHORT_WRITE) returned true");
return;
}
if (!wuffs_base__status__is_error(
WUFFS_BASE__MAKE_STATUS(WUFFS_GIF__ERROR_BAD_HEADER))) {
if (!wuffs_base__status__is_error(wuffs_gif__error__bad_header)) {
FAIL("is_error(BAD_HEADER) returned false");
return;
}
@@ -152,45 +139,31 @@ void test_basic_status_is_error() {
void test_basic_status_strings() {
CHECK_FOCUS(__func__);
const char* s0 = wuffs_gif__status__string(WUFFS_BASE__STATUS_OK);
const char* t0 = "+base: ok";
if (strcmp(s0, t0)) {
FAIL("got \"%s\", want \"%s\"", s0, t0);
return;
}
const char* s1 =
wuffs_gif__status__string(WUFFS_BASE__ERROR_BAD_WUFFS_VERSION);
const char* s1 = wuffs_base__error__bad_wuffs_version;
const char* t1 = "?base: bad wuffs version";
if (strcmp(s1, t1)) {
FAIL("got \"%s\", want \"%s\"", s1, t1);
return;
}
const char* s2 =
wuffs_gif__status__string(WUFFS_BASE__SUSPENSION_SHORT_WRITE);
const char* s2 = wuffs_base__suspension__short_write;
const char* t2 = "$base: short write";
if (strcmp(s2, t2)) {
FAIL("got \"%s\", want \"%s\"", s2, t2);
return;
}
const char* s3 = wuffs_gif__status__string(WUFFS_GIF__ERROR_BAD_HEADER);
const char* s3 = wuffs_gif__error__bad_header;
const char* t3 = "?gif: bad header";
if (strcmp(s3, t3)) {
FAIL("got \"%s\", want \"%s\"", s3, t3);
return;
}
const char* s4 = wuffs_gif__status__string(-254);
const char* t4 = "unknown status";
if (strcmp(s4, t4)) {
FAIL("got \"%s\", want \"%s\"", s4, t4);
return;
}
}
void test_basic_status_used_package() {
CHECK_FOCUS(__func__);
// The function call here is from "std/gif" but the argument is from
// "std/lzw". The former package depends on the latter.
const char* s0 = wuffs_gif__status__string(WUFFS_LZW__ERROR_BAD_CODE);
const char* s0 = wuffs_lzw__error__bad_code;
const char* t0 = "?lzw: bad code";
if (strcmp(s0, t0)) {
FAIL("got \"%s\", want \"%s\"", s0, t0);
@@ -203,9 +176,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return;
}
if (dec.private_impl.magic != WUFFS_BASE__MAGIC) {
@@ -227,16 +199,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.code) {
return wuffs_gif__status__string(z.code);
if (z) {
return 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);
z = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
if (z.code) {
return wuffs_gif__status__string(z.code);
if (z) {
return z;
}
z = wuffs_base__pixel_buffer__set_from_slice(
&pb, wuffs_base__image_config__pixel_config(&ic),
@@ -244,23 +216,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.code) {
return wuffs_gif__status__string(z.code);
if (z) {
return z;
}
while (true) {
z = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
if (z.code) {
if (z.code == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
if (z) {
if (z == wuffs_base__suspension__end_of_data) {
break;
}
return wuffs_gif__status__string(z.code);
return z;
}
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
if (z.code) {
return wuffs_gif__status__string(z.code);
if (z) {
return z;
}
const char* msg = copy_to_io_buffer_from_pixel_buffer(
@@ -288,9 +260,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return false;
}
@@ -301,9 +272,8 @@ 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.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("decode_image_config: got \"%s\"", z);
return false;
}
if (wuffs_base__image_config__pixel_format(&ic) !=
@@ -340,8 +310,8 @@ bool do_test_wuffs_gif_decode(const char* filename,
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
if (z.code) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z.code));
if (z) {
FAIL("set_from_slice: \"%s\"", z);
return false;
}
}
@@ -358,14 +328,12 @@ 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.code == WUFFS_BASE__STATUS_OK) {
if (!z) {
break;
}
if (z.code != WUFFS_BASE__SUSPENSION_SHORT_READ) {
FAIL("decode_frame_config: 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));
if (z != wuffs_base__suspension__short_read) {
FAIL("decode_frame_config: got \"%s\", want \"%s\"", z,
wuffs_base__suspension__short_read);
return false;
}
@@ -390,13 +358,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.code == WUFFS_BASE__STATUS_OK) {
if (!z) {
break;
}
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));
if (z != wuffs_base__suspension__short_read) {
FAIL("decode_frame: got \"%s\", want \"%s\"", z,
wuffs_base__suspension__short_read);
return false;
}
@@ -461,11 +428,9 @@ 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.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));
if (z != wuffs_base__suspension__end_of_data) {
FAIL("decode_frame: got \"%s\", want \"%s\"", z,
wuffs_base__suspension__end_of_data);
return false;
}
if (src.ri != src.wi) {
@@ -490,28 +455,23 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
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.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));
if (z) {
FAIL("decode_image_config: got \"%s\"", z);
return;
}
z = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
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));
if (z != wuffs_base__error__invalid_call_sequence) {
FAIL("decode_image_config: got \"%s\", want \"%s\"", z,
wuffs_base__error__invalid_call_sequence);
return;
}
}
@@ -530,9 +490,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return false;
}
@@ -541,9 +500,8 @@ 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.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: got %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("decode_image_config: got \"%s\"", z);
return false;
}
@@ -558,8 +516,8 @@ bool do_test_wuffs_gif_decode_animated(
.ptr = global_pixel_buffer,
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
}));
if (z.code) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z.code));
if (z) {
FAIL("set_from_slice: \"%s\"", z);
return false;
}
@@ -567,17 +525,15 @@ 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.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_frame_config #%" PRIu32 ": got %" PRIi32 " (%s)", i, z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("decode_frame_config #%" PRIu32 ": got \"%s\"", i, z);
return false;
}
z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader,
((wuffs_base__slice_u8){}));
if (z.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_frame #%" PRIu32 ": got %" PRIi32 " (%s)", i, z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("decode_frame #%" PRIu32 ": got \"%s\"", i, z);
return false;
}
@@ -599,10 +555,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.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));
if (z != wuffs_base__suspension__end_of_data) {
FAIL("decode_frame: got \"%s\", want \"%s\"", z,
wuffs_base__suspension__end_of_data);
return false;
}
@@ -656,16 +611,15 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
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.code) {
FAIL("decode_image_config: %s", wuffs_gif__status__string(z.code));
if (z) {
FAIL("decode_image_config: \"%s\"", z);
return;
}
@@ -731,19 +685,17 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
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.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));
if (z != wuffs_gif__error__bad_header) {
FAIL("decode_image_config: got \"%s\", want \"%s\"", z,
wuffs_gif__error__bad_header);
return;
}
}
@@ -759,9 +711,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gif__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return false;
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
@@ -770,8 +721,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.code != WUFFS_BASE__STATUS_OK) {
FAIL("decode_image_config: %s", wuffs_gif__status__string(z.code));
if (z) {
FAIL("decode_image_config: \"%s\"", z);
return false;
}
@@ -781,8 +732,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.code) {
FAIL("set_from_slice: %s", wuffs_gif__status__string(z.code));
if (z) {
FAIL("set_from_slice: \"%s\"", z);
return false;
}
}
@@ -804,7 +755,7 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
break;
}
wuffs_base__status z = ((wuffs_base__status){});
wuffs_base__status z = NULL;
if (frame_config) {
z = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader);
} else {
@@ -812,14 +763,14 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
((wuffs_base__slice_u8){}));
}
if (z.code == WUFFS_BASE__STATUS_OK) {
if (!z) {
want++;
continue;
} else if (z.code == WUFFS_BASE__SUSPENSION_END_OF_DATA) {
} else if (z == wuffs_base__suspension__end_of_data) {
end_of_data = true;
continue;
}
FAIL("%s: %s", method, wuffs_gif__status__string(z.code));
FAIL("%s: \"%s\"", method, z);
return false;
}
+14 -20
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.code) {
return wuffs_gzip__status__string(z.code);
if (z) {
return z;
}
while (true) {
@@ -105,14 +105,11 @@ 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.code == WUFFS_BASE__STATUS_OK) {
return NULL;
}
if ((wlimit && (z.code == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z.code == 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(z.code);
return z;
}
}
@@ -140,9 +137,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_gzip__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return false;
}
wuffs_gzip__decoder__set_ignore_checksum(&dec, ignore_checksum);
@@ -155,7 +151,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);
int32_t want_z_code = 0;
const char* want_z = NULL;
if (i == 0) {
if (end_limit == 0) {
continue;
@@ -165,19 +161,17 @@ 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_code = WUFFS_BASE__SUSPENSION_SHORT_READ;
want_z = wuffs_base__suspension__short_read;
} else {
want_z_code = (bad_checksum && !ignore_checksum)
? WUFFS_GZIP__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
want_z = (bad_checksum && !ignore_checksum)
? wuffs_gzip__error__bad_checksum
: NULL;
}
wuffs_base__status got_z =
wuffs_gzip__decoder__decode(&dec, got_writer, src_reader);
if (got_z.code != want_z_code) {
FAIL("end_limit=%d: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
end_limit, got_z.code, wuffs_gzip__status__string(got_z.code),
want_z_code, wuffs_gzip__status__string(want_z_code));
if (got_z != want_z) {
FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z, want_z);
return false;
}
}
+12 -19
View File
@@ -103,9 +103,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_lzw__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return false;
}
wuffs_lzw__decoder__set_literal_width(&dec, literal_width);
@@ -124,22 +123,18 @@ 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.code == WUFFS_BASE__STATUS_OK) {
if (!z) {
if (src.ri != src.wi) {
FAIL("decode returned \"ok\" but src was not exhausted");
return false;
}
break;
}
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.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));
if ((z != wuffs_base__suspension__short_read) &&
(z != wuffs_base__suspension__short_write)) {
FAIL("decode: got \"%s\", want \"%s\" or \"%s\"", z,
wuffs_base__suspension__short_read,
wuffs_base__suspension__short_write);
return false;
}
@@ -235,15 +230,13 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_lzw__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return false;
}
z = wuffs_lzw__decoder__decode(&dec, dst_writer, src_reader);
if (z.code) {
FAIL("decode: %" PRIi32 " (%s)", z.code,
wuffs_lzw__status__string(z.code));
if (z) {
FAIL("decode: \"%s\"", z);
return false;
}
n_bytes += dst.wi;
+14 -20
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.code) {
return wuffs_zlib__status__string(z.code);
if (z) {
return z;
}
while (true) {
@@ -105,14 +105,11 @@ 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.code == WUFFS_BASE__STATUS_OK) {
return NULL;
}
if ((wlimit && (z.code == WUFFS_BASE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (z.code == 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(z.code);
return z;
}
}
@@ -139,9 +136,8 @@ 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.code) {
FAIL("check_wuffs_version: %" PRIi32 " (%s)", z.code,
wuffs_zlib__status__string(z.code));
if (z) {
FAIL("check_wuffs_version: \"%s\"", z);
return false;
}
wuffs_zlib__decoder__set_ignore_checksum(&dec, ignore_checksum);
@@ -154,7 +150,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);
int32_t want_z_code = 0;
const char* want_z = NULL;
if (i == 0) {
if (end_limit == 0) {
continue;
@@ -164,19 +160,17 @@ 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_code = WUFFS_BASE__SUSPENSION_SHORT_READ;
want_z = wuffs_base__suspension__short_read;
} else {
want_z_code = (bad_checksum && !ignore_checksum)
? WUFFS_ZLIB__ERROR_BAD_CHECKSUM
: WUFFS_BASE__STATUS_OK;
want_z = (bad_checksum && !ignore_checksum)
? wuffs_zlib__error__bad_checksum
: NULL;
}
wuffs_base__status got_z =
wuffs_zlib__decoder__decode(&dec, got_writer, src_reader);
if (got_z.code != want_z_code) {
FAIL("end_limit=%d: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
end_limit, got_z.code, wuffs_zlib__status__string(got_z.code),
want_z_code, wuffs_zlib__status__string(want_z_code));
if (got_z != want_z) {
FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z, want_z);
return false;
}
}