Skip to content

Commit

Permalink
Rename SockaddrLike::space to SockaddrLike::size
Browse files Browse the repository at this point in the history
  • Loading branch information
asomers committed Mar 20, 2022
1 parent df0f764 commit 511c25e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/sys/socket/addr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,7 @@ pub trait SockaddrLike: private::SockaddrLikePriv {
}

/// Return the available space in the structure
fn space() -> libc::socklen_t where Self: Sized {
fn size() -> libc::socklen_t where Self: Sized {
mem::size_of::<Self>() as libc::socklen_t
}
}
Expand Down Expand Up @@ -1104,7 +1104,7 @@ impl SockaddrIn {
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd"))]
sin_len: Self::space() as u8,
sin_len: Self::size() as u8,
sin_family: AddressFamily::Inet as sa_family_t,
sin_port: u16::to_be(port),
sin_addr: libc::in_addr {
Expand Down
6 changes: 3 additions & 3 deletions src/sys/socket/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@ unsafe fn pack_mhdr_to_receive<'a, I, S>(
let mut mhdr = mem::MaybeUninit::<msghdr>::zeroed();
let p = mhdr.as_mut_ptr();
(*p).msg_name = (*address).as_mut_ptr() as *mut c_void;
(*p).msg_namelen = S::space();
(*p).msg_namelen = S::size();
(*p).msg_iov = iov.as_ref().as_ptr() as *mut iovec;
(*p).msg_iovlen = iov.as_ref().len() as _;
(*p).msg_control = msg_control as *mut c_void;
Expand Down Expand Up @@ -2001,7 +2001,7 @@ pub fn setsockopt<O: SetSockOpt>(fd: RawFd, opt: O, val: &O::Val) -> Result<()>
pub fn getpeername<T: SockaddrLike>(fd: RawFd) -> Result<T> {
unsafe {
let mut addr = mem::MaybeUninit::<T>::uninit();
let mut len = T::space();
let mut len = T::size();

let ret = libc::getpeername(
fd,
Expand All @@ -2022,7 +2022,7 @@ pub fn getpeername<T: SockaddrLike>(fd: RawFd) -> Result<T> {
pub fn getsockname<T: SockaddrLike>(fd: RawFd) -> Result<T> {
unsafe {
let mut addr = mem::MaybeUninit::<T>::uninit();
let mut len = T::space();
let mut len = T::size();

let ret = libc::getsockname(
fd,
Expand Down

0 comments on commit 511c25e

Please sign in to comment.