diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2015-09-03 09:49:50 +0300 | 
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2015-09-03 09:49:50 +0300 | 
| commit | 06fb196256bbab1e7aa4f43daf45321efaa6e0eb (patch) | |
| tree | 23863826af019b2bc07d295882e092d244c36699 /src/libstd/sys/common/net.rs | |
| parent | 3903ea96f557dc923cf73d3905554083cd921a01 (diff) | |
| download | rust-06fb196256bbab1e7aa4f43daf45321efaa6e0eb.tar.gz rust-06fb196256bbab1e7aa4f43daf45321efaa6e0eb.zip | |
Use `null()`/`null_mut()` instead of `0 as *const T`/`0 as *mut T`
Diffstat (limited to 'src/libstd/sys/common/net.rs')
| -rw-r--r-- | src/libstd/sys/common/net.rs | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs index 67e1099c295..4fb3134eac9 100644 --- a/src/libstd/sys/common/net.rs +++ b/src/libstd/sys/common/net.rs @@ -16,6 +16,7 @@ use io::{self, Error, ErrorKind}; use libc::{self, c_int, c_char, c_void, socklen_t}; use mem; use net::{SocketAddr, Shutdown, IpAddr}; +use ptr; use str::from_utf8; use sys::c; use sys::net::{cvt, cvt_r, cvt_gai, Socket, init, wrlen_t}; @@ -123,9 +124,9 @@ pub fn lookup_host(host: &str) -> io::Result<LookupHost> { init(); let c_host = try!(CString::new(host)); - let mut res = 0 as *mut _; + let mut res = ptr::null_mut(); unsafe { - try!(cvt_gai(getaddrinfo(c_host.as_ptr(), 0 as *const _, 0 as *const _, + try!(cvt_gai(getaddrinfo(c_host.as_ptr(), ptr::null(), ptr::null(), &mut res))); Ok(LookupHost { original: res, cur: res }) } @@ -154,7 +155,7 @@ pub fn lookup_addr(addr: &IpAddr) -> io::Result<String> { let data = unsafe { try!(cvt_gai(getnameinfo(inner, len, hostbuf.as_mut_ptr(), NI_MAXHOST as libc::size_t, - 0 as *mut _, 0, 0))); + ptr::null_mut(), 0, 0))); CStr::from_ptr(hostbuf.as_ptr()) }; | 
