mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 16:47:28 +01:00
Rename some decode methods to decode_io_writer
This commit is contained in:
1 parent
abeff31736
commit
16e97281e2
14 files changed
+130
-114
No files matched your search
@@ -147,7 +147,8 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
|
||||
set_reader_limit(&src_reader, rlimit);
|
||||
}
|
||||
|
||||
status = wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
|
||||
status =
|
||||
wuffs_deflate__decoder__decode_io_writer(&dec, dst_writer, src_reader);
|
||||
|
||||
if ((wlimit && (status == wuffs_base__suspension__short_write)) ||
|
||||
(rlimit && (status == wuffs_base__suspension__short_read))) {
|
||||
@@ -256,13 +257,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(&dec, dst_writer, src_reader);
|
||||
wuffs_deflate__decoder__decode_io_writer(&dec, dst_writer, src_reader);
|
||||
|
||||
src.meta.closed = true;
|
||||
src.meta.ri = split;
|
||||
src.meta.wi = gt->src_offset1;
|
||||
const char* z1 =
|
||||
wuffs_deflate__decoder__decode(&dec, dst_writer, src_reader);
|
||||
wuffs_deflate__decoder__decode_io_writer(&dec, dst_writer, src_reader);
|
||||
|
||||
if (z0 != wuffs_base__suspension__short_read) {
|
||||
RETURN_FAIL("i=%d: z0: got \"%s\", want \"%s\"", i, z0,
|
||||
@@ -304,7 +305,7 @@ const char* do_test_wuffs_deflate_history(int i,
|
||||
set_writer_limit(&dst_writer, limit);
|
||||
|
||||
const char* got_z =
|
||||
wuffs_deflate__decoder__decode(dec, dst_writer, src_reader);
|
||||
wuffs_deflate__decoder__decode_io_writer(dec, dst_writer, src_reader);
|
||||
if (got_z != want_z) {
|
||||
RETURN_FAIL("i=%d: starting_history_index=0x%04" PRIX32
|
||||
": decode status: got \"%s\", want \"%s\"",
|
||||
|
||||
+3
-2
@@ -102,7 +102,8 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
|
||||
set_reader_limit(&src_reader, rlimit);
|
||||
}
|
||||
|
||||
status = wuffs_gzip__decoder__decode(&dec, dst_writer, src_reader);
|
||||
status =
|
||||
wuffs_gzip__decoder__decode_io_writer(&dec, dst_writer, src_reader);
|
||||
|
||||
if ((wlimit && (status == wuffs_base__suspension__short_write)) ||
|
||||
(rlimit && (status == wuffs_base__suspension__short_read))) {
|
||||
@@ -169,7 +170,7 @@ const char* do_test_wuffs_gzip_checksum(bool ignore_checksum,
|
||||
}
|
||||
|
||||
const char* got_z =
|
||||
wuffs_gzip__decoder__decode(&dec, got_writer, src_reader);
|
||||
wuffs_gzip__decoder__decode_io_writer(&dec, got_writer, src_reader);
|
||||
if (got_z != want_z) {
|
||||
RETURN_FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z,
|
||||
want_z);
|
||||
|
||||
+8
-6
@@ -126,7 +126,7 @@ 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;
|
||||
|
||||
status = wuffs_lzw__decoder__decode(&dec, got_writer, src_reader);
|
||||
status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader);
|
||||
if (!status) {
|
||||
if (src.meta.ri != src.meta.wi) {
|
||||
RETURN_FAIL("decode returned \"ok\" but src was not exhausted");
|
||||
@@ -229,8 +229,9 @@ const char* test_wuffs_lzw_decode_output_bad() {
|
||||
}
|
||||
wuffs_lzw__decoder__set_literal_width(&dec, 7);
|
||||
|
||||
status = wuffs_lzw__decoder__decode(&dec, wuffs_base__io_buffer__writer(&got),
|
||||
wuffs_base__io_buffer__reader(&src));
|
||||
status = wuffs_lzw__decoder__decode_io_writer(
|
||||
&dec, wuffs_base__io_buffer__writer(&got),
|
||||
wuffs_base__io_buffer__reader(&src));
|
||||
if (status != wuffs_lzw__error__bad_code) {
|
||||
RETURN_FAIL("decode: \"%s\"", status);
|
||||
}
|
||||
@@ -272,8 +273,9 @@ const char* test_wuffs_lzw_decode_output_empty() {
|
||||
}
|
||||
wuffs_lzw__decoder__set_literal_width(&dec, 8);
|
||||
|
||||
status = wuffs_lzw__decoder__decode(&dec, wuffs_base__io_buffer__writer(&got),
|
||||
wuffs_base__io_buffer__reader(&src));
|
||||
status = wuffs_lzw__decoder__decode_io_writer(
|
||||
&dec, wuffs_base__io_buffer__writer(&got),
|
||||
wuffs_base__io_buffer__reader(&src));
|
||||
if (status) {
|
||||
RETURN_FAIL("decode: \"%s\"", status);
|
||||
}
|
||||
@@ -326,7 +328,7 @@ const char* do_bench_wuffs_lzw_decode(const char* filename,
|
||||
if (status) {
|
||||
RETURN_FAIL("check_wuffs_version: \"%s\"", status);
|
||||
}
|
||||
status = wuffs_lzw__decoder__decode(&dec, got_writer, src_reader);
|
||||
status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader);
|
||||
if (status) {
|
||||
RETURN_FAIL("decode: \"%s\"", status);
|
||||
}
|
||||
|
||||
+3
-2
@@ -102,7 +102,8 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
|
||||
set_reader_limit(&src_reader, rlimit);
|
||||
}
|
||||
|
||||
status = wuffs_zlib__decoder__decode(&dec, dst_writer, src_reader);
|
||||
status =
|
||||
wuffs_zlib__decoder__decode_io_writer(&dec, dst_writer, src_reader);
|
||||
|
||||
if ((wlimit && (status == wuffs_base__suspension__short_write)) ||
|
||||
(rlimit && (status == wuffs_base__suspension__short_read))) {
|
||||
@@ -168,7 +169,7 @@ const char* do_test_wuffs_zlib_checksum(bool ignore_checksum,
|
||||
}
|
||||
|
||||
const char* got_z =
|
||||
wuffs_zlib__decoder__decode(&dec, got_writer, src_reader);
|
||||
wuffs_zlib__decoder__decode_io_writer(&dec, got_writer, src_reader);
|
||||
if (got_z != want_z) {
|
||||
RETURN_FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z,
|
||||
want_z);
|
||||
|
||||
Reference in new issue
Block a user