Skip to content

Commit d0af9b2

Browse files
3v1n03v1n0
committed
cleanup: Set unused fields as private Padding
1 parent a711749 commit d0af9b2

File tree

11 files changed

+49
-49
lines changed

11 files changed

+49
-49
lines changed

‎src/unix/aix/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ s! {
443443
pub re_esub: [*mut c_void; 24],
444444
pub re_map: *mut c_uchar,
445445
pub __maxsub: c_int,
446-
pub __unused: [*mut c_void; 34],
446+
__unused: Padding<[*mut c_void; 34]>,
447447
}
448448

449449
pub struct rlimit64 {

‎src/unix/bsd/apple/b32/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ s! {
1313
pub ifi_hdrlen: c_uchar,
1414
pub ifi_recvquota: c_uchar,
1515
pub ifi_xmitquota: c_uchar,
16-
pub ifi_unused1: c_uchar,
16+
ifi_unused1: Padding<c_uchar>,
1717
pub ifi_mtu: u32,
1818
pub ifi_metric: u32,
1919
pub ifi_baudrate: u32,
@@ -31,7 +31,7 @@ s! {
3131
pub ifi_recvtiming: u32,
3232
pub ifi_xmittiming: u32,
3333
pub ifi_lastchange: crate::timeval,
34-
pub ifi_unused2: u32,
34+
ifi_unused2: Padding<u32>,
3535
pub ifi_hwassist: u32,
3636
ifi_reserved1: Padding<u32>,
3737
ifi_reserved2: Padding<u32>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ s! {
1616
pub ifi_hdrlen: c_uchar,
1717
pub ifi_recvquota: c_uchar,
1818
pub ifi_xmitquota: c_uchar,
19-
pub ifi_unused1: c_uchar,
19+
ifi_unused1: Padding<c_uchar>,
2020
pub ifi_mtu: u32,
2121
pub ifi_metric: u32,
2222
pub ifi_baudrate: u32,
@@ -34,7 +34,7 @@ s! {
3434
pub ifi_recvtiming: u32,
3535
pub ifi_xmittiming: u32,
3636
pub ifi_lastchange: timeval32,
37-
pub ifi_unused2: u32,
37+
ifi_unused2: Padding<u32>,
3838
pub ifi_hwassist: u32,
3939
ifi_reserved1: Padding<u32>,
4040
ifi_reserved2: Padding<u32>,

‎src/unix/bsd/apple/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@ s! {
13921392
pub ifi_hdrlen: c_uchar,
13931393
pub ifi_recvquota: c_uchar,
13941394
pub ifi_xmitquota: c_uchar,
1395-
pub ifi_unused1: c_uchar,
1395+
ifi_unused1: Padding<c_uchar>,
13961396
pub ifi_mtu: u32,
13971397
pub ifi_metric: u32,
13981398
pub ifi_baudrate: u64,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,14 +417,14 @@ s! {
417417
pub ut_line: [c_char; 32],
418418
pub ut_host: [c_char; 256],
419419

420-
pub ut_unused: [u8; 16],
420+
ut_unused: Padding<[u8; 16]>,
421421
pub ut_session: u16,
422422
pub ut_type: u16,
423423
pub ut_pid: crate::pid_t,
424424
ut_exit: exit_status,
425425
ut_ss: crate::sockaddr_storage,
426426
pub ut_tv: crate::timeval,
427-
pub ut_unused2: [u8; 16],
427+
ut_unused2: Padding<[u8; 16]>,
428428
}
429429

430430
pub struct lastlogx {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ s! {
353353
}
354354

355355
pub struct uucred {
356-
pub cr_unused: c_ushort,
356+
cr_unused: Padding<c_ushort>,
357357
pub cr_uid: crate::uid_t,
358358
pub cr_gid: crate::gid_t,
359359
pub cr_ngroups: c_short,

‎src/unix/hurd/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3330,8 +3330,8 @@ pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
33303330
__shpid: 0,
33313331
__type: PTHREAD_MUTEX_TIMED as c_int,
33323332
__flags: 0,
3333-
__reserved1: 0,
3334-
__reserved2: 0,
3333+
__reserved1: Padding::uninit(),
3334+
__reserved2: Padding::uninit(),
33353335
};
33363336
pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t {
33373337
__lock: __PTHREAD_SPIN_LOCK_INITIALIZER,

‎src/unix/linux_like/linux/gnu/b32/mod.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -236,17 +236,17 @@ s! {
236236
pub errcnt: c_longlong,
237237
pub stbcnt: c_longlong,
238238
pub tai: c_int,
239-
pub __unused1: i32,
240-
pub __unused2: i32,
241-
pub __unused3: i32,
242-
pub __unused4: i32,
243-
pub __unused5: i32,
244-
pub __unused6: i32,
245-
pub __unused7: i32,
246-
pub __unused8: i32,
247-
pub __unused9: i32,
248-
pub __unused10: i32,
249-
pub __unused11: i32,
239+
__unused1: Padding<i32>,
240+
__unused2: Padding<i32>,
241+
__unused3: Padding<i32>,
242+
__unused4: Padding<i32>,
243+
__unused5: Padding<i32>,
244+
__unused6: Padding<i32>,
245+
__unused7: Padding<i32>,
246+
__unused8: Padding<i32>,
247+
__unused9: Padding<i32>,
248+
__unused10: Padding<i32>,
249+
__unused11: Padding<i32>,
250250
}
251251

252252
#[cfg(not(gnu_time_bits64))]
@@ -271,17 +271,17 @@ s! {
271271
pub errcnt: c_long,
272272
pub stbcnt: c_long,
273273
pub tai: c_int,
274-
pub __unused1: i32,
275-
pub __unused2: i32,
276-
pub __unused3: i32,
277-
pub __unused4: i32,
278-
pub __unused5: i32,
279-
pub __unused6: i32,
280-
pub __unused7: i32,
281-
pub __unused8: i32,
282-
pub __unused9: i32,
283-
pub __unused10: i32,
284-
pub __unused11: i32,
274+
__unused1: Padding<i32>,
275+
__unused2: Padding<i32>,
276+
__unused3: Padding<i32>,
277+
__unused4: Padding<i32>,
278+
__unused5: Padding<i32>,
279+
__unused6: Padding<i32>,
280+
__unused7: Padding<i32>,
281+
__unused8: Padding<i32>,
282+
__unused9: Padding<i32>,
283+
__unused10: Padding<i32>,
284+
__unused11: Padding<i32>,
285285
}
286286
}
287287

‎src/unix/linux_like/linux/gnu/b64/mod.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,17 +164,17 @@ s! {
164164
#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))]
165165
pub stbcnt: c_long,
166166
pub tai: c_int,
167-
pub __unused1: i32,
168-
pub __unused2: i32,
169-
pub __unused3: i32,
170-
pub __unused4: i32,
171-
pub __unused5: i32,
172-
pub __unused6: i32,
173-
pub __unused7: i32,
174-
pub __unused8: i32,
175-
pub __unused9: i32,
176-
pub __unused10: i32,
177-
pub __unused11: i32,
167+
__unused1: Padding<i32>,
168+
__unused2: Padding<i32>,
169+
__unused3: Padding<i32>,
170+
__unused4: Padding<i32>,
171+
__unused5: Padding<i32>,
172+
__unused6: Padding<i32>,
173+
__unused7: Padding<i32>,
174+
__unused8: Padding<i32>,
175+
__unused9: Padding<i32>,
176+
__unused10: Padding<i32>,
177+
__unused11: Padding<i32>,
178178
}
179179
}
180180

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ s! {
659659
pub struct genlmsghdr {
660660
pub cmd: u8,
661661
pub version: u8,
662-
pub reserved: u16,
662+
reserved: Padding<u16>,
663663
}
664664

665665
pub struct in6_pktinfo {
@@ -702,7 +702,7 @@ s! {
702702

703703
pub struct sockaddr_vm {
704704
pub svm_family: crate::sa_family_t,
705-
pub svm_reserved1: c_ushort,
705+
svm_reserved1: Padding<c_ushort>,
706706
pub svm_port: c_uint,
707707
pub svm_cid: c_uint,
708708
pub svm_flags: u8,
@@ -812,7 +812,7 @@ s! {
812812
pub struct ptp_clock_time {
813813
pub sec: crate::__s64,
814814
pub nsec: __u32,
815-
pub reserved: __u32,
815+
reserved: Padding<__u32>,
816816
}
817817

818818
pub struct ptp_extts_request {
@@ -1190,7 +1190,7 @@ s! {
11901190
pub struct fanotify_event_metadata {
11911191
pub event_len: __u32,
11921192
pub vers: __u8,
1193-
pub reserved: __u8,
1193+
reserved: Padding<__u8>,
11941194
pub metadata_len: __u16,
11951195
pub mask: __u64,
11961196
pub fd: c_int,

0 commit comments

Comments
 (0)