nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-02 11:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #43708 - dhduvall:solaris-sparc-addrinfo, r=alexcrichton

Browse Source 
addrinfo hint in lookup_host() clean initialization on all platforms

Fixes #43649
This commit is contained in:
bors 2017-08-07 23:39:46 +00:00
commit 65b0a0c2c7
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/liblibc

@ -1 +1 @@
Subproject commit ec1e5ab1ef8baca57f8776bbebd9343572a87082
Subproject commit 2a5b50b7f7f539a0fd201331d6c1e0534aa332f5

12
src/libstd/sys_common/net.rs
View File

@ -165,16 +165,8 @@ pub fn lookup_host(host: &str) -> io::Result<LookupHost> {
init();
let c_host = CString::new(host)?;
let hints = c::addrinfo {
ai_flags: 0,
ai_family: 0,
ai_socktype: c::SOCK_STREAM,
ai_protocol: 0,
ai_addrlen: 0,
ai_addr: ptr::null_mut(),
ai_canonname: ptr::null_mut(),
ai_next: ptr::null_mut()
};
let mut hints: c::addrinfo = unsafe { mem::zeroed() };
hints.ai_socktype = c::SOCK_STREAM;
let mut res = ptr::null_mut();
unsafe {
match cvt_gai(c::getaddrinfo(c_host.as_ptr(), ptr::null(), &hints, &mut res)) {