mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
Fix returning limited vs short read.
This commit is contained in:
1 parent
bd6d2ea3a1
commit
fa18eec3e9
4 files changed
+28
-18
No files matched your search
@@ -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
|
||||
}
|
||||
|
||||
+6
-3
@@ -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;
|
||||
}
|
||||
+14
-7
@@ -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;
|
||||
}
|
||||
+5
-4
@@ -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) {
|
||||
|
||||
Reference in new issue
Block a user