mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 16:47:28 +01:00
Remove io_{reader,writer} C types
This commit is contained in:
1 parent
f34d189236
commit
aa846d2dd7
17 files changed
+194
-302
No files matched your search
+4
-14
@@ -149,14 +149,10 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
|
||||
|
||||
while (true) {
|
||||
wuffs_base__io_buffer limited_dst = make_limited_writer(*dst, wlimit);
|
||||
wuffs_base__io_writer dst_writer =
|
||||
wuffs_base__io_buffer__writer(&limited_dst);
|
||||
wuffs_base__io_buffer limited_src = make_limited_reader(*src, rlimit);
|
||||
wuffs_base__io_reader src_reader =
|
||||
wuffs_base__io_buffer__reader(&limited_src);
|
||||
|
||||
status = wuffs_deflate__decoder__decode_io_writer(
|
||||
&dec, dst_writer, src_reader, global_work_slice);
|
||||
&dec, &limited_dst, &limited_src, global_work_slice);
|
||||
|
||||
dst->meta.wi += limited_dst.meta.wi;
|
||||
src->meta.ri += limited_src.meta.ri;
|
||||
@@ -268,9 +264,6 @@ const char* test_wuffs_deflate_decode_split_src() {
|
||||
return status;
|
||||
}
|
||||
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&got);
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
int i;
|
||||
for (i = 1; i < 32; i++) {
|
||||
size_t split = gt->src_offset0 + i;
|
||||
@@ -291,13 +284,13 @@ const char* test_wuffs_deflate_decode_split_src() {
|
||||
src.meta.ri = gt->src_offset0;
|
||||
src.meta.wi = split;
|
||||
const char* z0 = wuffs_deflate__decoder__decode_io_writer(
|
||||
&dec, dst_writer, src_reader, global_work_slice);
|
||||
&dec, &got, &src, global_work_slice);
|
||||
|
||||
src.meta.closed = true;
|
||||
src.meta.ri = split;
|
||||
src.meta.wi = gt->src_offset1;
|
||||
const char* z1 = wuffs_deflate__decoder__decode_io_writer(
|
||||
&dec, dst_writer, src_reader, global_work_slice);
|
||||
&dec, &got, &src, global_work_slice);
|
||||
|
||||
if (z0 != wuffs_base__suspension__short_read) {
|
||||
RETURN_FAIL("i=%d: z0: got \"%s\", want \"%s\"", i, z0,
|
||||
@@ -332,14 +325,11 @@ const char* do_test_wuffs_deflate_history(int i,
|
||||
got->meta.wi = 0;
|
||||
|
||||
wuffs_base__io_buffer limited_got = make_limited_writer(*got, wlimit);
|
||||
wuffs_base__io_writer dst_writer =
|
||||
wuffs_base__io_buffer__writer(&limited_got);
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
|
||||
|
||||
dec->private_impl.f_history_index = starting_history_index;
|
||||
|
||||
const char* got_z = wuffs_deflate__decoder__decode_io_writer(
|
||||
dec, dst_writer, src_reader, global_work_slice);
|
||||
dec, &limited_got, src, global_work_slice);
|
||||
got->meta.wi += limited_got.meta.wi;
|
||||
if (got_z != want_z) {
|
||||
RETURN_FAIL("i=%d: starting_history_index=0x%04" PRIX32
|
||||
|
||||
Reference in new issue
Block a user