Skip to content

Commit c52c408

Browse files
committed
Merge remote-tracking branch 'origin/master' into issue_1275
2 parents 46c767d + 2c24405 commit c52c408

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/sys/quota.rs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use crate::errno::Errno;
2121
struct QuotaCmd(QuotaSubCmd, QuotaType);
2222

2323
impl QuotaCmd {
24+
#[allow(unused_unsafe)]
2425
fn as_int(&self) -> c_int {
2526
unsafe { libc::QCMD(self.0 as i32, self.1 as i32) }
2627
}

src/sys/wait.rs

+9
Original file line numberDiff line numberDiff line change
@@ -117,35 +117,43 @@ impl WaitStatus {
117117
}
118118
}
119119

120+
#[allow(unused_unsafe)]
120121
fn exited(status: i32) -> bool {
121122
unsafe { libc::WIFEXITED(status) }
122123
}
123124

125+
#[allow(unused_unsafe)]
124126
fn exit_status(status: i32) -> i32 {
125127
unsafe { libc::WEXITSTATUS(status) }
126128
}
127129

130+
#[allow(unused_unsafe)]
128131
fn signaled(status: i32) -> bool {
129132
unsafe { libc::WIFSIGNALED(status) }
130133
}
131134

135+
#[allow(unused_unsafe)]
132136
fn term_signal(status: i32) -> Result<Signal> {
133137
Signal::try_from(unsafe { libc::WTERMSIG(status) })
134138
}
135139

140+
#[allow(unused_unsafe)]
136141
fn dumped_core(status: i32) -> bool {
137142
unsafe { libc::WCOREDUMP(status) }
138143
}
139144

145+
#[allow(unused_unsafe)]
140146
fn stopped(status: i32) -> bool {
141147
unsafe { libc::WIFSTOPPED(status) }
142148
}
143149

150+
#[allow(unused_unsafe)]
144151
fn stop_signal(status: i32) -> Result<Signal> {
145152
Signal::try_from(unsafe { libc::WSTOPSIG(status) })
146153
}
147154

148155
#[cfg(any(target_os = "android", target_os = "linux"))]
156+
#[allow(unused_unsafe)]
149157
fn syscall_stop(status: i32) -> bool {
150158
// From ptrace(2), setting PTRACE_O_TRACESYSGOOD has the effect
151159
// of delivering SIGTRAP | 0x80 as the signal number for syscall
@@ -159,6 +167,7 @@ fn stop_additional(status: i32) -> c_int {
159167
(status >> 16) as c_int
160168
}
161169

170+
#[allow(unused_unsafe)]
162171
fn continued(status: i32) -> bool {
163172
unsafe { libc::WIFCONTINUED(status) }
164173
}

0 commit comments

Comments
 (0)