From 52e7fe070963bf546ad9b7055186a49e19bbeb08 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 30 Jun 2018 13:03:20 +1000 Subject: [PATCH] Mark std/gif's decode_up_to_id_part1 as private --- gen/c/std/gif.c | 27 +++++---------------------- gen/h/std/gif.h | 10 ---------- std/gif/decode_gif.wuffs | 2 +- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 18228fe4..03bc7337 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1597,7 +1597,6 @@ typedef struct { inline wuffs_base__status decode_frame(wuffs_base__image_buffer* a_dst, wuffs_base__io_reader a_src, wuffs_base__slice_u8 a_work_buffer); - inline wuffs_base__status decode_up_to_id_part1(wuffs_base__io_reader a_src); #endif // __cplusplus } wuffs_gif__decoder; @@ -1631,10 +1630,6 @@ wuffs_base__status wuffs_gif__decoder__decode_frame( wuffs_base__io_reader a_src, wuffs_base__slice_u8 a_work_buffer); -wuffs_base__status wuffs_gif__decoder__decode_up_to_id_part1( - wuffs_gif__decoder* self, - wuffs_base__io_reader a_src); - // ---------------- C++ Convenience Methods #ifdef __cplusplus @@ -1666,11 +1661,6 @@ inline wuffs_base__status wuffs_gif__decoder::decode_frame( return wuffs_gif__decoder__decode_frame(this, a_dst, a_src, a_work_buffer); } -inline wuffs_base__status wuffs_gif__decoder::decode_up_to_id_part1( - wuffs_base__io_reader a_src) { - return wuffs_gif__decoder__decode_up_to_id_part1(this, a_src); -} - #endif // __cplusplus #ifdef __cplusplus @@ -2344,6 +2334,10 @@ static const uint8_t wuffs_gif__netscape2dot0[11] = { // ---------------- Private Function Prototypes +static wuffs_base__status wuffs_gif__decoder__decode_up_to_id_part1( + wuffs_gif__decoder* self, + wuffs_base__io_reader a_src); + static wuffs_base__status wuffs_gif__decoder__decode_header( wuffs_gif__decoder* self, wuffs_base__io_reader a_src); @@ -2614,19 +2608,9 @@ exit: // -------- func gif.decoder.decode_up_to_id_part1 -wuffs_base__status wuffs_gif__decoder__decode_up_to_id_part1( +static wuffs_base__status wuffs_gif__decoder__decode_up_to_id_part1( wuffs_gif__decoder* self, wuffs_base__io_reader a_src) { - if (!self) { - return WUFFS_BASE__ERROR_BAD_RECEIVER; - } - if (self->private_impl.magic != WUFFS_BASE__MAGIC) { - self->private_impl.status = - WUFFS_BASE__ERROR_CHECK_WUFFS_VERSION_NOT_CALLED; - } - if (self->private_impl.status < 0) { - return self->private_impl.status; - } wuffs_base__status status = WUFFS_BASE__STATUS_OK; uint8_t v_block_type; @@ -2718,7 +2702,6 @@ exit: a_src.private_impl.buf->ri = ioptr_src - a_src.private_impl.buf->ptr; } - self->private_impl.status = status; return status; short_read_src: diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 39b9c505..1770dfb7 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1597,7 +1597,6 @@ typedef struct { inline wuffs_base__status decode_frame(wuffs_base__image_buffer* a_dst, wuffs_base__io_reader a_src, wuffs_base__slice_u8 a_work_buffer); - inline wuffs_base__status decode_up_to_id_part1(wuffs_base__io_reader a_src); #endif // __cplusplus } wuffs_gif__decoder; @@ -1631,10 +1630,6 @@ wuffs_base__status wuffs_gif__decoder__decode_frame( wuffs_base__io_reader a_src, wuffs_base__slice_u8 a_work_buffer); -wuffs_base__status wuffs_gif__decoder__decode_up_to_id_part1( - wuffs_gif__decoder* self, - wuffs_base__io_reader a_src); - // ---------------- C++ Convenience Methods #ifdef __cplusplus @@ -1666,11 +1661,6 @@ inline wuffs_base__status wuffs_gif__decoder::decode_frame( return wuffs_gif__decoder__decode_frame(this, a_dst, a_src, a_work_buffer); } -inline wuffs_base__status wuffs_gif__decoder::decode_up_to_id_part1( - wuffs_base__io_reader a_src) { - return wuffs_gif__decoder__decode_up_to_id_part1(this, a_src); -} - #endif // __cplusplus #ifdef __cplusplus diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index db04bfee..8d60559a 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -170,7 +170,7 @@ pub func decoder.decode_frame?(dst ptr base.image_buffer, src base.io_reader, wo this.frame_count_value ~sat+= 1 } -pub func decoder.decode_up_to_id_part1?(src base.io_reader)() { +pri func decoder.decode_up_to_id_part1?(src base.io_reader)() { while true { var block_type base.u8 = in.src.read_u8?() if block_type == 0x21 { // The spec calls 0x21 the "Extension Introducer".