cleanup: Also mark reserved fields as Padding

Some were already done, more were missing

Author: 3v1n0

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 {

src/new/apple/xnu/mach/i386/_structs.rs

@@ -47,7 +47,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,
@@ -88,6 +88,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>,
     }
 }

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]>,
     }
 }
 

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 {

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 {

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 {

src/unix/bsd/apple/b64/x86_64/mod.rs

@@ -10,8 +10,8 @@ s! {
     // FIXME(1.0): This should not implement `PartialEq`
     #[allow(unpredictable_function_pointer_comparisons)]
     pub struct malloc_zone_t {
-        _reserved1: *mut c_void,
-        _reserved2: *mut c_void,
+        _reserved1: Padding<*mut c_void>,
+        _reserved2: Padding<*mut c_void>,
         pub size:
             Option<unsafe extern "C" fn(zone: *mut malloc_zone_t, ptr: *const c_void) -> size_t>,
         pub malloc:

src/unix/bsd/apple/mod.rs

@@ -3,10 +3,7 @@
 //! This covers *-apple-* triples currently
 
 use crate::prelude::*;
-use crate::{
-    cmsghdr,
-    off_t,
-};
+use crate::{cmsghdr, off_t};
 
 pub type wchar_t = i32;
 pub type clock_t = c_ulong;
@@ -333,10 +330,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 +343,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 +482,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 +666,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 +1012,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 +1282,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 +1481,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,
     }

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],
     }

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 {