mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 00:47:28 +01:00
Make the status type a struct, not an int32_t
This commit is contained in:
1 parent
9c0b2d2f5c
commit
2a32a86a6c
26 files changed
+791
-668
No files matched your search
+34
-31
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user