From 6b2f7815dad0521ea09c24843b5653e1ed41aa5d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 28 Apr 2018 10:04:11 +1000 Subject: [PATCH] Remove some obsolete bounds[0] checks --- cmd/wuffs-c/internal/cgen/expr.go | 6 +++--- gen/c/std/gif.c | 19 +++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index d10a10e7..c9e2ce35 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -168,8 +168,8 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare if isInSrc(g.tm, n, t.IDSinceMark, 0) { b.printf("((wuffs_base__slice_u8){ "+ ".ptr = %ssrc.private_impl.bounds[0], "+ - ".len = %ssrc.private_impl.bounds[0] ? (size_t)(%srptr_src - %ssrc.private_impl.bounds[0]) : 0, })", - aPrefix, aPrefix, bPrefix, aPrefix) + ".len = %srptr_src - %ssrc.private_impl.bounds[0], })", + aPrefix, bPrefix, aPrefix) return nil } // TODO: io_reader.is_marked, not just io_writer.is_marked? @@ -349,7 +349,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare // TODO: don't hard-code v_r or b_rptr_src. b.printf("((wuffs_base__slice_u8){ " + ".ptr = v_r.private_impl.bounds[0], " + - ".len = v_r.private_impl.bounds[0] ? (size_t)(b_rptr_src - v_r.private_impl.bounds[0]) : 0, })") + ".len = b_rptr_src - v_r.private_impl.bounds[0], })") return nil } if isThatMethod(g.tm, n, g.tm.ByName("initialize"), 5) { diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 8ef4b29e..88b95aa0 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -2988,23 +2988,18 @@ 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 = v_r.private_impl.bounds[0] - ? (size_t)(b_rptr_src - - v_r.private_impl.bounds[0]) - : 0, + .len = b_rptr_src - v_r.private_impl.bounds[0], }) .len))) { status = WUFFS_GIF__ERROR_INTERNAL_ERROR_INCONSISTENT_LIMITED_READ; goto exit; } - v_block_size -= ((uint64_t)( - ((wuffs_base__slice_u8){ - .ptr = v_r.private_impl.bounds[0], - .len = v_r.private_impl.bounds[0] - ? (size_t)(b_rptr_src - v_r.private_impl.bounds[0]) - : 0, - }) - .len)); + 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], + }) + .len)); if ((v_block_size == 0) && (v_z == WUFFS_GIF__SUSPENSION_SHORT_READ)) { goto label_1_break; }