diff options
Diffstat (limited to 'archival/libarchive/bz/blocksort.c')
-rw-r--r-- | archival/libarchive/bz/blocksort.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/archival/libarchive/bz/blocksort.c b/archival/libarchive/bz/blocksort.c index 7c5b6c552..0a9a597d0 100644 --- a/archival/libarchive/bz/blocksort.c +++ b/archival/libarchive/bz/blocksort.c | |||
@@ -113,9 +113,8 @@ void fallbackQSort3(uint32_t* fmap, | |||
113 | int32_t loSt, | 113 | int32_t loSt, |
114 | int32_t hiSt) | 114 | int32_t hiSt) |
115 | { | 115 | { |
116 | int32_t unLo, unHi, ltLo, gtHi, n, m; | 116 | int32_t sp; |
117 | int32_t sp, lo, hi; | 117 | uint32_t r; |
118 | uint32_t med, r, r3; | ||
119 | int32_t stackLo[FALLBACK_QSORT_STACK_SIZE]; | 118 | int32_t stackLo[FALLBACK_QSORT_STACK_SIZE]; |
120 | int32_t stackHi[FALLBACK_QSORT_STACK_SIZE]; | 119 | int32_t stackHi[FALLBACK_QSORT_STACK_SIZE]; |
121 | 120 | ||
@@ -125,6 +124,11 @@ void fallbackQSort3(uint32_t* fmap, | |||
125 | fpush(loSt, hiSt); | 124 | fpush(loSt, hiSt); |
126 | 125 | ||
127 | while (sp > 0) { | 126 | while (sp > 0) { |
127 | int32_t unLo, unHi, ltLo, gtHi, n, m; | ||
128 | int32_t lo, hi; | ||
129 | uint32_t med; | ||
130 | uint32_t r3; | ||
131 | |||
128 | AssertH(sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004); | 132 | AssertH(sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004); |
129 | 133 | ||
130 | fpop(lo, hi); | 134 | fpop(lo, hi); |
@@ -730,12 +734,11 @@ void mainSort(EState* state) | |||
730 | { | 734 | { |
731 | int32_t i, j; | 735 | int32_t i, j; |
732 | Bool bigDone[256]; | 736 | Bool bigDone[256]; |
733 | /* bbox: moved to EState to save stack | ||
734 | uint8_t runningOrder[256]; | 737 | uint8_t runningOrder[256]; |
738 | /* bbox: moved to EState to save stack | ||
735 | int32_t copyStart[256]; | 739 | int32_t copyStart[256]; |
736 | int32_t copyEnd [256]; | 740 | int32_t copyEnd [256]; |
737 | */ | 741 | */ |
738 | #define runningOrder (state->mainSort__runningOrder) | ||
739 | #define copyStart (state->mainSort__copyStart) | 742 | #define copyStart (state->mainSort__copyStart) |
740 | #define copyEnd (state->mainSort__copyEnd) | 743 | #define copyEnd (state->mainSort__copyEnd) |
741 | 744 | ||