diff options
| author | Clark Gaebel <cgaebel@mozilla.com> | 2014-09-20 11:19:38 -0700 |
|---|---|---|
| committer | Clark Gaebel <cgaebel@mozilla.com> | 2014-09-20 11:19:38 -0700 |
| commit | 2078dc14176f1cc4bba1967a98dc2bf2cfa942de (patch) | |
| tree | d87889832feabc1bb6bece8af724b61c1d784814 /src/sys/socket.rs | |
| parent | c013030a512af7c8c2dd2251cd7a18160a80f11e (diff) | |
| download | nix-2078dc14176f1cc4bba1967a98dc2bf2cfa942de.zip | |
Be warning-free on Darwin.
Diffstat (limited to 'src/sys/socket.rs')
| -rw-r--r-- | src/sys/socket.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sys/socket.rs b/src/sys/socket.rs index 0f4b2874..4956b59b 100644 --- a/src/sys/socket.rs +++ b/src/sys/socket.rs @@ -207,7 +207,7 @@ pub fn bind(sockfd: Fd, addr: &SockAddr) -> SysResult<()> { } pub fn accept(sockfd: Fd) -> SysResult<Fd> { - let res = unsafe { ffi::accept(sockfd, ptr::mut_null(), ptr::mut_null()) }; + let res = unsafe { ffi::accept(sockfd, ptr::null_mut(), ptr::null_mut()) }; if res < 0 { return Err(SysError::last()); @@ -232,10 +232,10 @@ pub fn accept4(sockfd: Fd, flags: SockFlag) -> SysResult<Fd> { let res = if feat_atomic { unsafe { mem::transmute::<*const (), F>(accept4)( - sockfd, ptr::mut_null(), ptr::mut_null(), flags.bits) + sockfd, ptr::null_mut(), ptr::null_mut(), flags.bits) } } else { - unsafe { ffi::accept(sockfd, ptr::mut_null(), ptr::mut_null()) } + unsafe { ffi::accept(sockfd, ptr::null_mut(), ptr::null_mut()) } }; if res < 0 { @@ -258,7 +258,7 @@ pub fn accept4(sockfd: Fd, flags: SockFlag) -> SysResult<Fd> { #[cfg(target_os = "macos")] #[cfg(target_os = "ios")] pub fn accept4(sockfd: Fd, flags: SockFlag) -> SysResult<Fd> { - let res = unsafe { ffi::accept(sockfd, ptr::mut_null(), ptr::mut_null()) }; + let res = unsafe { ffi::accept(sockfd, ptr::null_mut(), ptr::null_mut()) }; if res < 0 { return Err(SysError::last()); |