mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 16:47:28 +01:00
Have check_wuffs_version return a status code
This commit is contained in:
1 parent
845ffbeb86
commit
fd43e777bc
21 files changed
+628
-466
No files matched your search
+22
-13
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user