[git commit] bzip2: eliminate one parameter to mainQSort3()

[Denys Vlasenko]

commit: https://git.busybox.net/busybox/commit/?id=8e31412231cc56e36bd4eb8410bffc78d0b252d9
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 archival/libarchive/bz/blocksort.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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