From 79d5870ea2a229100f8602e36f5e5ec015a8b481 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Mon, 15 Aug 2016 00:15:46 +0300
Subject: [PATCH] Rename tinf_read_src_byte() to uzlib_get_byte().

---
 src/tinf.h     |  2 +-
 src/tinfgzip.c | 16 ++++++++--------
 src/tinflate.c | 14 +++++++-------
 src/tinfzlib.c |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/tinf.h b/src/tinf.h
index 57c62b7..3545bbd 100644
--- a/src/tinf.h
+++ b/src/tinf.h
@@ -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 */
 
diff --git a/src/tinfgzip.c b/src/tinfgzip.c
index 248e349..ca5cf14 100644
--- a/src/tinfgzip.c
+++ b/src/tinfgzip.c
@@ -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)
diff --git a/src/tinflate.c b/src/tinflate.c
index 771ff4d..47644bf 100644
--- a/src/tinflate.c
+++ b/src/tinflate.c
@@ -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;
 }
diff --git a/src/tinfzlib.c b/src/tinfzlib.c
index 1db49de..74fade3 100644
--- a/src/tinfzlib.c
+++ b/src/tinfzlib.c
@@ -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 -- */