mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #85738 - 370417:opensbd, r=m-ou-se

Browse Source 
Rename opensbd to openbsd

OpenBsd was sometimes spelled "opensbd" in the standard library.
This commit is contained in:
Guillaume Gomez 2021-05-27 20:08:24 +02:00 committed by GitHub
commit 48706edc56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/std/src/sys/unix/net.rs
View File

@ -62,7 +62,7 @@ pub fn new_raw(fam: c_int, ty: c_int) -> io::Result<Socket> {
target_os = "illumos", target_os = "illumos",
target_os = "linux", target_os = "linux",
target_os = "netbsd", target_os = "netbsd",
target_os = "opensbd", target_os = "openbsd",
))] { ))] {
// On platforms that support it we pass the SOCK_CLOEXEC // On platforms that support it we pass the SOCK_CLOEXEC
// flag to atomically create the socket and set it as // flag to atomically create the socket and set it as
@ -99,7 +99,7 @@ pub fn new_pair(fam: c_int, ty: c_int) -> io::Result<(Socket, Socket)> {
target_os = "illumos", target_os = "illumos",
target_os = "linux", target_os = "linux",
target_os = "netbsd", target_os = "netbsd",
target_os = "opensbd", target_os = "openbsd",
))] { ))] {
// Like above, set cloexec atomically // Like above, set cloexec atomically
cvt(libc::socketpair(fam, ty | libc::SOCK_CLOEXEC, 0, fds.as_mut_ptr()))?; cvt(libc::socketpair(fam, ty | libc::SOCK_CLOEXEC, 0, fds.as_mut_ptr()))?;
@ -204,7 +204,7 @@ pub fn accept(&self, storage: *mut sockaddr, len: *mut socklen_t) -> io::Result<
target_os = "illumos", target_os = "illumos",
target_os = "linux", target_os = "linux",
target_os = "netbsd", target_os = "netbsd",
target_os = "opensbd", target_os = "openbsd",
))] { ))] {
let fd = cvt_r(|| unsafe { let fd = cvt_r(|| unsafe {
libc::accept4(self.0.raw(), storage, len, libc::SOCK_CLOEXEC) libc::accept4(self.0.raw(), storage, len, libc::SOCK_CLOEXEC)