Skip to content

Commit 15b1198

Browse files
committed
integrate I/O safety changes
1 parent 92d6805 commit 15b1198

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

library/std/src/os/unix/net/datagram.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ impl UnixDatagram {
139139
unsafe {
140140
let socket = UnixDatagram::unbound()?;
141141
cvt(libc::bind(
142-
*socket.0.as_inner(),
142+
socket.as_raw_fd(),
143143
&socket_addr.addr as *const _ as *const _,
144144
socket_addr.len as _,
145145
))?;
@@ -254,7 +254,7 @@ impl UnixDatagram {
254254
pub fn connect_addr(&self, socket_addr: &SocketAddr) -> io::Result<()> {
255255
unsafe {
256256
cvt(libc::connect(
257-
*self.0.as_inner(),
257+
self.as_raw_fd(),
258258
&socket_addr.addr as *const _ as *const _,
259259
socket_addr.len,
260260
))?;
@@ -568,7 +568,7 @@ impl UnixDatagram {
568568
pub fn send_to_addr(&self, buf: &[u8], socket_addr: &SocketAddr) -> io::Result<usize> {
569569
unsafe {
570570
let count = cvt(libc::sendto(
571-
*self.0.as_inner(),
571+
self.as_raw_fd(),
572572
buf.as_ptr() as *const _,
573573
buf.len(),
574574
MSG_NOSIGNAL,

library/std/src/os/unix/net/listener.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,11 @@ impl UnixListener {
110110
unsafe {
111111
let inner = Socket::new_raw(libc::AF_UNIX, libc::SOCK_STREAM)?;
112112
cvt(libc::bind(
113-
*inner.as_inner(),
113+
inner.as_raw_fd(),
114114
&socket_addr.addr as *const _ as *const _,
115115
socket_addr.len as _,
116116
))?;
117-
cvt(libc::listen(*inner.as_inner(), 128))?;
118-
117+
cvt(libc::listen(inner.as_raw_fd(), 128))?;
119118
Ok(UnixListener(inner))
120119
}
121120
}

library/std/src/os/unix/net/stream.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ impl UnixStream {
135135
unsafe {
136136
let inner = Socket::new_raw(libc::AF_UNIX, libc::SOCK_STREAM)?;
137137
cvt(libc::connect(
138-
*inner.as_inner(),
138+
inner.as_raw_fd(),
139139
&socket_addr.addr as *const _ as *const _,
140140
socket_addr.len,
141141
))?;

0 commit comments

Comments
 (0)