mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 00:47:28 +01:00
Rename decode_io_writer methods to transform_io
This commit is contained in:
1 parent
ab0b2fd2aa
commit
5f8d2da74f
17 files changed
+168
-178
No files matched your search
@@ -169,7 +169,7 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__io_buffer limited_dst = make_limited_writer(*dst, wlimit);
|
||||
wuffs_base__io_buffer limited_src = make_limited_reader(*src, rlimit);
|
||||
|
||||
wuffs_base__status status = wuffs_deflate__decoder__decode_io_writer(
|
||||
wuffs_base__status status = wuffs_deflate__decoder__transform_io(
|
||||
&dec, &limited_dst, &limited_src, global_work_slice);
|
||||
|
||||
dst->meta.wi += limited_dst.meta.wi;
|
||||
@@ -248,8 +248,8 @@ const char* test_wuffs_deflate_decode_deflate_huffman_primlen_9() {
|
||||
CHECK_STATUS("initialize", wuffs_deflate__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__DEFAULT_OPTIONS));
|
||||
CHECK_STATUS("decode_io_writer", wuffs_deflate__decoder__decode_io_writer(
|
||||
&dec, &got, &src, global_work_slice));
|
||||
CHECK_STATUS("transform_io", wuffs_deflate__decoder__transform_io(
|
||||
&dec, &got, &src, global_work_slice));
|
||||
|
||||
int i;
|
||||
for (i = 0; i < 2; i++) {
|
||||
@@ -345,13 +345,13 @@ const char* test_wuffs_deflate_decode_split_src() {
|
||||
src.meta.closed = false;
|
||||
src.meta.ri = gt->src_offset0;
|
||||
src.meta.wi = split;
|
||||
wuffs_base__status z0 = wuffs_deflate__decoder__decode_io_writer(
|
||||
wuffs_base__status z0 = wuffs_deflate__decoder__transform_io(
|
||||
&dec, &got, &src, global_work_slice);
|
||||
|
||||
src.meta.closed = true;
|
||||
src.meta.ri = split;
|
||||
src.meta.wi = gt->src_offset1;
|
||||
wuffs_base__status z1 = wuffs_deflate__decoder__decode_io_writer(
|
||||
wuffs_base__status z1 = wuffs_deflate__decoder__transform_io(
|
||||
&dec, &got, &src, global_work_slice);
|
||||
|
||||
if (z0.repr != wuffs_base__suspension__short_read) {
|
||||
@@ -387,7 +387,7 @@ const char* do_test_wuffs_deflate_history(int i,
|
||||
|
||||
dec->private_impl.f_history_index = starting_history_index;
|
||||
|
||||
wuffs_base__status got_z = wuffs_deflate__decoder__decode_io_writer(
|
||||
wuffs_base__status got_z = wuffs_deflate__decoder__transform_io(
|
||||
dec, &limited_got, src, global_work_slice);
|
||||
got->meta.wi += limited_got.meta.wi;
|
||||
if (got_z.repr != want_z) {
|
||||
|
||||
+2
-2
@@ -97,7 +97,7 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__io_buffer limited_dst = make_limited_writer(*dst, wlimit);
|
||||
wuffs_base__io_buffer limited_src = make_limited_reader(*src, rlimit);
|
||||
|
||||
wuffs_base__status status = wuffs_gzip__decoder__decode_io_writer(
|
||||
wuffs_base__status status = wuffs_gzip__decoder__transform_io(
|
||||
&dec, &limited_dst, &limited_src, global_work_slice);
|
||||
|
||||
dst->meta.wi += limited_dst.meta.wi;
|
||||
@@ -165,7 +165,7 @@ const char* do_test_wuffs_gzip_checksum(bool ignore_checksum,
|
||||
}
|
||||
|
||||
wuffs_base__io_buffer limited_src = make_limited_reader(src, rlimit);
|
||||
wuffs_base__status got_z = wuffs_gzip__decoder__decode_io_writer(
|
||||
wuffs_base__status got_z = wuffs_gzip__decoder__transform_io(
|
||||
&dec, &got, &limited_src, global_work_slice);
|
||||
src.meta.ri += limited_src.meta.ri;
|
||||
if (got_z.repr != want_z) {
|
||||
|
||||
+11
-12
@@ -115,20 +115,19 @@ const char* do_test_wuffs_lzw_decode(const char* src_filename,
|
||||
size_t old_wi = got.meta.wi;
|
||||
size_t old_ri = src.meta.ri;
|
||||
|
||||
wuffs_base__status status = wuffs_lzw__decoder__decode_io_writer(
|
||||
wuffs_base__status status = wuffs_lzw__decoder__transform_io(
|
||||
&dec, &limited_got, &limited_src, global_work_slice);
|
||||
got.meta.wi += limited_got.meta.wi;
|
||||
src.meta.ri += limited_src.meta.ri;
|
||||
if (wuffs_base__status__is_ok(&status)) {
|
||||
if (src.meta.ri != src.meta.wi) {
|
||||
RETURN_FAIL(
|
||||
"decode_io_writer returned \"ok\" but src was not exhausted");
|
||||
RETURN_FAIL("transform_io returned \"ok\" but src was not exhausted");
|
||||
}
|
||||
break;
|
||||
}
|
||||
if ((status.repr != wuffs_base__suspension__short_read) &&
|
||||
(status.repr != wuffs_base__suspension__short_write)) {
|
||||
RETURN_FAIL("decode_io_writer: got \"%s\", want \"%s\" or \"%s\"",
|
||||
RETURN_FAIL("transform_io: got \"%s\", want \"%s\" or \"%s\"",
|
||||
status.repr, wuffs_base__suspension__short_read,
|
||||
wuffs_base__suspension__short_write);
|
||||
}
|
||||
@@ -223,9 +222,9 @@ const char* test_wuffs_lzw_decode_output_bad() {
|
||||
wuffs_lzw__decoder__set_literal_width(&dec, 7);
|
||||
|
||||
wuffs_base__status status =
|
||||
wuffs_lzw__decoder__decode_io_writer(&dec, &got, &src, global_work_slice);
|
||||
wuffs_lzw__decoder__transform_io(&dec, &got, &src, global_work_slice);
|
||||
if (status.repr != wuffs_lzw__error__bad_code) {
|
||||
RETURN_FAIL("decode_io_writer: got \"%s\", want \"%s\"", status.repr,
|
||||
RETURN_FAIL("transform_io: got \"%s\", want \"%s\"", status.repr,
|
||||
wuffs_lzw__error__bad_code);
|
||||
}
|
||||
|
||||
@@ -265,8 +264,8 @@ const char* test_wuffs_lzw_decode_output_empty() {
|
||||
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
|
||||
wuffs_lzw__decoder__set_literal_width(&dec, 8);
|
||||
|
||||
CHECK_STATUS("decode_io_writer", wuffs_lzw__decoder__decode_io_writer(
|
||||
&dec, &got, &src, global_work_slice));
|
||||
CHECK_STATUS("transform_io", wuffs_lzw__decoder__transform_io(
|
||||
&dec, &got, &src, global_work_slice));
|
||||
|
||||
if (got.meta.wi != 0) {
|
||||
RETURN_FAIL("got.meta.wi: got %d, want 0", (int)(got.meta.wi));
|
||||
@@ -290,8 +289,8 @@ const char* do_test_wuffs_lzw_decode_width(uint32_t width,
|
||||
wuffs_base__io_buffer got = ((wuffs_base__io_buffer){
|
||||
.data = global_got_slice,
|
||||
});
|
||||
CHECK_STATUS("decode_io_writer", wuffs_lzw__decoder__decode_io_writer(
|
||||
&dec, &got, &src, global_work_slice));
|
||||
CHECK_STATUS("transform_io", wuffs_lzw__decoder__transform_io(
|
||||
&dec, &got, &src, global_work_slice));
|
||||
|
||||
return check_io_buffers_equal("", &got, &want);
|
||||
}
|
||||
@@ -392,8 +391,8 @@ const char* do_bench_wuffs_lzw_decode(const char* filename,
|
||||
wuffs_lzw__decoder__initialize(
|
||||
&dec, sizeof dec, WUFFS_VERSION,
|
||||
WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED));
|
||||
CHECK_STATUS("decode_io_writer", wuffs_lzw__decoder__decode_io_writer(
|
||||
&dec, &got, &src, global_work_slice));
|
||||
CHECK_STATUS("transform_io", wuffs_lzw__decoder__transform_io(
|
||||
&dec, &got, &src, global_work_slice));
|
||||
n_bytes += got.meta.wi;
|
||||
}
|
||||
bench_finish(iters, n_bytes);
|
||||
|
||||
+8
-8
@@ -108,7 +108,7 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__io_buffer limited_dst = make_limited_writer(*dst, wlimit);
|
||||
wuffs_base__io_buffer limited_src = make_limited_reader(*src, rlimit);
|
||||
|
||||
wuffs_base__status status = wuffs_zlib__decoder__decode_io_writer(
|
||||
wuffs_base__status status = wuffs_zlib__decoder__transform_io(
|
||||
&dec, &limited_dst, &limited_src, global_work_slice);
|
||||
|
||||
dst->meta.wi += limited_dst.meta.wi;
|
||||
@@ -176,7 +176,7 @@ const char* do_test_wuffs_zlib_checksum(bool ignore_checksum,
|
||||
|
||||
wuffs_base__io_buffer limited_src = make_limited_reader(src, rlimit);
|
||||
|
||||
wuffs_base__status got_z = wuffs_zlib__decoder__decode_io_writer(
|
||||
wuffs_base__status got_z = wuffs_zlib__decoder__transform_io(
|
||||
&dec, &got, &limited_src, global_work_slice);
|
||||
src.meta.ri += limited_src.meta.ri;
|
||||
if (got_z.repr != want_z) {
|
||||
@@ -235,11 +235,11 @@ const char* test_wuffs_zlib_decode_sheep() {
|
||||
|
||||
int i;
|
||||
for (i = 0; i < 3; i++) {
|
||||
wuffs_base__status status = wuffs_zlib__decoder__decode_io_writer(
|
||||
&dec, &got, &src, global_work_slice);
|
||||
wuffs_base__status status =
|
||||
wuffs_zlib__decoder__transform_io(&dec, &got, &src, global_work_slice);
|
||||
|
||||
if (status.repr != wuffs_zlib__note__dictionary_required) {
|
||||
RETURN_FAIL("decode_io_writer (before dict): got \"%s\", want \"%s\"",
|
||||
RETURN_FAIL("transform_io (before dict): got \"%s\", want \"%s\"",
|
||||
status.repr, wuffs_zlib__note__dictionary_required);
|
||||
}
|
||||
|
||||
@@ -257,9 +257,9 @@ const char* test_wuffs_zlib_decode_sheep() {
|
||||
.len = zlib_sheep_dict_len,
|
||||
}));
|
||||
|
||||
CHECK_STATUS("decode_io_writer (after dict)",
|
||||
wuffs_zlib__decoder__decode_io_writer(&dec, &got, &src,
|
||||
global_work_slice));
|
||||
CHECK_STATUS(
|
||||
"transform_io (after dict)",
|
||||
wuffs_zlib__decoder__transform_io(&dec, &got, &src, global_work_slice));
|
||||
|
||||
wuffs_base__io_buffer want =
|
||||
make_io_buffer_from_string(zlib_sheep_want_ptr, zlib_sheep_want_len);
|
||||
|
||||
Reference in new issue
Block a user