From 3debf31424b4ea47c16f600a7babee6f660c30b0 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 2 May 2018 20:51:48 +1000 Subject: [PATCH] Simplify synchronizing io_buffer pointers --- cmd/wuffs-c/internal/cgen/var.go | 10 ++--- gen/c/std/deflate.c | 56 ++++++----------------- gen/c/std/gif.c | 77 +++++++++----------------------- gen/c/std/gzip.c | 16 ++----- gen/c/std/zlib.c | 16 ++----- 5 files changed, 46 insertions(+), 129 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index ab9be90c..4bdfd454 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -167,9 +167,8 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer case t.QID{t.IDBase, t.IDIOReader}: b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr) - b.printf("size_t n = %srptr_%s - (%s%s.private_impl.buf->ptr + %s%s.private_impl.buf->ri);", - bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) - b.printf("%s%s.private_impl.buf->ri += n;", aPrefix, nameStr) + b.printf("%s%s.private_impl.buf->ri = %srptr_%s - %s%s.private_impl.buf->ptr;", + aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr) if footer { b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srstart_%s);", bPrefix, nameStr) @@ -181,9 +180,8 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer case t.QID{t.IDBase, t.IDIOWriter}: b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr) - b.printf("size_t n = %swptr_%s - (%s%s.private_impl.buf->ptr + %s%s.private_impl.buf->wi);", - bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) - b.printf("%s%s.private_impl.buf->wi += n;", aPrefix, nameStr) + b.printf("%s%s.private_impl.buf->wi = %swptr_%s - %s%s.private_impl.buf->ptr;", + aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr) if footer { b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swstart_%s);", bPrefix, nameStr) diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index e1291029..8a64420b 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1872,9 +1872,7 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( wuffs_base__io_writer__mark(&a_dst, b_wptr_dst); { if (a_dst.private_impl.buf) { - size_t n = b_wptr_dst - - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; } wuffs_deflate__status t_0 = wuffs_deflate__decoder__decode_blocks(self, a_dst, a_src); @@ -1948,9 +1946,7 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - size_t n = - b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -2016,9 +2012,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( if (v_type == 0) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_deflate__decoder__decode_uncompressed(self, a_dst, a_src); @@ -2038,9 +2032,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( } else if (v_type == 2) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_deflate__decoder__init_dynamic_huffman(self, a_src); if (a_src.private_impl.buf) { @@ -2056,9 +2048,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( self->private_impl.f_end_of_block = false; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_deflate__decoder__decode_huffman_fast(self, a_dst, a_src); if (a_src.private_impl.buf) { @@ -2072,9 +2062,7 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_deflate__decoder__decode_huffman_slow(self, a_dst, a_src); if (a_src.private_impl.buf) { @@ -2106,9 +2094,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2251,16 +2237,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - size_t n = - b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2585,9 +2567,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -3227,16 +3207,12 @@ label_0_break:; goto exit; exit: if (a_dst.private_impl.buf) { - size_t n = - b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -3647,16 +3623,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - size_t n = - b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index c9f233a3..66894474 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1863,9 +1863,7 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_gif__decoder__decode_header(self, a_src); if (a_src.private_impl.buf) { @@ -1876,9 +1874,7 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_gif__decoder__decode_lsd(self, a_src); if (a_src.private_impl.buf) { @@ -1903,9 +1899,7 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_gif__decoder__decode_extension(self, a_src); if (a_src.private_impl.buf) { @@ -1934,9 +1928,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2012,9 +2004,7 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame( if (self->private_impl.f_block_type == 33) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_gif__decoder__decode_extension(self, a_src); if (a_src.private_impl.buf) { @@ -2026,9 +2016,7 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame( } else if (self->private_impl.f_block_type == 44) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_gif__decoder__decode_id(self, a_dst, a_src); if (a_src.private_impl.buf) { @@ -2065,9 +2053,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2152,9 +2138,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2272,9 +2256,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2334,9 +2316,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension( } else if (v_label == 255) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_gif__decoder__decode_ae(self, a_src); if (a_src.private_impl.buf) { @@ -2350,9 +2330,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension( } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_gif__decoder__skip_blocks(self, a_src); if (a_src.private_impl.buf) { @@ -2376,9 +2354,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2465,9 +2441,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2651,9 +2625,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_ae( label_0_break:; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13); if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } status = wuffs_gif__decoder__skip_blocks(self, a_src); if (a_src.private_impl.buf) { @@ -2680,9 +2652,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2931,9 +2901,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( : 0); { if (a_src.private_impl.buf) { - size_t n = b_rptr_src - (a_src.private_impl.buf->ptr + - a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = + b_rptr_src - a_src.private_impl.buf->ptr; } wuffs_gif__status t_14 = wuffs_gif__lzw_decoder__decode( &self->private_impl.f_lzw, a_dst, a_src); @@ -2986,9 +2955,7 @@ suspend: goto exit; exit: if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -3202,16 +3169,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - size_t n = - b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 313d15ad..6ca57322 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -2168,14 +2168,10 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, wuffs_base__io_writer__mark(&a_dst, b_wptr_dst); { if (a_dst.private_impl.buf) { - size_t n = b_wptr_dst - - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; } if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } wuffs_gzip__status t_8 = wuffs_deflate__decoder__decode( &self->private_impl.f_flate, a_dst, a_src); @@ -2294,16 +2290,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - size_t n = - b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 2cc8850c..0a0ccda4 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -2071,14 +2071,10 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, wuffs_base__io_writer__mark(&a_dst, b_wptr_dst); { if (a_dst.private_impl.buf) { - size_t n = b_wptr_dst - - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; } if (a_src.private_impl.buf) { - size_t n = b_rptr_src - - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; } wuffs_zlib__status t_2 = wuffs_deflate__decoder__decode( &self->private_impl.f_flate, a_dst, a_src); @@ -2156,16 +2152,12 @@ suspend: goto exit; exit: if (a_dst.private_impl.buf) { - size_t n = - b_wptr_dst - (a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi); - a_dst.private_impl.buf->wi += n; + a_dst.private_impl.buf->wi = b_wptr_dst - a_dst.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } if (a_src.private_impl.buf) { - size_t n = - b_rptr_src - (a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri); - a_src.private_impl.buf->ri += n; + a_src.private_impl.buf->ri = b_rptr_src - a_src.private_impl.buf->ptr; WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); }