jepler/uzlib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename tinf_read_src_byte() to uzlib_get_byte().

Browse source
This commit is contained in:
Paul Sokolovsky 2016-08-15 00:15:46 +03:00
parent 9dd4fe3a9b
commit 79d5870ea2
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tinf.h
View file

@ -86,7 +86,7 @@ typedef struct TINF_DATA {
if (d->dict_ring) { d->dict_ring[d->dict_idx++] = c; if (d->dict_idx == d->dict_size) d->dict_idx = 0; } \
}
unsigned char TINFCC tinf_read_src_byte(TINF_DATA *d);
unsigned char TINFCC uzlib_get_byte(TINF_DATA *d);
/* Decompression API */

16
src/tinfgzip.c
View file

@ -43,13 +43,13 @@
void tinf_skip_bytes(TINF_DATA *d, int num)
{
while (num--) tinf_read_src_byte(d);
while (num--) uzlib_get_byte(d);
}
uint16_t tinf_get_uint16(TINF_DATA *d)
{
unsigned int v = tinf_read_src_byte(d);
v = (tinf_read_src_byte(d) << 8) | v;
unsigned int v = uzlib_get_byte(d);
v = (uzlib_get_byte(d) << 8) | v;
return v;
}
@ -60,13 +60,13 @@ int uzlib_gzip_parse_header(TINF_DATA *d)
/* -- check format -- */
/* check id bytes */
if (tinf_read_src_byte(d) != 0x1f || tinf_read_src_byte(d) != 0x8b) return TINF_DATA_ERROR;
if (uzlib_get_byte(d) != 0x1f || uzlib_get_byte(d) != 0x8b) return TINF_DATA_ERROR;
/* check method is deflate */
if (tinf_read_src_byte(d) != 8) return TINF_DATA_ERROR;
if (uzlib_get_byte(d) != 8) return TINF_DATA_ERROR;
/* get flag byte */
flg = tinf_read_src_byte(d);
flg = uzlib_get_byte(d);
/* check that reserved bits are zero */
if (flg & 0xe0) return TINF_DATA_ERROR;
@ -84,10 +84,10 @@ int uzlib_gzip_parse_header(TINF_DATA *d)
}
/* skip file name if present */
if (flg & FNAME) { while (tinf_read_src_byte(d)); }
if (flg & FNAME) { while (uzlib_get_byte(d)); }
/* skip file comment if present */
if (flg & FCOMMENT) { while (tinf_read_src_byte(d)); }
if (flg & FCOMMENT) { while (uzlib_get_byte(d)); }
/* check header crc if present */
if (flg & FHCRC)

14
src/tinflate.c
View file

@ -166,7 +166,7 @@ static void tinf_build_tree(TINF_TREE *t, const unsigned char *lengths, unsigned
* -- decode functions -- *
* ---------------------- */
unsigned char tinf_read_src_byte(TINF_DATA *d)
unsigned char uzlib_get_byte(TINF_DATA *d)
{
if (d->source) {
return *d->source++;
@ -179,7 +179,7 @@ uint32_t tinf_get_le_uint32(TINF_DATA *d)
uint32_t val = 0;
int i;
for (i = 4; i--;) {
val = val >> 8 | tinf_read_src_byte(d) << 24;
val = val >> 8 | uzlib_get_byte(d) << 24;
}
return val;
}
@ -189,7 +189,7 @@ uint32_t tinf_get_be_uint32(TINF_DATA *d)
uint32_t val = 0;
int i;
for (i = 4; i--;) {
val = val << 8 | tinf_read_src_byte(d);
val = val << 8 | uzlib_get_byte(d);
}
return val;
}
@ -203,7 +203,7 @@ static int tinf_getbit(TINF_DATA *d)
if (!d->bitcount--)
{
/* load next tag */
d->tag = tinf_read_src_byte(d);
d->tag = uzlib_get_byte(d);
d->bitcount = 7;
}
@ -388,9 +388,9 @@ static int tinf_inflate_uncompressed_block(TINF_DATA *d)
unsigned int length, invlength;
/* get length */
length = tinf_read_src_byte(d) + 256 * tinf_read_src_byte(d);
length = uzlib_get_byte(d) + 256 * uzlib_get_byte(d);
/* get one's complement of length */
invlength = tinf_read_src_byte(d) + 256 * tinf_read_src_byte(d);
invlength = uzlib_get_byte(d) + 256 * uzlib_get_byte(d);
/* check length */
if (length != (~invlength & 0x0000ffff)) return TINF_DATA_ERROR;
@ -406,7 +406,7 @@ static int tinf_inflate_uncompressed_block(TINF_DATA *d)
return TINF_DONE;
}
unsigned char c = tinf_read_src_byte(d);
unsigned char c = uzlib_get_byte(d);
TINF_PUT(d, c);
return TINF_OK;
}

4
src/tinfzlib.c
View file

@ -41,8 +41,8 @@ int uzlib_zlib_parse_header(TINF_DATA *d)
/* -- get header bytes -- */
cmf = tinf_read_src_byte(d);
flg = tinf_read_src_byte(d);
cmf = uzlib_get_byte(d);
flg = uzlib_get_byte(d);
/* -- check format -- */