Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive/bz/compress.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

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

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

@@ -250 +250 @@
 void sendMTFValues(EState* s)
 {
-    int32_t v, t, i, j, gs, ge, totc, bt, bc, iter;
+    int32_t v, t, i, j, gs, ge, bt, bc, iter;
     int32_t nSelectors, alphaSize, minLen, maxLen, selCtr;
     int32_t nGroups;
@@ -346 +346 @@
 #endif
         nSelectors = 0;
-        totc = 0;
         gs = 0;
         while (1) {
@@ -387 +386 @@
                 cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
                 cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
-
             } else
 #endif
@@ -412 +410 @@
                 }
             }
-            totc += bc;
             fave[bt]++;
             s->selector[nSelectors] = bt;
@@ -502 +499 @@
             if (sizeof(long) <= 4) {
                 inUse16 = inUse16*2 +
-                    ((*(uint32_t*)&(s->inUse[i * 16 + 0])
-                    | *(uint32_t*)&(s->inUse[i * 16 + 4])
-                    | *(uint32_t*)&(s->inUse[i * 16 + 8])
-                    | *(uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
+                    ((*(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 0])
+                    | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 4])
+                    | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 8])
+                    | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
             } else { /* Our CPU can do better */
                 inUse16 = inUse16*2 +
-                    ((*(uint64_t*)&(s->inUse[i * 16 + 0])
-                    | *(uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
+                    ((*(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 0])
+                    | *(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
             }
         }