Lessen use of a temporary io_reader

This commit is contained in:
Nigel Tao committed 2018-04-28 10:39:55 +10:00
1 parent 8b25a3035a
commit 333d195b52
2 files changed
+9 -9

No files matched your search

+5 -5
View File
@@ -2957,8 +2957,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
goto label_0_break;
}
while (true) {
wuffs_base__io_reader__mark(&a_src, b_rptr_src);
v_r = a_src;
wuffs_base__io_reader__mark(&v_r, b_rptr_src);
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15);
if (a_src.private_impl.buf) {
@@ -2987,8 +2987,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
}
if (v_block_size <
((uint64_t)(((wuffs_base__slice_u8){
.ptr = v_r.private_impl.bounds[0],
.len = b_rptr_src - v_r.private_impl.bounds[0],
.ptr = a_src.private_impl.bounds[0],
.len = b_rptr_src - a_src.private_impl.bounds[0],
})
.len))) {
status = WUFFS_GIF__ERROR_INTERNAL_ERROR_INCONSISTENT_LIMITED_READ;
@@ -2996,8 +2996,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
}
v_block_size -=
((uint64_t)(((wuffs_base__slice_u8){
.ptr = v_r.private_impl.bounds[0],
.len = b_rptr_src - v_r.private_impl.bounds[0],
.ptr = a_src.private_impl.bounds[0],
.len = b_rptr_src - a_src.private_impl.bounds[0],
})
.len));
if ((v_block_size == 0) && (v_z == WUFFS_GIF__SUSPENSION_SHORT_READ)) {
+4 -4
View File
@@ -312,10 +312,10 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() {
break
}
while true {
var r base.io_reader = in.src
// TODO: should "mark" be "set_mark"? Unlike "limit", "mark" does
// not return a different io_reader.
r.mark()
in.src.mark()
var r base.io_reader = in.src
// TODO: remove the dummy param. It's needed for now so that
// writeSaveExprDerivedVars updates e.g. the b_rptr_src derived
// variables.
@@ -325,10 +325,10 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() {
if z.is_ok() {
break
}
if block_size < r.since_mark().length() {
if block_size < in.src.since_mark().length() {
return error "internal error: inconsistent limited read"
}
block_size -= r.since_mark().length()
block_size -= in.src.since_mark().length()
if (block_size == 0) and (z == suspension "short read") {
break
}