Skip to content

Deprecate _pad field on siginfo_t #1329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 3 commits into from
May 2, 2019
Merged

Deprecate _pad field on siginfo_t #1329

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c2f669
Deprecate _pad field on siginfo_t
alex May 1, 2019
53591a6
Implement si_addr
alex May 1, 2019
9b43ade
Oops, move this outside the s! block
alex May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/unix/notbsd/linux/other/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ s! {
pub si_signo: ::c_int,
pub si_errno: ::c_int,
pub si_code: ::c_int,
#[deprecated(
since="0.2.54",
note="Please leave a comment on \
https://github.com/rust-lang/libc/pull/1316 if you're using \
this field"
)]
pub _pad: [::c_int; 29],
#[cfg(target_arch = "x86_64")]
_align: [u64; 0],
Expand Down Expand Up @@ -194,6 +200,19 @@ s! {
}
}

impl siginfo_t {
pub unsafe fn si_addr(&self) -> *mut ::c_void {
#[repr(C)]
struct siginfo_sigfault {
_si_signo: ::c_int,
_si_errno: ::c_int,
_si_code: ::c_int,
si_addr: *mut ::c_void
}
(*(self as *const siginfo_t as *const siginfo_sigfault)).si_addr
}
}

s_no_extra_traits! {
pub struct utmpx {
pub ut_type: ::c_short,
Expand Down