emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bzip2: a few more locals converted to generic types

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-02-03 18:47:34 +01:00
parent 8e31412231
commit 0599a137ba
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
archival/libarchive/bz/blocksort.c
View File

@ -452,7 +452,7 @@ int mainGtU(
* usually small, typically <= 20. * usually small, typically <= 20.
*/ */
static static
const int32_t incs[14] = { const uint32_t incs[14] = {
1, 4, 13, 40, 121, 364, 1093, 3280, 1, 4, 13, 40, 121, 364, 1093, 3280,
9841, 29524, 88573, 265720, 9841, 29524, 88573, 265720,
797161, 2391484 797161, 2391484
@ -468,7 +468,8 @@ void mainSimpleSort(uint32_t* ptr,
int32_t d, int32_t d,
int32_t* budget) int32_t* budget)
{ {
int32_t bigN, hp; int32_t bigN;
int hp;
bigN = hi - lo + 1; bigN = hi - lo + 1;
if (bigN < 2) return; if (bigN < 2) return;
@ -478,15 +479,15 @@ void mainSimpleSort(uint32_t* ptr,
hp--; hp--;
for (; hp >= 0; hp--) { for (; hp >= 0; hp--) {
int32_t i, h; int32_t i;
unsigned h;
h = incs[hp]; h = incs[hp];
i = lo + h; i = lo + h;
while (1) { while (1) {
int32_t j; unsigned j;
uint32_t v; unsigned v;
/*-- copy 1 --*/
if (i > hi) break; if (i > hi) break;
v = ptr[i]; v = ptr[i];
j = i; j = i;
@ -511,7 +512,6 @@ void mainSimpleSort(uint32_t* ptr,
} }
ptr[j] = v; ptr[j] = v;
i++; i++;
/*-- copy 3 --*/ /*-- copy 3 --*/
if (i > hi) break; if (i > hi) break;
v = ptr[i]; v = ptr[i];