mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
Call the set_limit method
This commit is contained in:
1 parent
77ccfaf556
commit
4e55710afc
6 files changed
+27
-8
No files matched your search
@@ -187,15 +187,18 @@ const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__io_buffer* src,
|
||||
uint64_t wlimit,
|
||||
uint64_t rlimit) {
|
||||
// TODO: don't ignore wlimit and rlimit.
|
||||
uint64_t len = src->wi - src->ri;
|
||||
if (rlimit) {
|
||||
len = wuffs_base__u64__min(len, rlimit);
|
||||
}
|
||||
wuffs_adler32__hasher checksum;
|
||||
wuffs_adler32__hasher__initialize(&checksum, WUFFS_VERSION, 0);
|
||||
global_wuffs_adler32_unused_u32 =
|
||||
wuffs_adler32__hasher__update(&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = src->ptr + src->ri,
|
||||
.len = src->wi - src->ri,
|
||||
.len = len,
|
||||
}));
|
||||
src->ri = src->wi;
|
||||
src->ri += len;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
+6
-3
@@ -187,15 +187,18 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
|
||||
wuffs_base__io_buffer* src,
|
||||
uint64_t wlimit,
|
||||
uint64_t rlimit) {
|
||||
// TODO: don't ignore wlimit and rlimit.
|
||||
uint64_t len = src->wi - src->ri;
|
||||
if (rlimit) {
|
||||
len = wuffs_base__u64__min(len, rlimit);
|
||||
}
|
||||
wuffs_crc32__ieee_hasher checksum;
|
||||
wuffs_crc32__ieee_hasher__initialize(&checksum, WUFFS_VERSION, 0);
|
||||
global_wuffs_crc32_unused_u32 =
|
||||
wuffs_crc32__ieee_hasher__update(&checksum, ((wuffs_base__slice_u8){
|
||||
.ptr = src->ptr + src->ri,
|
||||
.len = src->wi - src->ri,
|
||||
.len = len,
|
||||
}));
|
||||
src->ri = src->wi;
|
||||
src->ri += len;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -118,11 +118,13 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
|
||||
while (true) {
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
|
||||
if (wlimit) {
|
||||
wuffs_base__io_writer__set_limit(&dst_writer, wlimit);
|
||||
wlim = wlimit;
|
||||
dst_writer.private_impl.limit.ptr_to_len = &wlim;
|
||||
}
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
|
||||
if (rlimit) {
|
||||
wuffs_base__io_reader__set_limit(&src_reader, rlimit);
|
||||
rlim = rlimit;
|
||||
src_reader.private_impl.limit.ptr_to_len = &rlim;
|
||||
}
|
||||
@@ -277,6 +279,7 @@ bool do_test_wuffs_deflate_history(int i,
|
||||
|
||||
dec->private_impl.f_history_index = starting_history_index;
|
||||
|
||||
wuffs_base__io_writer__set_limit(&dst_writer, limit);
|
||||
dst_writer.private_impl.limit.ptr_to_len = &limit;
|
||||
|
||||
wuffs_deflate__status got_s =
|
||||
|
||||
@@ -214,11 +214,13 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
|
||||
num_iters++;
|
||||
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
|
||||
if (wlimit) {
|
||||
wuffs_base__io_writer__set_limit(&got_writer, wlimit);
|
||||
wlim = wlimit;
|
||||
got_writer.private_impl.limit.ptr_to_len = &wlim;
|
||||
}
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
if (rlimit) {
|
||||
wuffs_base__io_reader__set_limit(&src_reader, rlimit);
|
||||
rlim = rlimit;
|
||||
src_reader.private_impl.limit.ptr_to_len = &rlim;
|
||||
}
|
||||
@@ -435,11 +437,13 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
num_iters++;
|
||||
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
|
||||
if (wlimit) {
|
||||
wuffs_base__io_writer__set_limit(&got_writer, wlimit);
|
||||
wlim = wlimit;
|
||||
got_writer.private_impl.limit.ptr_to_len = &wlim;
|
||||
}
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
if (rlimit) {
|
||||
wuffs_base__io_reader__set_limit(&src_reader, rlimit);
|
||||
rlim = rlimit;
|
||||
src_reader.private_impl.limit.ptr_to_len = &rlim;
|
||||
}
|
||||
|
||||
+4
-1
@@ -74,11 +74,13 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
|
||||
while (true) {
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
|
||||
if (wlimit) {
|
||||
wuffs_base__io_writer__set_limit(&dst_writer, wlimit);
|
||||
wlim = wlimit;
|
||||
dst_writer.private_impl.limit.ptr_to_len = &wlim;
|
||||
}
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
|
||||
if (rlimit) {
|
||||
wuffs_base__io_reader__set_limit(&src_reader, rlimit);
|
||||
rlim = rlimit;
|
||||
src_reader.private_impl.limit.ptr_to_len = &rlim;
|
||||
}
|
||||
@@ -122,12 +124,12 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
|
||||
got.wi = 0;
|
||||
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
|
||||
src.ri = 0;
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
// Decode the src data in 1 or 2 chunks, depending on whether end_limit is
|
||||
// or isn't zero.
|
||||
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;
|
||||
if (i == 0) {
|
||||
if (end_limit == 0) {
|
||||
@@ -138,6 +140,7 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
|
||||
return false;
|
||||
}
|
||||
uint64_t rlim = src.wi - (uint64_t)(end_limit);
|
||||
wuffs_base__io_reader__set_limit(&src_reader, rlim);
|
||||
src_reader.private_impl.limit.ptr_to_len = &rlim;
|
||||
want = WUFFS_GZIP__SUSPENSION_SHORT_READ;
|
||||
} else {
|
||||
|
||||
+4
-1
@@ -89,11 +89,13 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
|
||||
while (true) {
|
||||
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(dst);
|
||||
if (wlimit) {
|
||||
wuffs_base__io_writer__set_limit(&dst_writer, wlimit);
|
||||
wlim = wlimit;
|
||||
dst_writer.private_impl.limit.ptr_to_len = &wlim;
|
||||
}
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
|
||||
if (rlimit) {
|
||||
wuffs_base__io_reader__set_limit(&src_reader, rlimit);
|
||||
rlim = rlimit;
|
||||
src_reader.private_impl.limit.ptr_to_len = &rlim;
|
||||
}
|
||||
@@ -136,12 +138,12 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
|
||||
got.wi = 0;
|
||||
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
|
||||
src.ri = 0;
|
||||
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
|
||||
|
||||
// Decode the src data in 1 or 2 chunks, depending on whether end_limit is
|
||||
// or isn't zero.
|
||||
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;
|
||||
if (i == 0) {
|
||||
if (end_limit == 0) {
|
||||
@@ -152,6 +154,7 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
|
||||
return false;
|
||||
}
|
||||
uint64_t rlim = src.wi - (uint64_t)(end_limit);
|
||||
wuffs_base__io_reader__set_limit(&src_reader, rlim);
|
||||
src_reader.private_impl.limit.ptr_to_len = &rlim;
|
||||
want = WUFFS_ZLIB__SUSPENSION_SHORT_READ;
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user