Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/libarchive/bz/compress.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/archival/libarchive/bz/compress.c (modified) (9 diffs)

branches/3.2/mindi-busybox/archival/libarchive/bz/compress.c

@@ -62 +62 @@
 static
 /* Helps only on level 5, on other levels hurts. ? */
-#if CONFIG_BZIP2_FEATURE_SPEED >= 5
+#if CONFIG_BZIP2_FAST >= 5
 ALWAYS_INLINE
 #endif
@@ -252 +252 @@
     int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;
     int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;
-    int32_t nGroups, nBytes;
+    int32_t nGroups;
 
     /*
@@ -332 +332 @@
                 s->rfreq[t][v] = 0;
 
-#if CONFIG_BZIP2_FEATURE_SPEED >= 5
+#if CONFIG_BZIP2_FAST >= 5
         /*
          * Set up an auxiliary length table which is used to fast-track
@@ -362 +362 @@
             for (t = 0; t < nGroups; t++)
                 cost[t] = 0;
-#if CONFIG_BZIP2_FEATURE_SPEED >= 5
+#if CONFIG_BZIP2_FAST >= 5
             if (nGroups == 6 && 50 == ge-gs+1) {
                 /*--- fast track the common case ---*/
@@ -421 +421 @@
              */
 /* 1% faster compress. +800 bytes */
-#if CONFIG_BZIP2_FEATURE_SPEED >= 4
+#if CONFIG_BZIP2_FAST >= 4
             if (nGroups == 6 && 50 == ge-gs+1) {
                 /*--- fast track the common case ---*/
@@ -513 +513 @@
         }
 
-        nBytes = s->numZ;
         bsW(s, 16, inUse16);
 
@@ -529 +528 @@
 
     /*--- Now the selectors. ---*/
-    nBytes = s->numZ;
     bsW(s, 3, nGroups);
     bsW(s, 15, nSelectors);
@@ -539 +537 @@
 
     /*--- Now the coding tables. ---*/
-    nBytes = s->numZ;
-
     for (t = 0; t < nGroups; t++) {
         int32_t curr = s->len[t][0];
@@ -552 +548 @@
 
     /*--- And finally, the block data proper ---*/
-    nBytes = s->numZ;
     selCtr = 0;
     gs = 0;