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

bzip2: eliminate one parameter to mainQSort3()

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

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

@ -468,8 +468,7 @@ void mainSimpleSort(uint32_t* ptr,
int32_t d, int32_t d,
int32_t* budget) int32_t* budget)
{ {
int32_t i, j, h, bigN, hp; int32_t bigN, hp;
uint32_t v;
bigN = hi - lo + 1; bigN = hi - lo + 1;
if (bigN < 2) return; if (bigN < 2) return;
@ -479,10 +478,14 @@ void mainSimpleSort(uint32_t* ptr,
hp--; hp--;
for (; hp >= 0; hp--) { for (; hp >= 0; hp--) {
h = incs[hp]; int32_t i, h;
h = incs[hp];
i = lo + h; i = lo + h;
while (1) { while (1) {
int32_t j;
uint32_t v;
/*-- copy 1 --*/ /*-- copy 1 --*/
if (i > hi) break; if (i > hi) break;
v = ptr[i]; v = ptr[i];
@ -592,9 +595,10 @@ void mainQSort3(uint32_t* ptr,
int32_t nblock, int32_t nblock,
int32_t loSt, int32_t loSt,
int32_t hiSt, int32_t hiSt,
int32_t dSt, /*int32_t dSt,*/
int32_t* budget) int32_t* budget)
{ {
enum { dSt = BZ_N_RADIX };
int32_t unLo, unHi, ltLo, gtHi, n, m, med; int32_t unLo, unHi, ltLo, gtHi, n, m, med;
int32_t sp, lo, hi, d; int32_t sp, lo, hi, d;
@ -880,7 +884,7 @@ void mainSort(EState* state,
if (hi > lo) { if (hi > lo) {
mainQSort3( mainQSort3(
ptr, block, quadrant, nblock, ptr, block, quadrant, nblock,
lo, hi, BZ_N_RADIX, budget lo, hi, /*BZ_N_RADIX,*/ budget
); );
if (*budget < 0) return; if (*budget < 0) return;
} }