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

bzip2: eliminate write-only local numQSorted

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-02-03 17:30:16 +01:00
parent 2109fce410
commit 524fa29a93
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -730,7 +730,6 @@ void mainSort(EState* state,
int32_t* budget) int32_t* budget)
{ {
int32_t i, j; int32_t i, j;
int32_t numQSorted;
Bool bigDone[256]; Bool bigDone[256];
/* bbox: moved to EState to save stack /* bbox: moved to EState to save stack
int32_t runningOrder[256]; int32_t runningOrder[256];
@ -853,8 +852,6 @@ void mainSort(EState* state,
* The main sorting loop. * The main sorting loop.
*/ */
numQSorted = 0;
for (i = 0; /*i <= 255*/; i++) { for (i = 0; /*i <= 255*/; i++) {
int32_t ss; int32_t ss;
@ -887,7 +884,6 @@ void mainSort(EState* state,
lo, hi, BZ_N_RADIX, budget lo, hi, BZ_N_RADIX, budget
); );
if (*budget < 0) return; if (*budget < 0) return;
numQSorted += (hi - lo + 1);
} }
} }
ftab[sb] |= SETMASK; ftab[sb] |= SETMASK;
@ -940,6 +936,9 @@ void mainSort(EState* state,
for (j = 0; j <= 255; j++) for (j = 0; j <= 255; j++)
ftab[(j << 8) + ss] |= SETMASK; ftab[(j << 8) + ss] |= SETMASK;
if (i == 255)
break;
/* /*
* Step 3: * Step 3:
* The [ss] big bucket is now done. Record this fact, * The [ss] big bucket is now done. Record this fact,
@ -981,9 +980,6 @@ void mainSort(EState* state,
*/ */
bigDone[ss] = True; bigDone[ss] = True;
if (i == 255)
break;
{ {
int32_t bbStart = ftab[ss << 8] & CLEARMASK; int32_t bbStart = ftab[ss << 8] & CLEARMASK;
int32_t bbSize = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart; int32_t bbSize = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart;