summaryrefslogtreecommitdiff
path: root/src/sys/socket/mod.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-12-04 20:32:21 +0000
committerGitHub <noreply@github.com>2022-12-04 20:32:21 +0000
commit40c85353a18a3f3e5a3367e2f76a9718b955a026 (patch)
tree5ef82535dbe44829d8f94b8b6953e48692676f62 /src/sys/socket/mod.rs
parent1fd5fe7163815cc15865ba4cc0c441b0ac4f4eaa (diff)
parent59f66d128b6664ff618e12c193ec2adc4a862f2f (diff)
downloadnix-40c85353a18a3f3e5a3367e2f76a9718b955a026.zip
Merge #1908
1908: Move some pure formatting changes out of #1863 r=asomers a=SUPERCILEX Co-authored-by: Alex Saveau <saveau.alexandre@gmail.com>
Diffstat (limited to 'src/sys/socket/mod.rs')
-rw-r--r--src/sys/socket/mod.rs18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs
index 5a164171..eea74cf6 100644
--- a/src/sys/socket/mod.rs
+++ b/src/sys/socket/mod.rs
@@ -2221,14 +2221,14 @@ pub fn recvfrom<T: SockaddrLike>(
buf.as_ptr() as *mut c_void,
buf.len() as size_t,
0,
- addr.as_mut_ptr() as *mut libc::sockaddr,
+ addr.as_mut_ptr() as *mut sockaddr,
&mut len as *mut socklen_t,
))? as usize;
Ok((
ret,
T::from_raw(
- addr.assume_init().as_ptr() as *const libc::sockaddr,
+ addr.assume_init().as_ptr() as *const sockaddr,
Some(len),
),
))
@@ -2336,11 +2336,8 @@ pub fn getpeername<T: SockaddrLike>(fd: RawFd) -> Result<T> {
let mut addr = mem::MaybeUninit::<T>::uninit();
let mut len = T::size();
- let ret = libc::getpeername(
- fd,
- addr.as_mut_ptr() as *mut libc::sockaddr,
- &mut len,
- );
+ let ret =
+ libc::getpeername(fd, addr.as_mut_ptr() as *mut sockaddr, &mut len);
Errno::result(ret)?;
@@ -2356,11 +2353,8 @@ pub fn getsockname<T: SockaddrLike>(fd: RawFd) -> Result<T> {
let mut addr = mem::MaybeUninit::<T>::uninit();
let mut len = T::size();
- let ret = libc::getsockname(
- fd,
- addr.as_mut_ptr() as *mut libc::sockaddr,
- &mut len,
- );
+ let ret =
+ libc::getsockname(fd, addr.as_mut_ptr() as *mut sockaddr, &mut len);
Errno::result(ret)?;