Skip to content

Commit 2078dc1

Browse files
author
Clark Gaebel
committed
Be warning-free on Darwin.
1 parent c013030 commit 2078dc1

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/fcntl.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ pub use self::ffi::flock;
88

99
pub type Fd = c_int;
1010

11+
#[allow(dead_code)]
1112
mod ffi {
1213
pub use libc::{open, fcntl};
1314
pub use self::os::*;

src/sys/event.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ mod ffi {
1818
pub udata: u64 // 8
1919
}
2020

21+
// Bug in rustc, cannot determine that kevent is #[repr(C)]
22+
#[allow(ctypes)]
2123
extern {
2224
pub fn kqueue() -> c_int;
2325

src/sys/socket.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ pub fn bind(sockfd: Fd, addr: &SockAddr) -> SysResult<()> {
207207
}
208208

209209
pub fn accept(sockfd: Fd) -> SysResult<Fd> {
210-
let res = unsafe { ffi::accept(sockfd, ptr::mut_null(), ptr::mut_null()) };
210+
let res = unsafe { ffi::accept(sockfd, ptr::null_mut(), ptr::null_mut()) };
211211

212212
if res < 0 {
213213
return Err(SysError::last());
@@ -232,10 +232,10 @@ pub fn accept4(sockfd: Fd, flags: SockFlag) -> SysResult<Fd> {
232232
let res = if feat_atomic {
233233
unsafe {
234234
mem::transmute::<*const (), F>(accept4)(
235-
sockfd, ptr::mut_null(), ptr::mut_null(), flags.bits)
235+
sockfd, ptr::null_mut(), ptr::null_mut(), flags.bits)
236236
}
237237
} else {
238-
unsafe { ffi::accept(sockfd, ptr::mut_null(), ptr::mut_null()) }
238+
unsafe { ffi::accept(sockfd, ptr::null_mut(), ptr::null_mut()) }
239239
};
240240

241241
if res < 0 {
@@ -258,7 +258,7 @@ pub fn accept4(sockfd: Fd, flags: SockFlag) -> SysResult<Fd> {
258258
#[cfg(target_os = "macos")]
259259
#[cfg(target_os = "ios")]
260260
pub fn accept4(sockfd: Fd, flags: SockFlag) -> SysResult<Fd> {
261-
let res = unsafe { ffi::accept(sockfd, ptr::mut_null(), ptr::mut_null()) };
261+
let res = unsafe { ffi::accept(sockfd, ptr::null_mut(), ptr::null_mut()) };
262262

263263
if res < 0 {
264264
return Err(SysError::last());

0 commit comments

Comments
 (0)