aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/libarchive/bz/blocksort.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/archival/libarchive/bz/blocksort.c b/archival/libarchive/bz/blocksort.c
index c2d5f15c6..fe2b2c2f2 100644
--- a/archival/libarchive/bz/blocksort.c
+++ b/archival/libarchive/bz/blocksort.c
@@ -852,7 +852,7 @@ void mainSort(EState* state,
852 */ 852 */
853 853
854 for (i = 0; /*i <= 255*/; i++) { 854 for (i = 0; /*i <= 255*/; i++) {
855 int32_t ss; 855 unsigned ss;
856 856
857 /* 857 /*
858 * Process big buckets, starting with the least full. 858 * Process big buckets, starting with the least full.
@@ -980,14 +980,14 @@ void mainSort(EState* state,
980 bigDone[ss] = True; 980 bigDone[ss] = True;
981 981
982 { 982 {
983 int32_t bbStart = ftab[ss << 8] & CLEARMASK; 983 unsigned bbStart = ftab[ss << 8] & CLEARMASK;
984 int32_t bbSize = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart; 984 unsigned bbSize = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart;
985 int32_t shifts = 0; 985 unsigned shifts = 0;
986 986
987 while ((bbSize >> shifts) > 65534) shifts++; 987 while ((bbSize >> shifts) > 65534) shifts++;
988 988
989 for (j = bbSize-1; j >= 0; j--) { 989 for (j = bbSize-1; j >= 0; j--) {
990 int32_t a2update = ptr[bbStart + j]; 990 unsigned a2update = ptr[bbStart + j]; /* uint32[] */
991 uint16_t qVal = (uint16_t)(j >> shifts); 991 uint16_t qVal = (uint16_t)(j >> shifts);
992 quadrant[a2update] = qVal; 992 quadrant[a2update] = qVal;
993 if (a2update < BZ_N_OVERSHOOT) 993 if (a2update < BZ_N_OVERSHOOT)