# HG changeset patch # User Matti Hamalainen # Date 1425172059 -7200 # Node ID 2da97be2aa1f59e7f2e84c3f9644ad10cd87a56e # Parent 198156b930d7810988e44c4e02b3f6f743232362 Rename some variables. diff -r 198156b930d7 -r 2da97be2aa1f src/dmzlib.c --- a/src/dmzlib.c Sun Mar 01 03:05:17 2015 +0200 +++ b/src/dmzlib.c Sun Mar 01 03:07:39 2015 +0200 @@ -245,27 +245,27 @@ } -static const int stbi__zlength_base[31] = +static const int dm_zlib_length_base[31] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 }; -static const int stbi__zlength_extra[31] = +static const int dm_zlib_length_extra[31] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 0, 0 }; -static const int stbi__zdist_base[32] = +static const int dm_zlib_dist_base[32] = { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 0, 0 }; -static const int stbi__zdist_extra[32] = +static const int dm_zlib_dist_extra[32] = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13 @@ -303,16 +303,16 @@ } z -= 257; - len = stbi__zlength_base[z]; - if (stbi__zlength_extra[z]) - len += dmZReceive(a, stbi__zlength_extra[z]); + len = dm_zlib_length_base[z]; + if (dm_zlib_length_extra[z]) + len += dmZReceive(a, dm_zlib_length_extra[z]); if ((ret = dmZLibHuffmanDecode(a, &a->zdistance, &z)) != DMERR_OK) return ret; - dist = stbi__zdist_base[z]; - if (stbi__zdist_extra[z]) - dist += dmZReceive(a, stbi__zdist_extra[z]); + dist = dm_zlib_dist_base[z]; + if (dm_zlib_dist_extra[z]) + dist += dmZReceive(a, dm_zlib_dist_extra[z]); if (zout - a->zoutStart < dist) {