From fa18eec3e96fa23f857fc6f4c100b10ceb78e050 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 16 Jul 2017 19:26:58 +1000 Subject: [PATCH] Fix returning limited vs short read. --- cmd/puffs-gen-c/func.go | 7 +++---- gen/c/std/flate.c | 9 ++++++--- gen/c/std/gif.c | 21 ++++++++++++++------- test/c/std/gif.c | 9 +++++---- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/cmd/puffs-gen-c/func.go b/cmd/puffs-gen-c/func.go index ff9dfa51..096514c9 100644 --- a/cmd/puffs-gen-c/func.go +++ b/cmd/puffs-gen-c/func.go @@ -833,8 +833,8 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { g.printf("if (%ssrc.limit.ptr_to_len) {", aPrefix) g.printf("status = %sSUSPENSION_LIMITED_READ;", g.PKGPREFIX) g.printf("} else if (%ssrc.buf->closed) {", aPrefix) - g.printf("status = %sERROR_UNEXPECTED_EOF; goto exit; }", g.PKGPREFIX) - g.printf("status = %sSUSPENSION_SHORT_READ; goto suspend;\n", g.PKGPREFIX) + g.printf("status = %sERROR_UNEXPECTED_EOF; goto exit;", g.PKGPREFIX) + g.printf("} else { status = %sSUSPENSION_SHORT_READ; } goto suspend;\n", g.PKGPREFIX) g.writes("}\n") g.printf("%srptr_src += %s%d;\n", bPrefix, tPrefix, temp) @@ -982,8 +982,7 @@ func (g *gen) writeShortRead(name string) error { g.printf("} else if (%s%s.buf->closed) {", aPrefix, name) g.printf("status = %sERROR_UNEXPECTED_EOF;", g.PKGPREFIX) g.writes("goto exit;") - g.writes("}") - g.printf("status = %sSUSPENSION_SHORT_READ;", g.PKGPREFIX) + g.printf("} else {status = %sSUSPENSION_SHORT_READ; }", g.PKGPREFIX) g.writes("goto suspend;\n") return nil } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 680e218e..cc21982b 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -477,8 +477,9 @@ short_read_src: } else if (a_src.buf->closed) { status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_FLATE_SUSPENSION_SHORT_READ; } - status = PUFFS_FLATE_SUSPENSION_SHORT_READ; goto suspend; } @@ -629,8 +630,9 @@ short_read_src: } else if (a_src.buf->closed) { status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_FLATE_SUSPENSION_SHORT_READ; } - status = PUFFS_FLATE_SUSPENSION_SHORT_READ; goto suspend; } @@ -771,7 +773,8 @@ short_read_src: } else if (a_src.buf->closed) { status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_FLATE_SUSPENSION_SHORT_READ; } - status = PUFFS_FLATE_SUSPENSION_SHORT_READ; goto suspend; } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 9116ff87..b0c3d977 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -602,8 +602,9 @@ short_read_src: } else if (a_src.buf->closed) { status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_GIF_SUSPENSION_SHORT_READ; } - status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -688,8 +689,9 @@ short_read_src: } else if (a_src.buf->closed) { status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_GIF_SUSPENSION_SHORT_READ; } - status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -801,8 +803,9 @@ short_read_src: } else if (a_src.buf->closed) { status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_GIF_SUSPENSION_SHORT_READ; } - status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -870,8 +873,9 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, } else if (a_src.buf->closed) { status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_GIF_SUSPENSION_SHORT_READ; } - status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } b_rptr_src += t_2; @@ -907,8 +911,9 @@ short_read_src: } else if (a_src.buf->closed) { status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_GIF_SUSPENSION_SHORT_READ; } - status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -1067,8 +1072,9 @@ short_read_src: } else if (a_src.buf->closed) { status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_GIF_SUSPENSION_SHORT_READ; } - status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -1299,7 +1305,8 @@ short_read_src: } else if (a_src.buf->closed) { status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; + } else { + status = PUFFS_GIF_SUSPENSION_SHORT_READ; } - status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 061b32a6..49ade606 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -238,8 +238,9 @@ void test_puffs_gif_lzw_decode(const char* src_filename, } break; } - if (status != PUFFS_GIF_SUSPENSION_SHORT_READ) { - FAIL("status: got %d, want %d", status, PUFFS_GIF_SUSPENSION_SHORT_READ); + if (status != PUFFS_GIF_SUSPENSION_LIMITED_READ) { + FAIL("status: got %d, want %d", status, + PUFFS_GIF_SUSPENSION_LIMITED_READ); goto cleanup1; } if (src.ri < old_ri) { @@ -403,8 +404,8 @@ void test_puffs_gif_decode(const char* filename, } break; } - if (got != PUFFS_GIF_SUSPENSION_SHORT_READ) { - FAIL("status: got %d, want %d", got, PUFFS_GIF_SUSPENSION_SHORT_READ); + if (got != PUFFS_GIF_SUSPENSION_LIMITED_READ) { + FAIL("status: got %d, want %d", got, PUFFS_GIF_SUSPENSION_LIMITED_READ); goto cleanup1; } if (src.ri < old_ri) {