Skip to content

Commit 511c25e

Browse files
committed
Rename SockaddrLike::space to SockaddrLike::size
1 parent df0f764 commit 511c25e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/sys/socket/addr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ pub trait SockaddrLike: private::SockaddrLikePriv {
10431043
}
10441044

10451045
/// Return the available space in the structure
1046-
fn space() -> libc::socklen_t where Self: Sized {
1046+
fn size() -> libc::socklen_t where Self: Sized {
10471047
mem::size_of::<Self>() as libc::socklen_t
10481048
}
10491049
}
@@ -1104,7 +1104,7 @@ impl SockaddrIn {
11041104
target_os = "macos",
11051105
target_os = "netbsd",
11061106
target_os = "openbsd"))]
1107-
sin_len: Self::space() as u8,
1107+
sin_len: Self::size() as u8,
11081108
sin_family: AddressFamily::Inet as sa_family_t,
11091109
sin_port: u16::to_be(port),
11101110
sin_addr: libc::in_addr {

src/sys/socket/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,7 @@ unsafe fn pack_mhdr_to_receive<'a, I, S>(
16611661
let mut mhdr = mem::MaybeUninit::<msghdr>::zeroed();
16621662
let p = mhdr.as_mut_ptr();
16631663
(*p).msg_name = (*address).as_mut_ptr() as *mut c_void;
1664-
(*p).msg_namelen = S::space();
1664+
(*p).msg_namelen = S::size();
16651665
(*p).msg_iov = iov.as_ref().as_ptr() as *mut iovec;
16661666
(*p).msg_iovlen = iov.as_ref().len() as _;
16671667
(*p).msg_control = msg_control as *mut c_void;
@@ -2001,7 +2001,7 @@ pub fn setsockopt<O: SetSockOpt>(fd: RawFd, opt: O, val: &O::Val) -> Result<()>
20012001
pub fn getpeername<T: SockaddrLike>(fd: RawFd) -> Result<T> {
20022002
unsafe {
20032003
let mut addr = mem::MaybeUninit::<T>::uninit();
2004-
let mut len = T::space();
2004+
let mut len = T::size();
20052005

20062006
let ret = libc::getpeername(
20072007
fd,
@@ -2022,7 +2022,7 @@ pub fn getpeername<T: SockaddrLike>(fd: RawFd) -> Result<T> {
20222022
pub fn getsockname<T: SockaddrLike>(fd: RawFd) -> Result<T> {
20232023
unsafe {
20242024
let mut addr = mem::MaybeUninit::<T>::uninit();
2025-
let mut len = T::space();
2025+
let mut len = T::size();
20262026

20272027
let ret = libc::getsockname(
20282028
fd,

0 commit comments

Comments
 (0)