diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs index d02f3f87ae5c5..36d7e06b68f0e 100644 --- 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, 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/unix/aix/mod.rs b/src/unix/aix/mod.rs index 775061bdbd878..638ce53a03fa2 100644 --- 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, 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 { @@ -443,7 +443,7 @@ s! { pub re_esub: [*mut c_void; 24], pub re_map: *mut c_uchar, pub __maxsub: c_int, - pub __unused: [*mut c_void; 34], + __unused: Padding<[*mut c_void; 34]>, } pub struct rlimit64 { @@ -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, + shm_reserved1: Padding, } 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, 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 index a936ddb7e2f99..c6b24964ef200 100644 --- 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, } diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs index 2e3d333f7a4de..0283bd4afb4a9 100644 --- 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, pub clock_seq_low: u8, pub node: [u8; 6], } @@ -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, pub st_uid: crate::uid_t, pub st_gid: crate::gid_t, pub st_rdev: crate::dev_t, @@ -417,14 +417,14 @@ s! { pub ut_line: [c_char; 32], pub ut_host: [c_char; 256], - pub ut_unused: [u8; 16], + ut_unused: Padding<[u8; 16]>, pub ut_session: u16, pub ut_type: u16, pub ut_pid: crate::pid_t, ut_exit: exit_status, ut_ss: crate::sockaddr_storage, pub ut_tv: crate::timeval, - pub ut_unused2: [u8; 16], + ut_unused2: Padding<[u8; 16]>, } pub struct lastlogx { diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index 2e893b58d3c6f..5f1ebb4c11361 100644 --- 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, 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, + ksw_reserved2: Padding, } pub struct nlist { diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs index a8dc108ddd5f5..63285616c310a 100644 --- a/src/unix/bsd/netbsdlike/netbsd/mod.rs +++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs @@ -358,7 +358,7 @@ s! { } pub struct uucred { - pub cr_unused: c_ushort, + cr_unused: Padding, pub cr_uid: crate::uid_t, pub cr_gid: crate::gid_t, pub cr_ngroups: c_short, diff --git a/src/unix/cygwin/mod.rs b/src/unix/cygwin/mod.rs index 9d3a3b55cfeae..e190e18f4cd63 100644 --- 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 index c1259fe6e0c97..c5236ce3ee48e 100644 --- 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/haiku/x86_64.rs b/src/unix/haiku/x86_64.rs index 538ae30d438bf..4a6921d8d711d 100644 --- 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 index 3f2e3dd65b7f2..c4324e3837b3c 100644 --- a/src/unix/hurd/mod.rs +++ b/src/unix/hurd/mod.rs @@ -285,8 +285,8 @@ s! { pub struct sockaddr_storage { pub ss_len: c_uchar, pub ss_family: sa_family_t, - pub __ss_padding: [c_char; 122usize], - pub __ss_align: __uint32_t, + __ss_padding: Padding<[c_char; 122usize]>, + __ss_align: __uint32_t, } pub struct sockaddr_at { @@ -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, + __reserved2: Padding, } pub struct __pthread_condattr { @@ -3330,8 +3330,8 @@ pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { __shpid: 0, __type: PTHREAD_MUTEX_TIMED as c_int, __flags: 0, - __reserved1: 0, - __reserved2: 0, + __reserved1: Padding::uninit(), + __reserved2: Padding::uninit(), }; pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { __lock: __PTHREAD_SPIN_LOCK_INITIALIZER, diff --git a/src/unix/newlib/arm/mod.rs b/src/unix/newlib/arm/mod.rs index 26f3d52436b84..9b5978fc538c3 100644 --- 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 index ac500b1c79a32..5890a930f38f1 100644 --- a/src/unix/newlib/horizon/mod.rs +++ b/src/unix/newlib/horizon/mod.rs @@ -41,7 +41,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/newlib/vita/mod.rs b/src/unix/newlib/vita/mod.rs index 302601de96afd..95abf9076a05f 100644 --- a/src/unix/newlib/vita/mod.rs +++ b/src/unix/newlib/vita/mod.rs @@ -52,9 +52,9 @@ s! { pub struct sockaddr_storage { pub ss_len: u8, pub ss_family: crate::sa_family_t, - pub __ss_pad1: [u8; 2], - pub __ss_align: i64, - pub __ss_pad2: [u8; 116], + __ss_pad1: Padding<[u8; 2]>, + __ss_align: i64, + __ss_pad2: Padding<[u8; 116]>, } pub struct sched_param { diff --git a/src/unix/nto/mod.rs b/src/unix/nto/mod.rs index 2b8117866b837..57a35cc42814c 100644 --- a/src/unix/nto/mod.rs +++ b/src/unix/nto/mod.rs @@ -80,7 +80,7 @@ s! { pub struct dirent_extra { pub d_datalen: u16, pub d_type: u16, - pub d_reserved: u32, + d_reserved: Padding, } pub struct stat { @@ -182,14 +182,14 @@ s! { pub struct sched_param { pub sched_priority: c_int, pub sched_curpriority: c_int, - pub reserved: [c_int; 10], + reserved: Padding<[c_int; 10]>, } #[repr(align(8))] pub struct __sched_param { pub __sched_priority: c_int, pub __sched_curpriority: c_int, - pub reserved: [c_int; 10], + reserved: Padding<[c_int; 10]>, } pub struct Dl_info { @@ -236,7 +236,7 @@ s! { pub _Yes: *mut c_char, pub _Nostr: *mut c_char, pub _Yesstr: *mut c_char, - pub _Reserved: [*mut c_char; 8], + _Reserved: Padding<[*mut c_char; 8]>, } // Does not exist in io-sock @@ -694,9 +694,9 @@ s! { pub struct sigevent { pub sigev_notify: c_int, - pub __padding1: c_int, + __padding1: Padding, pub sigev_signo: c_int, // union - pub __padding2: c_int, + __padding2: Padding, pub sigev_value: crate::sigval, __sigev_un2: usize, // union } diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs index ad1b0f9d09815..a504ba936a982 100644 --- a/src/vxworks/mod.rs +++ b/src/vxworks/mod.rs @@ -234,10 +234,10 @@ s! { pub st_blksize: crate::blksize_t, pub st_blocks: crate::blkcnt_t, pub st_attrib: c_uchar, - pub st_reserved1: c_int, - pub st_reserved2: c_int, - pub st_reserved3: c_int, - pub st_reserved4: c_int, + st_reserved1: Padding, + st_reserved2: Padding, + st_reserved3: Padding, + st_reserved4: Padding, } //b_struct__Timespec.h @@ -587,9 +587,9 @@ s_no_extra_traits! { pub struct sockaddr_storage { pub ss_len: c_uchar, pub ss_family: crate::sa_family_t, - pub __ss_pad1: [c_char; _SS_PAD1SIZE], - pub __ss_align: i32, - pub __ss_pad2: [c_char; _SS_PAD2SIZE], + __ss_pad1: Padding<[c_char; _SS_PAD1SIZE]>, + __ss_align: i32, + __ss_pad2: Padding<[c_char; _SS_PAD2SIZE]>, } pub union sa_u_t {