Remove obsolete limit implementation

This commit is contained in:
Nigel Tao committed 2018-05-02 20:29:39 +10:00
1 parent 86157ba363
commit b9b398dc9a
19 files changed
+9 -284

No files matched your search

-7
View File
@@ -113,20 +113,14 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
uint64_t rlimit) {
wuffs_deflate__decoder dec;
wuffs_deflate__decoder__initialize(&dec, WUFFS_VERSION, 0);
uint64_t wlim = 0;
uint64_t rlim = 0;
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;
}
wuffs_deflate__status s =
@@ -280,7 +274,6 @@ 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 =
wuffs_deflate__decoder__decode(dec, dst_writer, src_reader);
-12
View File
@@ -208,21 +208,15 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
wuffs_gif__lzw_decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_gif__lzw_decoder__set_literal_width(&dec, literal_width);
int num_iters = 0;
uint64_t wlim = 0;
uint64_t rlim = 0;
while (true) {
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;
}
size_t old_wi = got.wi;
size_t old_ri = src.ri;
@@ -431,21 +425,15 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
int num_iters = 0;
uint64_t wlim = 0;
uint64_t rlim = 0;
while (true) {
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;
}
size_t old_wi = got.wi;
size_t old_ri = src.ri;
+2 -10
View File
@@ -69,20 +69,14 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
wuffs_gzip__decoder dec;
wuffs_gzip__decoder__initialize(&dec, WUFFS_VERSION, 0);
uint64_t wlim = 0;
uint64_t rlim = 0;
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;
}
wuffs_gzip__status s =
@@ -139,12 +133,10 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
FAIL("end_limit=%d: not enough source data", end_limit);
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;
wuffs_base__io_reader__set_limit(&src_reader,
src.wi - (uint64_t)(end_limit));
want = WUFFS_GZIP__SUSPENSION_SHORT_READ;
} else {
src_reader.private_impl.limit.ptr_to_len = NULL;
want = (bad_checksum && !ignore_checksum)
? WUFFS_GZIP__ERROR_CHECKSUM_MISMATCH
: WUFFS_GZIP__STATUS_OK;
+2 -10
View File
@@ -84,20 +84,14 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_zlib__decoder dec;
wuffs_zlib__decoder__initialize(&dec, WUFFS_VERSION, 0);
uint64_t wlim = 0;
uint64_t rlim = 0;
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;
}
wuffs_zlib__status s =
@@ -153,12 +147,10 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
FAIL("end_limit=%d: not enough source data", end_limit);
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;
wuffs_base__io_reader__set_limit(&src_reader,
src.wi - (uint64_t)(end_limit));
want = WUFFS_ZLIB__SUSPENSION_SHORT_READ;
} else {
src_reader.private_impl.limit.ptr_to_len = NULL;
want = (bad_checksum && !ignore_checksum)
? WUFFS_ZLIB__ERROR_CHECKSUM_MISMATCH
: WUFFS_ZLIB__STATUS_OK;