bzip2: code shrink

function                                             old     new   delta
sendMTFValues                                       2111    2100     -11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c
index 534cf665a8d641ee706752f922188c337d7adc71..992fd588451d200c16d71d12f4a6005699c0f6df 100644 (file)
--- a/archival/libarchive/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
@@ -289,11 +289,16 @@ void sendMTFValues(EState* s)
 
        /*--- Decide how many coding tables to use ---*/
        AssertH(s->nMTF > 0, 3001);
-       if (s->nMTF < 200)  nGroups = 2; else
-       if (s->nMTF < 600)  nGroups = 3; else
-       if (s->nMTF < 1200) nGroups = 4; else
-       if (s->nMTF < 2400) nGroups = 5; else
-       nGroups = 6;
+       // 1..199 = 2
+       // 200..599 = 3
+       // 600..1199 = 4
+       // 1200..2399 = 5
+       // else 6
+       nGroups = 2;
+       nGroups += (s->nMTF >= 200);
+       nGroups += (s->nMTF >= 600);
+       nGroups += (s->nMTF >= 1200);
+       nGroups += (s->nMTF >= 2400);
 
        /*--- Generate an initial set of coding tables ---*/
        {