diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-02-03 18:47:34 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-02-03 18:47:34 +0100 |
| commit | 0599a137ba5a6043ce6195a2c12deeaf3886f002 (patch) | |
| tree | 8130d095c14a535eaa11db922686fa65f71ac175 /archival/libarchive | |
| parent | 8e31412231cc56e36bd4eb8410bffc78d0b252d9 (diff) | |
bzip2: a few more locals converted to generic types
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libarchive')
| -rw-r--r-- | archival/libarchive/bz/blocksort.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/archival/libarchive/bz/blocksort.c b/archival/libarchive/bz/blocksort.c index 9de9cc3cc..a1ee59224 100644 --- a/archival/libarchive/bz/blocksort.c +++ b/archival/libarchive/bz/blocksort.c @@ -452,7 +452,7 @@ int mainGtU( * usually small, typically <= 20. */ static -const int32_t incs[14] = { +const uint32_t incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280, 9841, 29524, 88573, 265720, 797161, 2391484 @@ -468,7 +468,8 @@ void mainSimpleSort(uint32_t* ptr, int32_t d, int32_t* budget) { - int32_t bigN, hp; + int32_t bigN; + int hp; bigN = hi - lo + 1; if (bigN < 2) return; @@ -478,15 +479,15 @@ void mainSimpleSort(uint32_t* ptr, hp--; for (; hp >= 0; hp--) { - int32_t i, h; + int32_t i; + unsigned h; h = incs[hp]; i = lo + h; while (1) { - int32_t j; - uint32_t v; + unsigned j; + unsigned v; - /*-- copy 1 --*/ if (i > hi) break; v = ptr[i]; j = i; @@ -511,7 +512,6 @@ void mainSimpleSort(uint32_t* ptr, } ptr[j] = v; i++; - /*-- copy 3 --*/ if (i > hi) break; v = ptr[i]; |