cleanup: Also mark reserved fields as private Padding

3v1n0 · 3v1n0 · commit a71174946161 · 2025-12-03T03:09:46.000+01:00
Some were already done, more were missing
diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs
@@ -321,7 +321,7 @@ s! {
 
     pub struct sockaddr_vm {
         pub svm_family: sa_family_t,
-        pub svm_reserved1: c_ushort,
+        svm_reserved1: Padding<c_ushort>,
         pub svm_port: crate::in_port_t,
         pub svm_cid: c_uint,
         pub svm_zero: [u8; 4],
@@ -890,7 +890,7 @@ s! {
         pub totalhigh: c_ulong,
         pub freehigh: c_ulong,
         pub mem_unit: c_uint,
-        pub __reserved: [c_char; 256],
+        __reserved: Padding<[c_char; 256]>,
     }
 
     pub struct sockaddr_un {
diff --git a/src/new/apple/xnu/mach/i386/_structs.rs b/src/new/apple/xnu/mach/i386/_structs.rs
@@ -46,7 +46,7 @@ s! {
     }
 
     pub struct __darwin_x86_float_state64 {
-        pub __fpu_reserved: [c_int; 2],
+        __fpu_reserved: Padding<[c_int; 2]>,
         __fpu_fcw: c_short,
         __fpu_fsw: c_short,
         pub __fpu_ftw: u8,
@@ -87,6 +87,6 @@ s! {
         // FIXME(apple): this field is actually [u8; 96], but defining it with a bigger type allows
         // us to auto-implement traits for it since the length of the array is less than 32
         __fpu_rsrv4: [u32; 24],
-        pub __fpu_reserved1: c_int,
+        __fpu_reserved1: Padding<c_int>,
     }
 }
diff --git a/src/unix/aix/mod.rs b/src/unix/aix/mod.rs
@@ -317,7 +317,7 @@ s! {
 
     pub struct xutsname {
         pub nid: c_uint,
-        pub reserved: c_int,
+        reserved: Padding<c_int>,
         pub longnid: c_ulonglong,
     }
 
@@ -368,7 +368,7 @@ s! {
     pub struct sched_param {
         pub sched_priority: c_int,
         pub sched_policy: c_int,
-        pub sched_reserved: [c_int; 6],
+        sched_reserved: Padding<[c_int; 6]>,
     }
 
     pub struct stack_t {
@@ -423,8 +423,8 @@ s! {
         pub ut_exit: exit_status,
         pub ut_host: [c_char; 256],
         __dbl_word_pad: Padding<c_int>,
-        pub __reservedA: [c_int; 2],
-        pub __reservedV: [c_int; 6],
+        __reservedA: Padding<[c_int; 2]>,
+        __reservedV: Padding<[c_int; 6]>,
     }
 
     pub struct regmatch_t {
@@ -465,8 +465,8 @@ s! {
         pub shm_extshm: c_int,
         pub shm_pagesize: crate::int64_t,
         pub shm_lba: crate::uint64_t,
-        pub shm_reserved0: crate::int64_t,
-        pub shm_reserved1: crate::int64_t,
+        shm_reserved0: Padding<crate::int64_t>,
+        shm_reserved1: Padding<crate::int64_t>,
     }
 
     pub struct stat64 {
@@ -488,7 +488,7 @@ s! {
         pub st_vfs: c_uint,
         pub st_type: c_uint,
         pub st_gen: c_uint,
-        pub st_reserved: [c_uint; 10],
+        st_reserved: Padding<[c_uint; 10]>,
         pub st_size: off64_t,
     }
 
@@ -508,7 +508,7 @@ s! {
         pub cgid: crate::gid_t,
         pub mode: mode_t,
         pub seq: c_ushort,
-        pub __reserved: c_ushort,
+        __reserved: Padding<c_ushort>,
         pub key: key_t,
     }
 
@@ -552,7 +552,7 @@ s! {
         pub events: c_short,
         pub fd: c_int,
         pub u: __poll_ctl_ext_u,
-        pub reserved64: [u64; 6],
+        reserved64: Padding<[u64; 6]>,
     }
 }
 
diff --git a/src/unix/aix/powerpc64.rs b/src/unix/aix/powerpc64.rs
@@ -77,7 +77,7 @@ s! {
         pub st_vfs: c_uint,
         pub st_type: c_uint,
         pub st_gen: c_uint,
-        pub st_reserved: [c_uint; 9],
+        st_reserved: Padding<[c_uint; 9]>,
         pub st_padto_ll: c_uint,
         pub st_size: off_t,
     }
@@ -117,7 +117,7 @@ s! {
         pub aio_word2: c_int,
         pub aio_fp: c_int,
         pub aio_handle: *mut aiocb,
-        pub aio_reserved: [c_uint; 2],
+        aio_reserved: Padding<[c_uint; 2]>,
         pub aio_sigev_tid: c_long,
     }
 
@@ -191,7 +191,7 @@ s! {
         pub __ukeys: [c_uint; 2],
         pub __vsx: crate::__vsx_context_t,
         pub __tm: crate::__tm_context_t,
-        pub __reserved: [c_char; 1860],
+        __reserved: Padding<[c_char; 1860]>,
         pub __extctx_magic: c_int,
     }
 
@@ -216,8 +216,8 @@ s! {
         pub ut_tv: crate::timeval,
         pub ut_host: [c_char; 256],
         __dbl_word_pad: Padding<c_int>,
-        pub __reservedA: [c_int; 2],
-        pub __reservedV: [c_int; 6],
+        __reservedA: Padding<[c_int; 2]>,
+        __reservedV: Padding<[c_int; 6]>,
     }
 
     pub struct pthread_spinlock_t {
diff --git a/src/unix/bsd/apple/b32/mod.rs b/src/unix/bsd/apple/b32/mod.rs
@@ -33,8 +33,8 @@ s! {
         pub ifi_lastchange: crate::timeval,
         pub ifi_unused2: u32,
         pub ifi_hwassist: u32,
-        pub ifi_reserved1: u32,
-        pub ifi_reserved2: u32,
+        ifi_reserved1: Padding<u32>,
+        ifi_reserved2: Padding<u32>,
     }
 
     pub struct bpf_hdr {
diff --git a/src/unix/bsd/apple/b64/mod.rs b/src/unix/bsd/apple/b64/mod.rs
@@ -36,8 +36,8 @@ s! {
         pub ifi_lastchange: timeval32,
         pub ifi_unused2: u32,
         pub ifi_hwassist: u32,
-        pub ifi_reserved1: u32,
-        pub ifi_reserved2: u32,
+        ifi_reserved1: Padding<u32>,
+        ifi_reserved2: Padding<u32>,
     }
 
     pub struct bpf_hdr {
diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -333,10 +333,10 @@ s! {
     }
 
     pub struct fpunchhole_t {
-        pub fp_flags: c_uint, /* unused */
-        pub reserved: c_uint, /* (to maintain 8-byte alignment) */
-        pub fp_offset: off_t, /* IN: start of the region */
-        pub fp_length: off_t, /* IN: size of the region */
+        pub fp_flags: c_uint,      /* unused */
+        reserved: Padding<c_uint>, /* (to maintain 8-byte alignment) */
+        pub fp_offset: off_t,      /* IN: start of the region */
+        pub fp_length: off_t,      /* IN: size of the region */
     }
 
     pub struct ftrimactivefile_t {
@@ -346,7 +346,7 @@ s! {
 
     pub struct fspecread_t {
         pub fsr_flags: c_uint,
-        pub reserved: c_uint,
+        reserved: Padding<c_uint>,
         pub fsr_offset: off_t,
         pub fsr_length: off_t,
     }
@@ -485,7 +485,7 @@ s! {
         pub rtm_addrs: c_int,
         pub rtm_refcnt: i32,
         pub rtm_parentflags: c_int,
-        pub rtm_reserved: c_int,
+        rtm_reserved: Padding<c_int>,
         pub rtm_use: c_int,
         pub rtm_inits: u32,
         pub rtm_rmx: rt_metrics,
@@ -669,7 +669,7 @@ s! {
         pub ss_sysaddr: u16,
         pub sc_id: u32,
         pub sc_unit: u32,
-        pub sc_reserved: [u32; 5],
+        sc_reserved: Padding<[u32; 5]>,
     }
 
     pub struct in_pktinfo {
@@ -1015,7 +1015,7 @@ s! {
 
     pub struct attrlist {
         pub bitmapcount: c_ushort,
-        pub reserved: u16,
+        reserved: Padding<u16>,
         pub commonattr: attrgroup_t,
         pub volattr: attrgroup_t,
         pub dirattr: attrgroup_t,
@@ -1285,7 +1285,7 @@ s! {
         pub f_mntonname: [c_char; 1024],
         pub f_mntfromname: [c_char; 1024],
         pub f_flags_ext: u32,
-        pub f_reserved: [u32; 7],
+        f_reserved: Padding<[u32; 7]>,
     }
 
     pub struct dirent {
@@ -1484,7 +1484,7 @@ s! {
     pub struct sockaddr_vm {
         pub svm_len: c_uchar,
         pub svm_family: crate::sa_family_t,
-        pub svm_reserved1: c_ushort,
+        svm_reserved1: Padding<c_ushort>,
         pub svm_port: c_uint,
         pub svm_cid: c_uint,
     }
diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs
@@ -101,7 +101,7 @@ s! {
         pub time_low: u32,
         pub time_mid: u16,
         pub time_hi_and_version: u16,
-        pub clock_seq_hi_and_reserved: u8,
+        clock_seq_hi_and_reserved: Padding<u8>,
         pub clock_seq_low: u8,
         pub node: [u8; 6],
     }
diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -361,7 +361,7 @@ s! {
         pub time_low: u32,
         pub time_mid: u16,
         pub time_hi_and_version: u16,
-        pub clock_seq_hi_and_reserved: u8,
+        clock_seq_hi_and_reserved: Padding<u8>,
         pub clock_seq_low: u8,
         pub node: [u8; _UUID_NODE_LEN],
     }
@@ -488,8 +488,8 @@ s! {
         pub ksw_used: u_int,
         pub ksw_total: u_int,
         pub ksw_flags: c_int,
-        pub ksw_reserved1: u_int,
-        pub ksw_reserved2: u_int,
+        ksw_reserved1: Padding<u_int>,
+        ksw_reserved2: Padding<u_int>,
     }
 
     pub struct nlist {
diff --git a/src/unix/haiku/x86_64.rs b/src/unix/haiku/x86_64.rs
@@ -12,13 +12,13 @@ s! {
         pub mscsr_mask: c_uint,
         pub _fpreg: [[c_uchar; 8]; 16],
         pub _xmm: [[c_uchar; 16]; 16],
-        pub _reserved_416_511: [c_uchar; 96],
+        _reserved_416_511: Padding<[c_uchar; 96]>,
     }
 
     pub struct xstate_hdr {
         pub bv: c_ulong,
         pub xcomp_bv: c_ulong,
-        pub _reserved: [c_uchar; 48],
+        _reserved: Padding<[c_uchar; 48]>,
     }
 
     pub struct savefpu {
diff --git a/src/unix/hurd/mod.rs b/src/unix/hurd/mod.rs
@@ -634,8 +634,8 @@ s! {
         pub __shpid: c_int,
         pub __type: c_int,
         pub __flags: c_int,
-        pub __reserved1: c_uint,
-        pub __reserved2: c_uint,
+        __reserved1: Padding<c_uint>,
+        __reserved2: Padding<c_uint>,
     }
 
     pub struct __pthread_condattr {
diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs
@@ -194,7 +194,7 @@ s! {
     pub struct genlmsghdr {
         pub cmd: u8,
         pub version: u8,
-        pub reserved: u16,
+        reserved: Padding<u16>,
     }
 
     pub struct nlmsghdr {
@@ -271,7 +271,7 @@ s! {
 
     pub struct sockaddr_vm {
         pub svm_family: crate::sa_family_t,
-        pub svm_reserved1: c_ushort,
+        svm_reserved1: Padding<c_ushort>,
         pub svm_port: c_uint,
         pub svm_cid: c_uint,
         pub svm_zero: [u8; 4],
diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs
@@ -357,7 +357,7 @@ s! {
         pub totalhigh: c_ulong,
         pub freehigh: c_ulong,
         pub mem_unit: c_uint,
-        pub __reserved: [c_char; 256],
+        __reserved: Padding<[c_char; 256]>,
     }
 
     pub struct mq_attr {
diff --git a/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs b/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs
@@ -234,7 +234,7 @@ s_no_extra_traits! {
     pub struct __riscv_mc_q_ext_state {
         pub __f: [c_ulonglong; 64],
         pub __fcsr: c_uint,
-        pub __glibc_reserved: [c_uint; 3],
+        __glibc_reserved: Padding<[c_uint; 3]>,
     }
 }
 
diff --git a/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs
@@ -199,7 +199,7 @@ s! {
         pub orig_a0: u64,
         pub csr_era: u64,
         pub csr_badv: u64,
-        pub reserved: [u64; 10],
+        reserved: Padding<[u64; 10]>,
     }
 
     pub struct user_fp_struct {
diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs
@@ -254,7 +254,7 @@ s_no_extra_traits! {
         pub gp_regs: crate::gregset_t,
         pub fp_regs: crate::fpregset_t,
         pub v_regs: *mut vrregset_t,
-        pub vmx_reserve: [c_long; __NVRREG + __NVRREG + 1],
+        vmx_reserve: Padding<[c_long; __NVRREG + __NVRREG + 1]>,
     }
 
     #[repr(align(16))]
diff --git a/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs b/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs
@@ -284,7 +284,7 @@ s_no_extra_traits! {
     pub struct __riscv_mc_q_ext_state {
         pub __f: [c_ulonglong; 64],
         pub __fcsr: c_uint,
-        pub __glibc_reserved: [c_uint; 3],
+        __glibc_reserved: Padding<[c_uint; 3]>,
     }
 }
 
diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs
@@ -136,10 +136,10 @@ s! {
         pub maxerror: c_long,
         pub esterror: c_long,
         pub tai: c_long,
-        pub __glibc_reserved1: c_long,
-        pub __glibc_reserved2: c_long,
-        pub __glibc_reserved3: c_long,
-        pub __glibc_reserved4: c_long,
+        __glibc_reserved1: Padding<c_long>,
+        __glibc_reserved2: Padding<c_long>,
+        __glibc_reserved3: Padding<c_long>,
+        __glibc_reserved4: Padding<c_long>,
     }
 
     pub struct regex_t {
@@ -155,7 +155,7 @@ s! {
 
     pub struct Elf64_Chdr {
         pub ch_type: crate::Elf64_Word,
-        pub ch_reserved: crate::Elf64_Word,
+        ch_reserved: Padding<crate::Elf64_Word>,
         pub ch_size: crate::Elf64_Xword,
         pub ch_addralign: crate::Elf64_Xword,
     }
diff --git a/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs
@@ -75,7 +75,7 @@ s! {
         pub orig_a0: u64,
         pub csr_era: u64,
         pub csr_badv: u64,
-        pub reserved: [u64; 10],
+        reserved: Padding<[u64; 10]>,
     }
 
     pub struct user_fp_struct {
diff --git a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs
@@ -123,7 +123,7 @@ s_no_extra_traits! {
     pub struct __riscv_mc_q_ext_state {
         pub __f: [c_ulonglong; 64],
         pub __fcsr: c_uint,
-        pub __glibc_reserved: [c_uint; 3],
+        __glibc_reserved: Padding<[c_uint; 3]>,
     }
 }
 
diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
diff --git a/src/unix/nto/mod.rs b/src/unix/nto/mod.rs
diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ s! {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`pub struct __darwin_x86_float_state64 {`
`49`		`- pub __fpu_reserved: [c_int; 2],`
	`49`	`+ __fpu_reserved: Padding<[c_int; 2]>,`
`50`	`50`	`__fpu_fcw: c_short,`
`51`	`51`	`__fpu_fsw: c_short,`
`52`	`52`	`pub __fpu_ftw: u8,`
`@@ -87,6 +87,6 @@ s! {`
`87`	`87`	`// FIXME(apple): this field is actually [u8; 96], but defining it with a bigger type allows`
`88`	`88`	`// us to auto-implement traits for it since the length of the array is less than 32`
`89`	`89`	`__fpu_rsrv4: [u32; 24],`
`90`		`- pub __fpu_reserved1: c_int,`
	`90`	`+ __fpu_reserved1: Padding<c_int>,`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ s! {`
`101`	`101`	`pub time_low: u32,`
`102`	`102`	`pub time_mid: u16,`
`103`	`103`	`pub time_hi_and_version: u16,`
`104`		`- pub clock_seq_hi_and_reserved: u8,`
	`104`	`+ clock_seq_hi_and_reserved: Padding<u8>,`
`105`	`105`	`pub clock_seq_low: u8,`
`106`	`106`	`pub node: [u8; 6],`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@ s! {`
`12`	`12`	`pub mscsr_mask: c_uint,`
`13`	`13`	`pub _fpreg: [[c_uchar; 8]; 16],`
`14`	`14`	`pub _xmm: [[c_uchar; 16]; 16],`
`15`		`- pub _reserved_416_511: [c_uchar; 96],`
	`15`	`+ _reserved_416_511: Padding<[c_uchar; 96]>,`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`pub struct xstate_hdr {`
`19`	`19`	`pub bv: c_ulong,`
`20`	`20`	`pub xcomp_bv: c_ulong,`
`21`		`- pub _reserved: [c_uchar; 48],`
	`21`	`+ _reserved: Padding<[c_uchar; 48]>,`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`pub struct savefpu {`