diff options
author | Daniel Friesel <derf@finalrewind.org> | 2021-01-21 21:48:13 +0100 |
---|---|---|
committer | Daniel Friesel <derf@finalrewind.org> | 2021-01-21 21:48:13 +0100 |
commit | fbbb4f04074c7f21d3b334b01db87f88920db18e (patch) | |
tree | d5de6f88d4786b68a462d0a4c2762b821caaef3d /src/lib | |
parent | 68f30da720bb46054d2abd9814622dd79a607e4d (diff) |
actually, it's inflate, not deflate
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/inflate.cc (renamed from src/lib/deflate.cc) | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/deflate.cc b/src/lib/inflate.cc index e475419..8e83453 100644 --- a/src/lib/deflate.cc +++ b/src/lib/inflate.cc @@ -1,10 +1,12 @@ /* + * zlib-deflate-nostdlib + * * Copyright 2021 Daniel Friesel * * SPDX-License-Identifier: BSD-2-Clause */ -#include "lib/deflate.h" +#include "lib/inflate.h" /* * The compressed (inflated) input data. @@ -368,10 +370,10 @@ static int8_t deflate_dynamic_huffman() deflate_lld_lengths + hlit, hdist); } -int16_t deflate(unsigned char *input_buf, uint16_t input_len, +int16_t inflate(unsigned char *input_buf, uint16_t input_len, unsigned char *output_buf, uint16_t output_len) { - uint8_t is_final = input_buf[0] & 0x01; + //uint8_t is_final = input_buf[0] & 0x01; uint8_t block_type = (input_buf[0] & 0x06) >> 1; int8_t ret; @@ -403,7 +405,7 @@ int16_t deflate(unsigned char *input_buf, uint16_t input_len, return deflate_output_now - output_buf; } -int16_t deflate_zlib(unsigned char *input_buf, uint16_t input_len, +int16_t inflate_zlib(unsigned char *input_buf, uint16_t input_len, unsigned char *output_buf, uint16_t output_len) { if (input_len < 4) { @@ -425,7 +427,7 @@ int16_t deflate_zlib(unsigned char *input_buf, uint16_t input_len, } int16_t ret = - deflate(input_buf + 2, input_len - 2, output_buf, output_len); + inflate(input_buf + 2, input_len - 2, output_buf, output_len); #ifdef DEFLATE_CHECKSUM if (ret >= 0) { |