Remove the wuffs_foo__status types

This commit is contained in:
Nigel Tao committed 2018-06-10 21:40:43 +10:00
1 parent 699bae15d2
commit d770e879ab
28 files changed
+221 -361

No files matched your search

+6 -7
View File
@@ -124,7 +124,7 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
set_reader_limit(&src_reader, rlimit);
}
wuffs_deflate__status s =
wuffs_base__status s =
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
if (s == WUFFS_DEFLATE__STATUS_OK) {
@@ -227,13 +227,13 @@ void test_wuffs_deflate_decode_split_src() {
src.closed = false;
src.ri = gt->src_offset0;
src.wi = split;
wuffs_deflate__status s0 =
wuffs_base__status s0 =
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
src.closed = true;
src.ri = split;
src.wi = gt->src_offset1;
wuffs_deflate__status s1 =
wuffs_base__status s1 =
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
if (s0 != WUFFS_DEFLATE__SUSPENSION_SHORT_READ) {
@@ -266,7 +266,7 @@ bool do_test_wuffs_deflate_history(int i,
wuffs_deflate__decoder* dec,
uint32_t starting_history_index,
uint64_t limit,
wuffs_deflate__status want_s) {
wuffs_base__status want_s) {
src->ri = gt->src_offset0;
src->wi = gt->src_offset1;
got->ri = 0;
@@ -279,7 +279,7 @@ bool do_test_wuffs_deflate_history(int i,
set_writer_limit(&dst_writer, limit);
wuffs_deflate__status got_s =
wuffs_base__status got_s =
wuffs_deflate__decoder__decode(dec, dst_writer, src_reader);
if (got_s != want_s) {
FAIL("i=%d: starting_history_index=0x%04" PRIX32
@@ -483,8 +483,7 @@ void test_wuffs_deflate_table_redirect() {
dec.private_impl.f_code_lengths[n++] = 13;
dec.private_impl.f_code_lengths[n++] = 13;
wuffs_deflate__status s =
wuffs_deflate__decoder__init_huff(&dec, 0, 0, n, 257);
wuffs_base__status s = wuffs_deflate__decoder__init_huff(&dec, 0, 0, n, 257);
if (s) {
FAIL("%s", wuffs_deflate__status__string(s));
return;
+14 -14
View File
@@ -54,7 +54,7 @@ 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_gif__status status = wuffs_gif__decoder__decode_config(NULL, &ic, src);
wuffs_base__status status = wuffs_gif__decoder__decode_config(NULL, &ic, src);
if (status != WUFFS_GIF__ERROR_BAD_RECEIVER) {
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status), WUFFS_GIF__ERROR_BAD_RECEIVER,
@@ -96,7 +96,7 @@ 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_gif__status status = wuffs_gif__decoder__decode_config(&dec, &ic, src);
wuffs_base__status status = wuffs_gif__decoder__decode_config(&dec, &ic, src);
if (status != WUFFS_GIF__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED) {
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
wuffs_gif__status__string(status),
@@ -108,19 +108,19 @@ void test_basic_check_wuffs_version_not_called() {
void test_basic_status_is_error() {
CHECK_FOCUS(__func__);
if (wuffs_gif__status__is_error(WUFFS_GIF__STATUS_OK)) {
if (wuffs_base__status__is_error(WUFFS_GIF__STATUS_OK)) {
FAIL("is_error(OK) returned true");
return;
}
if (!wuffs_gif__status__is_error(WUFFS_GIF__ERROR_BAD_WUFFS_VERSION)) {
if (!wuffs_base__status__is_error(WUFFS_GIF__ERROR_BAD_WUFFS_VERSION)) {
FAIL("is_error(BAD_WUFFS_VERSION) returned false");
return;
}
if (wuffs_gif__status__is_error(WUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
if (wuffs_base__status__is_error(WUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
FAIL("is_error(SHORT_WRITE) returned true");
return;
}
if (!wuffs_gif__status__is_error(WUFFS_GIF__ERROR_BAD_HEADER)) {
if (!wuffs_base__status__is_error(WUFFS_GIF__ERROR_BAD_HEADER)) {
FAIL("is_error(BAD_HEADER) returned false");
return;
}
@@ -198,7 +198,7 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
wuffs_gif__status s =
wuffs_base__status s =
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
if (s) {
return wuffs_gif__status__string(s);
@@ -246,7 +246,7 @@ 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_gif__status status =
wuffs_base__status status =
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
if (status != WUFFS_GIF__STATUS_OK) {
FAIL("decode_config: got %" PRIi32 " (%s)", status,
@@ -295,7 +295,7 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
size_t old_ri = src.ri;
wuffs_gif__status status =
wuffs_base__status status =
wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
if (status == WUFFS_GIF__STATUS_OK) {
@@ -363,7 +363,7 @@ bool do_test_wuffs_gif_decode(const char* filename,
return false;
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_gif__status status =
wuffs_base__status status =
wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
if (status != WUFFS_GIF__SUSPENSION_END_OF_DATA) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
@@ -396,7 +396,7 @@ void test_wuffs_gif_call_sequence() {
wuffs_base__image_buffer ib = ((wuffs_base__image_buffer){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_gif__status status =
wuffs_base__status status =
wuffs_gif__decoder__decode_frame(&dec, &ib, src_reader);
if (status != WUFFS_GIF__ERROR_INVALID_CALL_SEQUENCE) {
FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
@@ -425,7 +425,7 @@ bool do_test_wuffs_gif_decode_animated(
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_gif__status status =
wuffs_base__status status =
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
if (status != WUFFS_GIF__STATUS_OK) {
FAIL("decode_config: got %" PRIi32 " (%s)", status,
@@ -523,7 +523,7 @@ void test_wuffs_gif_decode_frame_out_of_bounds() {
wuffs_gif__decoder__check_wuffs_version(&dec, sizeof dec, WUFFS_VERSION);
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_gif__status s =
wuffs_base__status s =
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
if (s) {
FAIL("decode_config: %s", wuffs_gif__status__string(s));
@@ -594,7 +594,7 @@ void test_wuffs_gif_decode_input_is_a_png() {
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_gif__status status =
wuffs_base__status status =
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
if (status != WUFFS_GIF__ERROR_BAD_HEADER) {
FAIL("decode_config: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
+3 -3
View File
@@ -80,7 +80,7 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
set_reader_limit(&src_reader, rlimit);
}
wuffs_gzip__status s =
wuffs_base__status s =
wuffs_gzip__decoder__decode(&dec, dst_writer, src_reader);
if (s == WUFFS_GZIP__STATUS_OK) {
@@ -127,7 +127,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_gzip__status want = 0;
wuffs_base__status want = 0;
if (i == 0) {
if (end_limit == 0) {
continue;
@@ -144,7 +144,7 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
: WUFFS_GZIP__STATUS_OK;
}
wuffs_gzip__status status =
wuffs_base__status status =
wuffs_gzip__decoder__decode(&dec, got_writer, src_reader);
if (status != want) {
FAIL("end_limit=%d: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
+2 -2
View File
@@ -99,7 +99,7 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
size_t old_wi = got.wi;
size_t old_ri = src.ri;
wuffs_lzw__status status =
wuffs_base__status status =
wuffs_lzw__decoder__decode(&dec, got_writer, src_reader);
if (status == WUFFS_LZW__STATUS_OK) {
if (src.ri != src.wi) {
@@ -211,7 +211,7 @@ bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t iters_unscaled) {
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_lzw__status s =
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));
+3 -3
View File
@@ -80,7 +80,7 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
set_reader_limit(&src_reader, rlimit);
}
wuffs_zlib__status s =
wuffs_base__status s =
wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
if (s == WUFFS_ZLIB__STATUS_OK) {
@@ -126,7 +126,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_zlib__status want = 0;
wuffs_base__status want = 0;
if (i == 0) {
if (end_limit == 0) {
continue;
@@ -143,7 +143,7 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
: WUFFS_ZLIB__STATUS_OK;
}
wuffs_zlib__status status =
wuffs_base__status status =
wuffs_zlib__decoder__decode(&dec, got_writer, src_reader);
if (status != want) {
FAIL("end_limit=%d: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",