summaryrefslogtreecommitdiffhomepage
path: root/archival/libarchive
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2018-02-03 18:11:08 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2018-02-03 18:11:08 +0100
commit9431bdd189859e3053bcb268116d6459964ebe60 (patch)
treee10bd98cb0f37314ab32803a86594e15deb24d58 /archival/libarchive
parentfe1bab4d35e6e3ab8ea8742556474ddedfdfeccb (diff)
bzip2: small simplification in mainSort()
function old new delta mainSort 1127 1118 -9 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libarchive')
-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 fe2b2c2f2..2e08f2f9d 100644
--- a/archival/libarchive/bz/blocksort.c
+++ b/archival/libarchive/bz/blocksort.c
@@ -833,13 +833,13 @@ void mainSort(EState* state,
/*h = h / 3;*/
h = (h * 171) >> 9; /* bbox: fast h/3 */
for (i = h; i <= 255; i++) {
- unsigned vv;
+ unsigned vv, jh;
vv = runningOrder[i]; /* uint8[] */
j = i;
- while (BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv)) {
- runningOrder[j] = runningOrder[j-h];
- j = j - h;
- if (j <= (h - 1))
+ while (jh = j - h, BIGFREQ(runningOrder[jh]) > BIGFREQ(vv)) {
+ runningOrder[j] = runningOrder[jh];
+ j = jh;
+ if (j < h)
break;
}
runningOrder[j] = vv;