cleanup: Also padding is padding!

3v1n0 · 3v1n0 · commit f5b7e18bc682 · 2025-12-02T23:03:54.000+01:00
As previous commit, but tackle the *padding* fields
diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs
@@ -140,7 +140,7 @@ s! {
         pub st_nlink: crate::nlink_t,
         pub st_dev: crate::dev_t,
         pub st_mode: crate::mode_t,
-        pub st_padding1: u16,
+        st_padding1: Padding<u16>,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
         pub st_rdev: crate::dev_t,
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
@@ -226,10 +226,10 @@ s! {
         pub st_ino: crate::ino_t,
         pub st_nlink: crate::nlink_t,
         pub st_mode: crate::mode_t,
-        st_padding0: i16,
+        st_padding0: Padding<i16>,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
-        st_padding1: i32,
+        st_padding1: Padding<i32>,
         pub st_rdev: crate::dev_t,
         #[cfg(target_arch = "x86")]
         st_atim_ext: i32,
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
@@ -239,10 +239,10 @@ s! {
         pub st_ino: crate::ino_t,
         pub st_nlink: crate::nlink_t,
         pub st_mode: crate::mode_t,
-        st_padding0: i16,
+        st_padding0: Padding<i16>,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
-        st_padding1: i32,
+        st_padding1: Padding<i32>,
         pub st_rdev: crate::dev_t,
         #[cfg(target_arch = "x86")]
         st_atim_ext: i32,
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
@@ -240,10 +240,10 @@ s! {
         pub st_ino: crate::ino_t,
         pub st_nlink: crate::nlink_t,
         pub st_mode: crate::mode_t,
-        st_padding0: i16,
+        st_padding0: Padding<i16>,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
-        st_padding1: i32,
+        st_padding1: Padding<i32>,
         pub st_rdev: crate::dev_t,
         #[cfg(target_arch = "x86")]
         st_atim_ext: i32,
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
@@ -242,10 +242,10 @@ s! {
         pub st_ino: crate::ino_t,
         pub st_nlink: crate::nlink_t,
         pub st_mode: crate::mode_t,
-        st_padding0: i16,
+        st_padding0: Padding<i16>,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
-        st_padding1: i32,
+        st_padding1: Padding<i32>,
         pub st_rdev: crate::dev_t,
         #[cfg(target_arch = "x86")]
         st_atim_ext: i32,
diff --git a/src/unix/bsd/netbsdlike/openbsd/mod.rs b/src/unix/bsd/netbsdlike/openbsd/mod.rs
@@ -616,7 +616,7 @@ s! {
         pub d_reclen: u16,
         pub d_type: u8,
         pub d_namlen: u8,
-        __d_padding: [u8; 4],
+        __d_padding: Padding<[u8; 4]>,
         pub d_name: [c_char; 256],
     }
 
diff --git a/src/unix/cygwin/mod.rs b/src/unix/cygwin/mod.rs
@@ -268,7 +268,7 @@ s! {
     pub struct _uc_fpxreg {
         pub significand: [u16; 4],
         pub exponent: u16,
-        pub padding: [u16; 3],
+        padding: Padding<[u16; 3]>,
     }
 
     pub struct _uc_xmmreg {
@@ -286,7 +286,7 @@ s! {
         pub mxcr_mask: u32,
         pub st: [_uc_fpxreg; 8],
         pub xmm: [_uc_xmmreg; 16],
-        pub padding: [u32; 24],
+        padding: Padding<[u32; 24]>,
     }
 
     #[repr(align(16))]
diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs
@@ -371,7 +371,7 @@ s! {
     pub struct sem_t {
         pub type_: i32,
         pub named_sem_id: i32, // actually a union with unnamed_sem (i32)
-        pub padding: [i32; 2],
+        padding: Padding<[i32; 2]>,
     }
 
     pub struct ucred {
diff --git a/src/unix/hurd/mod.rs b/src/unix/hurd/mod.rs
@@ -285,7 +285,7 @@ s! {
     pub struct sockaddr_storage {
         pub ss_len: c_uchar,
         pub ss_family: sa_family_t,
-        pub __ss_padding: [c_char; 122usize],
+        __ss_padding: Padding<[c_char; 122usize]>,
         pub __ss_align: __uint32_t,
     }
 
diff --git a/src/unix/linux_like/android/b32/arm.rs b/src/unix/linux_like/android/b32/arm.rs
@@ -32,7 +32,7 @@ s! {
     pub struct __c_anonymous_uc_sigmask_with_padding {
         pub uc_sigmask: crate::sigset_t,
         /* Android has a wrong (smaller) sigset_t on x86. */
-        __padding_rt_sigset: u32,
+        __padding_rt_sigset: Padding<u32>,
     }
 
     pub struct ucontext_t {
diff --git a/src/unix/linux_like/android/b32/x86/mod.rs b/src/unix/linux_like/android/b32/x86/mod.rs
@@ -31,7 +31,7 @@ s! {
     pub struct __c_anonymous_uc_sigmask_with_padding {
         pub uc_sigmask: crate::sigset_t,
         /* Android has a wrong (smaller) sigset_t on x86. */
-        __padding_rt_sigset: u32,
+        __padding_rt_sigset: Padding<u32>,
     }
 
     pub struct ucontext_t {
@@ -40,7 +40,7 @@ s! {
         pub uc_stack: crate::stack_t,
         pub uc_mcontext: mcontext_t,
         pub uc_sigmask__c_anonymous_union: __c_anonymous_uc_sigmask,
-        __padding_rt_sigset: u32,
+        __padding_rt_sigset: Padding<u32>,
         __fpregs_mem: _libc_fpstate,
     }
 }
diff --git a/src/unix/linux_like/android/b64/x86_64/mod.rs b/src/unix/linux_like/android/b64/x86_64/mod.rs
@@ -151,7 +151,7 @@ s! {
         pub mxcr_mask: c_uint,
         pub st_space: [c_uint; 32],
         pub xmm_space: [c_uint; 64],
-        padding: [c_uint; 24],
+        padding: Padding<[c_uint; 24]>,
     }
 }
 
diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs
@@ -223,7 +223,7 @@ s! {
     pub struct stat {
         pub st_dev: crate::dev_t,
         #[cfg(emscripten_old_stat_abi)]
-        __st_dev_padding: c_int,
+        __st_dev_padding: Padding<c_int>,
         #[cfg(emscripten_old_stat_abi)]
         __st_ino_truncated: c_long,
         pub st_mode: mode_t,
@@ -232,7 +232,7 @@ s! {
         pub st_gid: crate::gid_t,
         pub st_rdev: crate::dev_t,
         #[cfg(emscripten_old_stat_abi)]
-        __st_rdev_padding: c_int,
+        __st_rdev_padding: Padding<c_int>,
         pub st_size: off_t,
         pub st_blksize: crate::blksize_t,
         pub st_blocks: crate::blkcnt_t,
diff --git a/src/unix/linux_like/linux/gnu/b32/x86/mod.rs b/src/unix/linux_like/linux/gnu/b32/x86/mod.rs
@@ -275,7 +275,7 @@ s! {
         __reserved: Padding<c_long>,
         pub st_space: [c_long; 32],
         pub xmm_space: [c_long; 32],
-        padding: [c_long; 56],
+        padding: Padding<[c_long; 56]>,
     }
 
     pub struct ucontext_t {
diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
@@ -301,7 +301,7 @@ s! {
         pub mxcr_mask: c_uint,
         pub st_space: [c_uint; 32],
         pub xmm_space: [c_uint; 64],
-        padding: [c_uint; 24],
+        padding: Padding<[c_uint; 24]>,
     }
 
     pub struct ucontext_t {
diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -224,7 +224,7 @@ s! {
         pub tp_rxhash: __u32,
         pub tp_vlan_tci: __u32,
         pub tp_vlan_tpid: __u16,
-        pub tp_padding: __u16,
+        tp_padding: Padding<__u16>,
     }
 
     pub struct tpacket2_hdr {
@@ -237,7 +237,7 @@ s! {
         pub tp_nsec: __u32,
         pub tp_vlan_tci: __u16,
         pub tp_vlan_tpid: __u16,
-        pub tp_padding: [__u8; 4],
+        tp_padding: Padding<[__u8; 4]>,
     }
 
     pub struct tpacket_req {
@@ -285,7 +285,7 @@ s! {
         pub tp_mac: __u16,
         pub tp_net: __u16,
         pub hv1: crate::tpacket_hdr_variant1,
-        pub tp_padding: [__u8; 8],
+        tp_padding: Padding<[__u8; 8]>,
     }
 
     pub struct tpacket_bd_ts {
diff --git a/src/unix/linux_like/linux/musl/b32/arm/mod.rs b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
@@ -6,14 +6,14 @@ pub type wchar_t = u32;
 s! {
     pub struct stat {
         pub st_dev: crate::dev_t,
-        __st_dev_padding: c_int,
+        __st_dev_padding: Padding<c_int>,
         __st_ino_truncated: c_long,
         pub st_mode: crate::mode_t,
         pub st_nlink: crate::nlink_t,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
         pub st_rdev: crate::dev_t,
-        __st_rdev_padding: c_int,
+        __st_rdev_padding: Padding<c_int>,
         pub st_size: off_t,
         pub st_blksize: crate::blksize_t,
         pub st_blocks: crate::blkcnt_t,
@@ -28,14 +28,14 @@ s! {
 
     pub struct stat64 {
         pub st_dev: crate::dev_t,
-        __st_dev_padding: c_int,
+        __st_dev_padding: Padding<c_int>,
         __st_ino_truncated: c_long,
         pub st_mode: crate::mode_t,
         pub st_nlink: crate::nlink_t,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
         pub st_rdev: crate::dev_t,
-        __st_rdev_padding: c_int,
+        __st_rdev_padding: Padding<c_int>,
         pub st_size: off_t,
         pub st_blksize: crate::blksize_t,
         pub st_blocks: crate::blkcnt_t,
diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs
@@ -12,10 +12,10 @@ s! {
         pub st_uid: c_uint,
         pub st_gid: c_uint,
         pub st_rdev: c_ulonglong,
-        __st_rdev_padding: c_ulong,
+        __st_rdev_padding: Padding<c_ulong>,
         pub st_size: c_longlong,
         pub st_blksize: crate::blksize_t,
-        __st_blksize_padding: c_int,
+        __st_blksize_padding: Padding<c_int>,
         pub st_blocks: crate::blkcnt_t,
         pub st_atime: crate::time_t,
         pub st_atime_nsec: c_long,
diff --git a/src/unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/linux_like/linux/musl/b32/powerpc.rs
@@ -23,7 +23,7 @@ s! {
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
         pub st_rdev: crate::dev_t,
-        __st_rdev_padding: c_short,
+        __st_rdev_padding: Padding<c_short>,
         pub st_size: off_t,
         pub st_blksize: crate::blksize_t,
         pub st_blocks: crate::blkcnt_t,
@@ -44,7 +44,7 @@ s! {
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
         pub st_rdev: crate::dev_t,
-        __st_rdev_padding: c_short,
+        __st_rdev_padding: Padding<c_short>,
         pub st_size: off_t,
         pub st_blksize: crate::blksize_t,
         pub st_blocks: crate::blkcnt_t,
diff --git a/src/unix/linux_like/linux/musl/b32/x86/mod.rs b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
@@ -6,14 +6,14 @@ pub type wchar_t = i32;
 s! {
     pub struct stat {
         pub st_dev: crate::dev_t,
-        __st_dev_padding: c_int,
+        __st_dev_padding: Padding<c_int>,
         __st_ino_truncated: c_long,
         pub st_mode: crate::mode_t,
         pub st_nlink: crate::nlink_t,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
         pub st_rdev: crate::dev_t,
-        __st_rdev_padding: c_int,
+        __st_rdev_padding: Padding<c_int>,
         pub st_size: off_t,
         pub st_blksize: crate::blksize_t,
         pub st_blocks: crate::blkcnt_t,
@@ -28,14 +28,14 @@ s! {
 
     pub struct stat64 {
         pub st_dev: crate::dev_t,
-        __st_dev_padding: c_int,
+        __st_dev_padding: Padding<c_int>,
         __st_ino_truncated: c_long,
         pub st_mode: crate::mode_t,
         pub st_nlink: crate::nlink_t,
         pub st_uid: crate::uid_t,
         pub st_gid: crate::gid_t,
         pub st_rdev: crate::dev_t,
-        __st_rdev_padding: c_int,
+        __st_rdev_padding: Padding<c_int>,
         pub st_size: off_t,
         pub st_blksize: crate::blksize_t,
         pub st_blocks: crate::blkcnt_t,
@@ -124,7 +124,7 @@ s! {
         __reserved: Padding<c_long>,
         pub st_space: [c_long; 32],
         pub xmm_space: [c_long; 32],
-        padding: [c_long; 56],
+        padding: Padding<[c_long; 56]>,
     }
 
     pub struct ucontext_t {
diff --git a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
@@ -157,7 +157,7 @@ s! {
         pub mxcr_mask: c_uint,
         pub st_space: [c_uint; 32],
         pub xmm_space: [c_uint; 64],
-        padding: [c_uint; 24],
+        padding: Padding<[c_uint; 24]>,
     }
 
     pub struct ucontext_t {
diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
@@ -230,7 +230,7 @@ s! {
         __opaque: *mut c_void,
         __padding: Padding<[*mut c_void; 4usize]>,
         __nsub2: size_t,
-        __padding2: c_char,
+        __padding2: Padding<c_char>,
     }
 
     pub struct rtentry {
@@ -293,7 +293,7 @@ s! {
         pub errcnt: c_long,
         pub stbcnt: c_long,
         pub tai: c_int,
-        pub __padding: [c_int; 11],
+        __padding: Padding<[c_int; 11]>,
     }
 
     pub struct ntptimeval {
diff --git a/src/unix/newlib/arm/mod.rs b/src/unix/newlib/arm/mod.rs
@@ -26,7 +26,7 @@ s! {
 
     pub struct sockaddr_storage {
         pub ss_family: crate::sa_family_t,
-        pub __ss_padding: [u8; 26],
+        __ss_padding: Padding<[u8; 26]>,
     }
 }
 
diff --git a/src/unix/newlib/horizon/mod.rs b/src/unix/newlib/horizon/mod.rs
@@ -35,7 +35,7 @@ s! {
 
     pub struct sockaddr_storage {
         pub ss_family: crate::sa_family_t,
-        pub __ss_padding: [c_char; 26usize],
+        __ss_padding: Padding<[c_char; 26usize]>,
     }
 
     pub struct sockaddr_in {
diff --git a/src/unix/nto/mod.rs b/src/unix/nto/mod.rs
@@ -615,7 +615,7 @@ s! {
         pub bs_recv: u64,
         pub bs_drop: u64,
         pub bs_capt: u64,
-        bs_padding: [u64; 13],
+        bs_padding: Padding<[u64; 13]>,
     }
 
     #[cfg(target_env = "nto71_iosock")]
@@ -694,9 +694,9 @@ s! {
 
     pub struct sigevent {
         pub sigev_notify: c_int,
-        pub __padding1: c_int,
+        __padding1: Padding<c_int>,
         pub sigev_signo: c_int, // union
-        pub __padding2: c_int,
+        __padding2: Padding<c_int>,
         pub sigev_value: crate::sigval,
         __sigev_un2: usize, // union
     }
diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs
@@ -61,7 +61,7 @@ s! {
 
     pub struct sockaddr_storage {
         pub ss_family: crate::sa_family_t,
-        __ss_padding: [u8; 128 - size_of::<sa_family_t>() - size_of::<c_ulong>()],
+        __ss_padding: Padding<[u8; 128 - size_of::<sa_family_t>() - size_of::<c_ulong>()]>,
         __ss_align: c_ulong,
     }
 

Original file line number	Diff line number	Diff line change
`@@ -616,7 +616,7 @@ s! {`
`616`	`616`	`pub d_reclen: u16,`
`617`	`617`	`pub d_type: u8,`
`618`	`618`	`pub d_namlen: u8,`
`619`		`- __d_padding: [u8; 4],`
	`619`	`+ __d_padding: Padding<[u8; 4]>,`
`620`	`620`	`pub d_name: [c_char; 256],`
`621`	`621`	`}`
`622`	`622`
Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ s! {`
`371`	`371`	`pub struct sem_t {`
`372`	`372`	`pub type_: i32,`
`373`	`373`	`pub named_sem_id: i32, // actually a union with unnamed_sem (i32)`
`374`		`- pub padding: [i32; 2],`
	`374`	`+ padding: Padding<[i32; 2]>,`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`pub struct ucred {`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ s! {`
`285`	`285`	`pub struct sockaddr_storage {`
`286`	`286`	`pub ss_len: c_uchar,`
`287`	`287`	`pub ss_family: sa_family_t,`
`288`		`- pub __ss_padding: [c_char; 122usize],`
	`288`	`+ __ss_padding: Padding<[c_char; 122usize]>,`
`289`	`289`	`pub __ss_align: __uint32_t,`
`290`	`290`	`}`
`291`	`291`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ s! {`
`32`	`32`	`pub struct __c_anonymous_uc_sigmask_with_padding {`
`33`	`33`	`pub uc_sigmask: crate::sigset_t,`
`34`	`34`	`/* Android has a wrong (smaller) sigset_t on x86. */`
`35`		`- __padding_rt_sigset: u32,`
	`35`	`+ __padding_rt_sigset: Padding<u32>,`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`pub struct ucontext_t {`