Skip to content

Commit 1323bc3

Browse files
committed
cleanup: Also padding is padding!
As previous commit, but tackle the *padding* fields
1 parent 15856aa commit 1323bc3

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ s! {
140140
pub st_nlink: crate::nlink_t,
141141
pub st_dev: crate::dev_t,
142142
pub st_mode: crate::mode_t,
143-
pub st_padding1: u16,
143+
st_padding1: Padding<u16>,
144144
pub st_uid: crate::uid_t,
145145
pub st_gid: crate::gid_t,
146146
pub st_rdev: crate::dev_t,

src/unix/cygwin/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ s! {
268268
pub struct _uc_fpxreg {
269269
pub significand: [u16; 4],
270270
pub exponent: u16,
271-
pub padding: [u16; 3],
271+
padding: Padding<[u16; 3]>,
272272
}
273273

274274
pub struct _uc_xmmreg {
@@ -286,7 +286,7 @@ s! {
286286
pub mxcr_mask: u32,
287287
pub st: [_uc_fpxreg; 8],
288288
pub xmm: [_uc_xmmreg; 16],
289-
pub padding: [u32; 24],
289+
padding: Padding<[u32; 24]>,
290290
}
291291

292292
#[repr(align(16))]

src/unix/haiku/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ s! {
371371
pub struct sem_t {
372372
pub type_: i32,
373373
pub named_sem_id: i32, // actually a union with unnamed_sem (i32)
374-
pub padding: [i32; 2],
374+
padding: Padding<[i32; 2]>,
375375
}
376376

377377
pub struct ucred {

src/unix/hurd/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ s! {
285285
pub struct sockaddr_storage {
286286
pub ss_len: c_uchar,
287287
pub ss_family: sa_family_t,
288-
pub __ss_padding: [c_char; 122usize],
288+
__ss_padding: Padding<[c_char; 122usize]>,
289289
pub __ss_align: __uint32_t,
290290
}
291291

src/unix/linux_like/linux/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ s! {
224224
pub tp_rxhash: __u32,
225225
pub tp_vlan_tci: __u32,
226226
pub tp_vlan_tpid: __u16,
227-
pub tp_padding: __u16,
227+
tp_padding: Padding<__u16>,
228228
}
229229

230230
pub struct tpacket2_hdr {
@@ -237,7 +237,7 @@ s! {
237237
pub tp_nsec: __u32,
238238
pub tp_vlan_tci: __u16,
239239
pub tp_vlan_tpid: __u16,
240-
pub tp_padding: [__u8; 4],
240+
tp_padding: Padding<[__u8; 4]>,
241241
}
242242

243243
pub struct tpacket_req {
@@ -285,7 +285,7 @@ s! {
285285
pub tp_mac: __u16,
286286
pub tp_net: __u16,
287287
pub hv1: crate::tpacket_hdr_variant1,
288-
pub tp_padding: [__u8; 8],
288+
tp_padding: Padding<[__u8; 8]>,
289289
}
290290

291291
pub struct tpacket_bd_ts {

src/unix/linux_like/linux/musl/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ s! {
293293
pub errcnt: c_long,
294294
pub stbcnt: c_long,
295295
pub tai: c_int,
296-
pub __padding: [c_int; 11],
296+
__padding: Padding<[c_int; 11]>,
297297
}
298298

299299
pub struct ntptimeval {

src/unix/newlib/arm/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ s! {
2626

2727
pub struct sockaddr_storage {
2828
pub ss_family: crate::sa_family_t,
29-
pub __ss_padding: [u8; 26],
29+
__ss_padding: Padding<[u8; 26]>,
3030
}
3131
}
3232

src/unix/newlib/horizon/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ s! {
3535

3636
pub struct sockaddr_storage {
3737
pub ss_family: crate::sa_family_t,
38-
pub __ss_padding: [c_char; 26usize],
38+
__ss_padding: Padding<[c_char; 26usize]>,
3939
}
4040

4141
pub struct sockaddr_in {

src/unix/nto/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,9 +694,9 @@ s! {
694694

695695
pub struct sigevent {
696696
pub sigev_notify: c_int,
697-
pub __padding1: c_int,
697+
__padding1: Padding<c_int>,
698698
pub sigev_signo: c_int, // union
699-
pub __padding2: c_int,
699+
__padding2: Padding<c_int>,
700700
pub sigev_value: crate::sigval,
701701
__sigev_un2: usize, // union
702702
}

0 commit comments

Comments
 (0)