Decompress shrink more fields

libbz2-rs-sys/src/bzlib.rs

@@ -546,7 +546,7 @@ pub(crate) struct DState {
     pub storedCombinedCRC: u32,
     pub calculatedBlockCRC: u32,
     pub calculatedCombinedCRC: u32,
-    pub nInUse: i32,
+    pub nInUse: u16,
     pub inUse: [bool; 256],
     pub inUse16: [bool; 16],
     pub seqToUnseq: [u8; 256],
@@ -563,13 +563,12 @@ pub(crate) struct DState {
 }
 
 #[derive(Default)]
+#[repr(C)]
 pub(crate) struct SaveArea {
     pub i: i32,
     pub j: i32,
     pub t: i32,
     pub alphaSize: i32,
-    pub nGroups: i32,
-    pub nSelectors: i32,
     pub EOB: i32,
     pub groupNo: i32,
     pub groupPos: i32,
@@ -578,10 +577,17 @@ pub(crate) struct SaveArea {
     pub nblock: i32,
     pub es: i32,
     pub N: i32,
-    pub curr: i32,
-    pub zn: i32,
     pub zvec: i32,
-    pub zj: i32,
+    pub _padding2: [u8; 2],
+    pub nSelectors: u16,
+    pub _padding4: [u8; 3],
+    pub zn: u8,
+    pub _padding1: [u8; 3],
+    pub nGroups: u8,
+    pub _padding3: [u8; 3],
+    pub curr: u8,
+    pub _padding0: [u8; 3],
+    pub zj: bool,
     pub gMinlen: u8,
     pub gSel: u8,
     pub gLimit: u8,