From 128e6c06bba938d7ff245c1aaf03b6085d5470ca Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 2 May 2018 19:53:19 +1000 Subject: [PATCH] Remove some obsolete limit-related code --- cmd/wuffs-c/internal/cgen/var.go | 48 ------ gen/c/std/deflate.c | 209 -------------------------- gen/c/std/gif.c | 246 ------------------------------- gen/c/std/gzip.c | 52 ------- gen/c/std/zlib.c | 52 ------- 5 files changed, 607 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index 5dcf10bb..ab9be90c 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -114,22 +114,6 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header b.printf("%srstart_%s = %s%s.private_impl.bounds[0];", bPrefix, nameStr, aPrefix, nameStr) b.printf("%srend_%s = %s%s.private_impl.bounds[1];", bPrefix, nameStr, aPrefix, nameStr) - - b.printf("uint64_t len = %s%s.private_impl.buf->wi - %s%s.private_impl.buf->ri;", - aPrefix, nameStr, aPrefix, nameStr) - - b.printf("wuffs_base__io_limit* lim;\n") - b.printf("for (lim = &%s%s.private_impl.limit; lim; lim = lim->next) {\n", aPrefix, nameStr) - b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {\n") - b.printf("len = *lim->ptr_to_len;\n") - b.printf("}\n") - b.printf("}\n") - - // TODO: remove this temporary consistency check. - b.printf("if (%srend_%s != %srptr_%s + len) { status = 101; self->private_impl.status = status; return status; }", - bPrefix, nameStr, bPrefix, nameStr) - - b.printf("%srend_%s = %srptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr) } b.printf("}\n") @@ -158,24 +142,6 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header b.printf("%swstart_%s = %s%s.private_impl.bounds[0];", bPrefix, nameStr, aPrefix, nameStr) b.printf("%swend_%s = %s%s.private_impl.bounds[1];", bPrefix, nameStr, aPrefix, nameStr) - - b.printf("if (!%s%s.private_impl.buf->closed) {", aPrefix, nameStr) - b.printf("uint64_t len = %s%s.private_impl.buf->len - %s%s.private_impl.buf->wi;", - aPrefix, nameStr, aPrefix, nameStr) - - b.printf("wuffs_base__io_limit* lim;\n") - b.printf("for (lim = &%s%s.private_impl.limit; lim; lim = lim->next) {\n", aPrefix, nameStr) - b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) {\n") - b.printf("len = *lim->ptr_to_len;\n") - b.printf("}\n") - b.printf("}\n") - - // TODO: remove this temporary consistency check. - b.printf("if (%swend_%s != %swptr_%s + len) { status = 102; self->private_impl.status = status; return status; }", - bPrefix, nameStr, bPrefix, nameStr) - - b.printf("%swend_%s = %swptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr) - b.printf("}\n") } b.printf("}\n") @@ -205,13 +171,6 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) b.printf("%s%s.private_impl.buf->ri += n;", aPrefix, nameStr) - b.printf("wuffs_base__io_limit* lim;\n") - b.printf("for (lim = &%s%s.private_impl.limit; lim; lim = lim->next) {\n", aPrefix, nameStr) - b.printf("if (lim->ptr_to_len) {\n") - b.printf("*lim->ptr_to_len -= n;\n") - b.printf("}\n") - b.printf("}\n") - if footer { b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srstart_%s);", bPrefix, nameStr) b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srend_%s);", bPrefix, nameStr) @@ -226,13 +185,6 @@ func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr) b.printf("%s%s.private_impl.buf->wi += n;", aPrefix, nameStr) - b.printf("wuffs_base__io_limit* lim;\n") - b.printf("for (lim = &%s%s.private_impl.limit; lim; lim = lim->next) {\n", aPrefix, nameStr) - b.printf("if (lim->ptr_to_len) {\n") - b.printf("*lim->ptr_to_len -= n;\n") - b.printf("}\n") - b.printf("}\n") - if footer { b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swstart_%s);", bPrefix, nameStr) b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swend_%s);", bPrefix, nameStr) diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index e8932123..52c497a1 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1873,21 +1873,6 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( } b_wstart_dst = a_dst.private_impl.bounds[0]; b_wend_dst = a_dst.private_impl.bounds[1]; - if (!a_dst.private_impl.buf->closed) { - uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_wend_dst != b_wptr_dst + len) { - status = 102; - self->private_impl.status = status; - return status; - } - b_wend_dst = b_wptr_dst + len; - } } uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; @@ -1908,12 +1893,6 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } wuffs_deflate__status t_0 = wuffs_deflate__decoder__decode_blocks(self, a_dst, a_src); @@ -1990,12 +1969,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -2027,19 +2000,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = @@ -2077,12 +2037,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_deflate__decoder__decode_uncompressed(self, a_dst, a_src); @@ -2105,12 +2059,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_deflate__decoder__init_dynamic_huffman(self, a_src); if (a_src.private_impl.buf) { @@ -2129,12 +2077,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_deflate__decoder__decode_huffman_fast(self, a_dst, a_src); if (a_src.private_impl.buf) { @@ -2151,12 +2093,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_deflate__decoder__decode_huffman_slow(self, a_dst, a_src); if (a_src.private_impl.buf) { @@ -2191,12 +2127,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2239,21 +2169,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed( } b_wstart_dst = a_dst.private_impl.bounds[0]; b_wend_dst = a_dst.private_impl.bounds[1]; - if (!a_dst.private_impl.buf->closed) { - uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_wend_dst != b_wptr_dst + len) { - status = 102; - self->private_impl.status = status; - return status; - } - b_wend_dst = b_wptr_dst + len; - } } uint8_t* b_rptr_src = NULL; uint8_t* b_rstart_src = NULL; @@ -2267,19 +2182,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = @@ -2371,12 +2273,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -2384,12 +2280,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2503,19 +2393,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_dynamic_huffman( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = @@ -2731,12 +2608,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -3073,21 +2944,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_fast( } b_wstart_dst = a_dst.private_impl.bounds[0]; b_wend_dst = a_dst.private_impl.bounds[1]; - if (!a_dst.private_impl.buf->closed) { - uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_wend_dst != b_wptr_dst + len) { - status = 102; - self->private_impl.status = status; - return status; - } - b_wend_dst = b_wptr_dst + len; - } } uint8_t* b_rptr_src = NULL; uint8_t* b_rstart_src = NULL; @@ -3101,19 +2957,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_fast( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } if ((self->private_impl.f_n_bits >= 8) || @@ -3408,12 +3251,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -3421,12 +3258,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -3471,21 +3302,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( } b_wstart_dst = a_dst.private_impl.bounds[0]; b_wend_dst = a_dst.private_impl.bounds[1]; - if (!a_dst.private_impl.buf->closed) { - uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_wend_dst != b_wptr_dst + len) { - status = 102; - self->private_impl.status = status; - return status; - } - b_wend_dst = b_wptr_dst + len; - } } uint8_t* b_rptr_src = NULL; uint8_t* b_rstart_src = NULL; @@ -3499,19 +3315,6 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = @@ -3868,12 +3671,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -3881,12 +3678,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } 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 1f4145a5..47686020 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1865,19 +1865,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = @@ -1897,12 +1884,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_gif__decoder__decode_header(self, a_src); if (a_src.private_impl.buf) { @@ -1916,12 +1897,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_gif__decoder__decode_lsd(self, a_src); if (a_src.private_impl.buf) { @@ -1949,12 +1924,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_config( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_gif__decoder__decode_extension(self, a_src); if (a_src.private_impl.buf) { @@ -1986,12 +1955,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2038,19 +2001,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = @@ -2084,12 +2034,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_gif__decoder__decode_extension(self, a_src); if (a_src.private_impl.buf) { @@ -2104,12 +2048,6 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_gif__decoder__decode_id(self, a_dst, a_src); if (a_src.private_impl.buf) { @@ -2149,12 +2087,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2194,19 +2126,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_header( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = @@ -2256,12 +2175,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2301,19 +2214,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = self->private_impl.c_decode_lsd[0].coro_susp_point; @@ -2396,12 +2296,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2439,19 +2333,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = @@ -2478,12 +2359,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_gif__decoder__decode_ae(self, a_src); if (a_src.private_impl.buf) { @@ -2500,12 +2375,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_gif__decoder__skip_blocks(self, a_src); if (a_src.private_impl.buf) { @@ -2532,12 +2401,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2575,19 +2438,6 @@ static wuffs_gif__status wuffs_gif__decoder__skip_blocks( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = @@ -2641,12 +2491,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2687,19 +2531,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_ae( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = self->private_impl.c_decode_ae[0].coro_susp_point; @@ -2847,12 +2678,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_ae( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } status = wuffs_gif__decoder__skip_blocks(self, a_src); if (a_src.private_impl.buf) { @@ -2882,12 +2707,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -2932,19 +2751,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = self->private_impl.c_decode_id[0].coro_susp_point; @@ -3156,12 +2962,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } uint64_t l_rlimit0 = v_block_size; wuffs_gif__status t_14 = wuffs_gif__lzw_decoder__decode( @@ -3219,12 +3019,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); } @@ -3285,21 +3079,6 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( } b_wstart_dst = a_dst.private_impl.bounds[0]; b_wend_dst = a_dst.private_impl.bounds[1]; - if (!a_dst.private_impl.buf->closed) { - uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_wend_dst != b_wptr_dst + len) { - status = 102; - self->private_impl.status = status; - return status; - } - b_wend_dst = b_wptr_dst + len; - } } uint8_t* b_rptr_src = NULL; uint8_t* b_rstart_src = NULL; @@ -3313,19 +3092,6 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode( } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; @@ -3470,12 +3236,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -3483,12 +3243,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } 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 d9c6723b..3de646bb 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -2018,21 +2018,6 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, } b_wstart_dst = a_dst.private_impl.bounds[0]; b_wend_dst = a_dst.private_impl.bounds[1]; - if (!a_dst.private_impl.buf->closed) { - uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_wend_dst != b_wptr_dst + len) { - status = 102; - self->private_impl.status = status; - return status; - } - b_wend_dst = b_wptr_dst + len; - } } uint8_t* b_rptr_src = NULL; uint8_t* b_rstart_src = NULL; @@ -2046,19 +2031,6 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; @@ -2217,23 +2189,11 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self, 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } wuffs_gzip__status t_8 = wuffs_deflate__decoder__decode( &self->private_impl.f_flate, a_dst, a_src); @@ -2355,12 +2315,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -2368,12 +2322,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } 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 4a22be47..8b5bed0c 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -2014,21 +2014,6 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, } b_wstart_dst = a_dst.private_impl.bounds[0]; b_wend_dst = a_dst.private_impl.bounds[1]; - if (!a_dst.private_impl.buf->closed) { - uint64_t len = a_dst.private_impl.buf->len - a_dst.private_impl.buf->wi; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_wend_dst != b_wptr_dst + len) { - status = 102; - self->private_impl.status = status; - return status; - } - b_wend_dst = b_wptr_dst + len; - } } uint8_t* b_rptr_src = NULL; uint8_t* b_rstart_src = NULL; @@ -2042,19 +2027,6 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, } b_rstart_src = a_src.private_impl.bounds[0]; b_rend_src = a_src.private_impl.bounds[1]; - uint64_t len = a_src.private_impl.buf->wi - a_src.private_impl.buf->ri; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { - len = *lim->ptr_to_len; - } - } - if (b_rend_src != b_rptr_src + len) { - status = 101; - self->private_impl.status = status; - return status; - } - b_rend_src = b_rptr_src + len; } uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point; @@ -2120,23 +2092,11 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self, 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } } wuffs_zlib__status t_2 = wuffs_deflate__decoder__decode( &self->private_impl.f_flate, a_dst, a_src); @@ -2217,12 +2177,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_dst.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wstart_dst); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_dst); } @@ -2230,12 +2184,6 @@ exit: 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; - wuffs_base__io_limit* lim; - for (lim = &a_src.private_impl.limit; lim; lim = lim->next) { - if (lim->ptr_to_len) { - *lim->ptr_to_len -= n; - } - } WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rstart_src); WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_rend_src); }