Skip to content

Commit e52c686

Browse files
3v1n0tgross35
3v1n0
authored and
tgross35
committed
cleanup: Also mark reserved fields as Padding
Some were already done, more were missing
1 parent 0745ad4 commit e52c686

File tree

26 files changed

+112
-112
lines changed

26 files changed

+112
-112
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ s! {
1010
// FIXME(1.0): This should not implement `PartialEq`
1111
#[allow(unpredictable_function_pointer_comparisons)]
1212
pub struct malloc_zone_t {
13-
_reserved1: *mut c_void,
14-
_reserved2: *mut c_void,
13+
_reserved1: Padding<*mut c_void>,
14+
_reserved2: Padding<*mut c_void>,
1515
pub size:
1616
Option<unsafe extern "C" fn(zone: *mut malloc_zone_t, ptr: *const c_void) -> size_t>,
1717
pub malloc:

‎src/unix/haiku/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ s! {
495495
pub ut_user: [c_char; 32],
496496
pub ut_line: [c_char; 16],
497497
pub ut_host: [c_char; 128],
498-
__ut_reserved: [c_char; 64],
498+
__ut_reserved: Padding<[c_char; 64]>,
499499
}
500500
}
501501

‎src/unix/haiku/native.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,10 +422,10 @@ s! {
422422
pub model: u32,
423423
pub family: u32,
424424
pub tpe: u32,
425-
__reserved_0: u32,
425+
__reserved_0: Padding<u32>,
426426
pub extended_model: u32,
427427
pub extended_family: u32,
428-
__reserved_1: u32,
428+
__reserved_1: Padding<u32>,
429429
pub brand_index: u32,
430430
pub clflush: u32,
431431
pub logical_cpus: u32,

‎src/unix/hurd/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ s! {
596596
pub aio_offset: off_t,
597597
#[cfg(all(not(target_arch = "x86_64"), target_pointer_width = "32"))]
598598
__unused1: Padding<[c_char; 4]>,
599-
__glibc_reserved: [c_char; 32],
599+
__glibc_reserved: Padding<[c_char; 32]>,
600600
}
601601

602602
pub struct mq_attr {
@@ -1041,7 +1041,7 @@ s! {
10411041
pub ut_tv: __timeval,
10421042

10431043
pub ut_addr_v6: [i32; 4],
1044-
__glibc_reserved: [c_char; 20],
1044+
__glibc_reserved: Padding<[c_char; 20]>,
10451045
}
10461046
}
10471047

‎src/unix/linux_like/android/b32/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ s! {
124124
pendingReaders: c_int,
125125
pendingWriters: c_int,
126126
attr: i32,
127-
__reserved: [c_char; 12],
127+
__reserved: Padding<[c_char; 12]>,
128128
}
129129

130130
pub struct pthread_barrier_t {
@@ -209,7 +209,7 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
209209
pendingReaders: 0,
210210
pendingWriters: 0,
211211
attr: 0,
212-
__reserved: [0; 12],
212+
__reserved: Padding::uninit(),
213213
};
214214
pub const PTHREAD_STACK_MIN: size_t = 4096 * 2;
215215
pub const CPU_SETSIZE: size_t = 32;

‎src/unix/linux_like/android/b64/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ s! {
118118

119119
pub struct pthread_mutex_t {
120120
value: c_int,
121-
__reserved: [c_char; 36],
121+
__reserved: Padding<[c_char; 36]>,
122122
}
123123

124124
pub struct pthread_cond_t {
125125
value: c_int,
126-
__reserved: [c_char; 44],
126+
__reserved: Padding<[c_char; 44]>,
127127
}
128128

129129
pub struct pthread_rwlock_t {
@@ -132,7 +132,7 @@ s! {
132132
pendingReaders: c_int,
133133
pendingWriters: c_int,
134134
attr: i32,
135-
__reserved: [c_char; 36],
135+
__reserved: Padding<[c_char; 36]>,
136136
}
137137

138138
pub struct sigset64_t {
@@ -155,19 +155,19 @@ pub const RTLD_DEFAULT: *mut c_void = ptr::null_mut();
155155

156156
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
157157
value: 0,
158-
__reserved: [0; 36],
158+
__reserved: Padding::uninit(),
159159
};
160160
pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t {
161161
value: 0,
162-
__reserved: [0; 44],
162+
__reserved: Padding::uninit(),
163163
};
164164
pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
165165
numLocks: 0,
166166
writerThreadId: 0,
167167
pendingReaders: 0,
168168
pendingWriters: 0,
169169
attr: 0,
170-
__reserved: [0; 36],
170+
__reserved: Padding::uninit(),
171171
};
172172
pub const PTHREAD_STACK_MIN: size_t = 4096 * 4;
173173
pub const CPU_SETSIZE: size_t = 1024;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ s! {
158158
pub f_flag: c_ulong,
159159
pub f_namemax: c_ulong,
160160
#[cfg(target_pointer_width = "64")]
161-
__f_reserved: [u32; 6],
161+
__f_reserved: Padding<[u32; 6]>,
162162
}
163163

164164
pub struct signalfd_siginfo {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,20 @@ s! {
151151
pub msg_perm: crate::ipc_perm,
152152
pub msg_stime: crate::time_t,
153153
#[cfg(not(gnu_time_bits64))]
154-
__glibc_reserved1: c_ulong,
154+
__glibc_reserved1: Padding<c_ulong>,
155155
pub msg_rtime: crate::time_t,
156156
#[cfg(not(gnu_time_bits64))]
157-
__glibc_reserved2: c_ulong,
157+
__glibc_reserved2: Padding<c_ulong>,
158158
pub msg_ctime: crate::time_t,
159159
#[cfg(not(gnu_time_bits64))]
160-
__glibc_reserved3: c_ulong,
160+
__glibc_reserved3: Padding<c_ulong>,
161161
pub __msg_cbytes: c_ulong,
162162
pub msg_qnum: crate::msgqnum_t,
163163
pub msg_qbytes: crate::msglen_t,
164164
pub msg_lspid: crate::pid_t,
165165
pub msg_lrpid: crate::pid_t,
166-
__glibc_reserved4: c_ulong,
167-
__glibc_reserved5: c_ulong,
166+
__glibc_reserved4: Padding<c_ulong>,
167+
__glibc_reserved5: Padding<c_ulong>,
168168
}
169169

170170
pub struct siginfo_t {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,18 +134,18 @@ s! {
134134
pub struct msqid_ds {
135135
pub msg_perm: crate::ipc_perm,
136136
pub msg_stime: crate::time_t,
137-
__glibc_reserved1: c_ulong,
137+
__glibc_reserved1: Padding<c_ulong>,
138138
pub msg_rtime: crate::time_t,
139-
__glibc_reserved2: c_ulong,
139+
__glibc_reserved2: Padding<c_ulong>,
140140
pub msg_ctime: crate::time_t,
141-
__glibc_reserved3: c_ulong,
141+
__glibc_reserved3: Padding<c_ulong>,
142142
pub __msg_cbytes: c_ulong,
143143
pub msg_qnum: crate::msgqnum_t,
144144
pub msg_qbytes: crate::msglen_t,
145145
pub msg_lspid: crate::pid_t,
146146
pub msg_lrpid: crate::pid_t,
147-
__glibc_reserved4: c_ulong,
148-
__glibc_reserved5: c_ulong,
147+
__glibc_reserved4: Padding<c_ulong>,
148+
__glibc_reserved5: Padding<c_ulong>,
149149
}
150150

151151
pub struct siginfo_t {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ s! {
5858
pub mode: crate::mode_t,
5959
__seq: c_ushort,
6060
__pad1: Padding<c_ushort>,
61-
__glibc_reserved1: c_ulong,
62-
__glibc_reserved2: c_ulong,
61+
__glibc_reserved1: Padding<c_ulong>,
62+
__glibc_reserved2: Padding<c_ulong>,
6363
}
6464

6565
pub struct stat64 {
@@ -119,33 +119,33 @@ s! {
119119
pub shm_perm: crate::ipc_perm,
120120
pub shm_segsz: size_t,
121121
pub shm_atime: crate::time_t,
122-
__glibc_reserved1: c_long,
122+
__glibc_reserved1: Padding<c_long>,
123123
pub shm_dtime: crate::time_t,
124-
__glibc_reserved2: c_long,
124+
__glibc_reserved2: Padding<c_long>,
125125
pub shm_ctime: crate::time_t,
126-
__glibc_reserved3: c_long,
126+
__glibc_reserved3: Padding<c_long>,
127127
pub shm_cpid: crate::pid_t,
128128
pub shm_lpid: crate::pid_t,
129129
pub shm_nattch: crate::shmatt_t,
130-
__glibc_reserved5: c_ulong,
131-
__glibc_reserved6: c_ulong,
130+
__glibc_reserved5: Padding<c_ulong>,
131+
__glibc_reserved6: Padding<c_ulong>,
132132
}
133133

134134
pub struct msqid_ds {
135135
pub msg_perm: crate::ipc_perm,
136136
pub msg_stime: crate::time_t,
137-
__glibc_reserved1: c_uint,
137+
__glibc_reserved1: Padding<c_uint>,
138138
pub msg_rtime: crate::time_t,
139-
__glibc_reserved2: c_uint,
139+
__glibc_reserved2: Padding<c_uint>,
140140
pub msg_ctime: crate::time_t,
141-
__glibc_reserved3: c_uint,
141+
__glibc_reserved3: Padding<c_uint>,
142142
pub __msg_cbytes: c_ulong,
143143
pub msg_qnum: crate::msgqnum_t,
144144
pub msg_qbytes: crate::msglen_t,
145145
pub msg_lspid: crate::pid_t,
146146
pub msg_lrpid: crate::pid_t,
147-
__glibc_reserved4: c_ulong,
148-
__glibc_reserved5: c_ulong,
147+
__glibc_reserved4: Padding<c_ulong>,
148+
__glibc_reserved5: Padding<c_ulong>,
149149
}
150150

151151
pub struct siginfo_t {

0 commit comments

Comments
 (0)