Skip to content

Commit dc20464

Browse files
committed
cleanup: Also unused fields are Padding ones
1 parent 8b70c76 commit dc20464

File tree

23 files changed

+34
-34
lines changed

23 files changed

+34
-34
lines changed

src/fuchsia/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ s! {
478478
#[cfg(target_endian = "little")]
479479
pub f_fsid: c_ulong,
480480
#[cfg(all(target_pointer_width = "32", not(target_arch = "x86_64")))]
481-
__f_unused: c_int,
481+
__f_unused: Padding<c_int>,
482482
#[cfg(target_endian = "big")]
483483
pub f_fsid: c_ulong,
484484
pub f_flag: c_ulong,

src/unix/bsd/freebsdlike/dragonfly/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ s! {
215215
pub cr_uid: crate::uid_t,
216216
pub cr_ngroups: c_short,
217217
pub cr_groups: [crate::gid_t; 16],
218-
__cr_unused1: *mut c_void,
218+
__cr_unused1: Padding<*mut c_void>,
219219
}
220220

221221
pub struct stack_t {
@@ -260,8 +260,8 @@ s! {
260260
pub cp_sys: u64,
261261
pub cp_intr: u64,
262262
pub cp_idel: u64,
263-
cp_unused01: u64,
264-
cp_unused02: u64,
263+
cp_unused01: Padding<u64>,
264+
cp_unused02: Padding<u64>,
265265
pub cp_sample_pc: u64,
266266
pub cp_sample_sp: u64,
267267
pub cp_msg: [c_char; 32],
@@ -382,8 +382,8 @@ s! {
382382
pub vm_daddr: *mut c_char,
383383
pub vm_maxsaddr: *mut c_char,
384384
pub vm_minsaddr: *mut c_char,
385-
_unused1: c_int,
386-
_unused2: c_int,
385+
_unused1: Padding<c_int>,
386+
_unused2: Padding<c_int>,
387387
pub vm_pagesupply: c_int,
388388
pub vm_holdcnt: c_uint,
389389
pub vm_refcnt: c_uint,

src/unix/bsd/freebsdlike/freebsd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@ s_no_extra_traits! {
16161616
}
16171617

16181618
pub union __c_anonymous_cr_pid {
1619-
__cr_unused: *mut c_void,
1619+
__cr_unused: Padding<*mut c_void>,
16201620
pub cr_pid: crate::pid_t,
16211621
}
16221622

src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ s! {
232232
))]
233233
ptm_pad1: Padding<[u8; 3]>,
234234
// actually a union with a non-unused, 0-initialized field
235-
ptm_unused: __pthread_spin_t,
235+
ptm_unused: Padding<__pthread_spin_t>,
236236
#[cfg(any(
237237
target_arch = "sparc",
238238
target_arch = "sparc64",
@@ -1282,7 +1282,7 @@ cfg_if! {
12821282
ptm_magic: 0x33330003,
12831283
ptm_errorcheck: 0,
12841284
ptm_pad1: Padding::uninit(),
1285-
ptm_unused: 0,
1285+
ptm_unused: Padding::uninit(),
12861286
ptm_pad2: Padding::uninit(),
12871287
ptm_waiters: 0 as *mut _,
12881288
ptm_owner: 0,
@@ -1293,7 +1293,7 @@ cfg_if! {
12931293
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
12941294
ptm_magic: 0x33330003,
12951295
ptm_errorcheck: 0,
1296-
ptm_unused: 0,
1296+
ptm_unused: Padding::uninit(),
12971297
ptm_waiters: 0 as *mut _,
12981298
ptm_owner: 0,
12991299
ptm_recursed: 0,

src/unix/bsd/netbsdlike/openbsd/aarch64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pub type ucontext_t = sigcontext;
44

55
s! {
66
pub struct sigcontext {
7-
__sc_unused: c_int,
7+
__sc_unused: Padding<c_int>,
88
pub sc_mask: c_int,
99
pub sc_sp: c_ulong,
1010
pub sc_lr: c_ulong,

src/unix/bsd/netbsdlike/openbsd/riscv64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pub type ucontext_t = sigcontext;
44

55
s! {
66
pub struct sigcontext {
7-
__sc_unused: c_int,
7+
__sc_unused: Padding<c_int>,
88
pub sc_mask: c_int,
99
pub sc_ra: c_long,
1010
pub sc_sp: c_long,

src/unix/bsd/netbsdlike/openbsd/x86_64.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ s! {
3232
pub sc_rsp: c_long,
3333
pub sc_ss: c_long,
3434
pub sc_fpstate: *mut fxsave64,
35-
__sc_unused: c_int,
35+
__sc_unused: Padding<c_int>,
3636
pub sc_mask: c_int,
3737
pub sc_cookie: c_long,
3838
}
@@ -42,15 +42,15 @@ s! {
4242
pub fx_fcw: u16,
4343
pub fx_fsw: u16,
4444
pub fx_ftw: u8,
45-
__fx_unused1: u8,
45+
__fx_unused1: Padding<u8>,
4646
pub fx_fop: u16,
4747
pub fx_rip: u64,
4848
pub fx_rdp: u64,
4949
pub fx_mxcsr: u32,
5050
pub fx_mxcsr_mask: u32,
5151
pub fx_st: [[u64; 2]; 8],
5252
pub fx_xmm: [[u64; 2]; 16],
53-
__fx_unused3: [u8; 96],
53+
__fx_unused3: Padding<[u8; 96]>,
5454
}
5555
}
5656

src/unix/cygwin/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ s! {
468468
__d_version: u32,
469469
pub d_ino: ino_t,
470470
pub d_type: c_uchar,
471-
__d_unused1: [c_uchar; 3],
471+
__d_unused1: Padding<[c_uchar; 3]>,
472472
__d_internal1: u32,
473473
pub d_name: [c_char; 256],
474474
}

src/unix/haiku/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,14 +292,14 @@ s! {
292292
pub struct pthread_mutex_t {
293293
flags: u32,
294294
lock: i32,
295-
unused: i32,
295+
unused: Padding<i32>,
296296
owner: i32,
297297
owner_count: i32,
298298
}
299299

300300
pub struct pthread_cond_t {
301301
flags: u32,
302-
unused: i32,
302+
unused: Padding<i32>,
303303
mutex: *mut c_void,
304304
waiter_count: i32,
305305
lock: i32,
@@ -1090,13 +1090,13 @@ pub const PTHREAD_STACK_MIN: size_t = 8192;
10901090
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
10911091
flags: 0,
10921092
lock: 0,
1093-
unused: -42,
1093+
unused: Padding::uninit(),
10941094
owner: -1,
10951095
owner_count: 0,
10961096
};
10971097
pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t {
10981098
flags: 0,
1099-
unused: -42,
1099+
unused: Padding::uninit(),
11001100
mutex: 0 as *mut _,
11011101
waiter_count: 0,
11021102
lock: 0,

src/unix/hurd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ s! {
708708
}
709709

710710
pub struct _IO_FILE {
711-
_unused: [u8; 0],
711+
_unused: Padding<[u8; 0]>,
712712
}
713713

714714
pub struct sched_param {

0 commit comments

Comments
 (0)