diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index cc21982b..dacc87f8 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -180,15 +180,6 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, puffs_base_writer1 a_dst, puffs_base_reader1 a_src); -puffs_flate_status puffs_flate_decoder_decode_uncompressed( - puffs_flate_decoder* self, - puffs_base_writer1 a_dst, - puffs_base_reader1 a_src); - -puffs_flate_status puffs_flate_decoder_decode_dynamic(puffs_flate_decoder* self, - puffs_base_writer1 a_dst, - puffs_base_reader1 a_src); - #ifdef __cplusplus } // extern "C" #endif @@ -286,6 +277,15 @@ static const uint8_t puffs_flate_code_order[19] = { // ---------------- Private Function Prototypes +puffs_flate_status puffs_flate_decoder_decode_uncompressed( + puffs_flate_decoder* self, + puffs_base_writer1 a_dst, + puffs_base_reader1 a_src); + +puffs_flate_status puffs_flate_decoder_decode_dynamic(puffs_flate_decoder* self, + puffs_base_writer1 a_dst, + puffs_base_reader1 a_src); + // ---------------- Constructor and Destructor Implementations // PUFFS_MAGIC is a magic number to check that constructors are called. It's @@ -487,15 +487,6 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed( puffs_flate_decoder* self, puffs_base_writer1 a_dst, puffs_base_reader1 a_src) { - if (!self) { - return PUFFS_FLATE_ERROR_BAD_RECEIVER; - } - if (self->private_impl.magic != PUFFS_MAGIC) { - self->private_impl.status = PUFFS_FLATE_ERROR_CONSTRUCTOR_NOT_CALLED; - } - if (self->private_impl.status < 0) { - return self->private_impl.status; - } puffs_flate_status status = PUFFS_FLATE_STATUS_OK; uint32_t v_n; @@ -621,7 +612,6 @@ exit: } } - self->private_impl.status = status; return status; short_read_src: @@ -640,15 +630,6 @@ puffs_flate_status puffs_flate_decoder_decode_dynamic( puffs_flate_decoder* self, puffs_base_writer1 a_dst, puffs_base_reader1 a_src) { - if (!self) { - return PUFFS_FLATE_ERROR_BAD_RECEIVER; - } - if (self->private_impl.magic != PUFFS_MAGIC) { - self->private_impl.status = PUFFS_FLATE_ERROR_CONSTRUCTOR_NOT_CALLED; - } - if (self->private_impl.status < 0) { - return self->private_impl.status; - } puffs_flate_status status = PUFFS_FLATE_STATUS_OK; uint32_t v_bits; @@ -764,7 +745,6 @@ exit: } } - self->private_impl.status = status; return status; short_read_src: diff --git a/gen/h/std/flate.h b/gen/h/std/flate.h index e696b294..1d3a0e51 100644 --- a/gen/h/std/flate.h +++ b/gen/h/std/flate.h @@ -180,15 +180,6 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, puffs_base_writer1 a_dst, puffs_base_reader1 a_src); -puffs_flate_status puffs_flate_decoder_decode_uncompressed( - puffs_flate_decoder* self, - puffs_base_writer1 a_dst, - puffs_base_reader1 a_src); - -puffs_flate_status puffs_flate_decoder_decode_dynamic(puffs_flate_decoder* self, - puffs_base_writer1 a_dst, - puffs_base_reader1 a_src); - #ifdef __cplusplus } // extern "C" #endif diff --git a/std/flate/decode_flate.puffs b/std/flate/decode_flate.puffs index c24fbb1e..36aafaf5 100644 --- a/std/flate/decode_flate.puffs +++ b/std/flate/decode_flate.puffs @@ -55,7 +55,7 @@ pub func decoder.decode?(dst writer1, src reader1)() { } } -pub func decoder.decode_uncompressed?(dst writer1, src reader1)() { +pri func decoder.decode_uncompressed?(dst writer1, src reader1)() { if this.n_bits >= 8 { return error "internal error: inconsistent n_bits" } @@ -69,7 +69,7 @@ pub func decoder.decode_uncompressed?(dst writer1, src reader1)() { } // decode_dynamic decodes dynamic Huffman codes as per the RFC section 3.2.7. -pub func decoder.decode_dynamic?(dst writer1, src reader1)() { +pri func decoder.decode_dynamic?(dst writer1, src reader1)() { var bits u32 = this.bits var n_bits u32 = this.n_bits while n_bits < 14,