Auto merge of #2725 - Meziu:master, r=Amanieu

bors · bors · commit ea3ab5323497 · 2022-03-15T10:22:53.000Z
Horizon OS Nintendo 3DS - Fixed size of sockaddr_in The original API for the platform included these zeroed bytes at the end of the `sockaddr_in` struct, but the socket address calls (like `getsockname`) only write 8 bytes inside `sockaddr_storage`, making checks like the one in https://github.com/rust-lang/rust/blob/95561b336cf82a8250176eb3c61ea61c90e75d47/library/std/src/sys_common/net.rs#L109 faulty. Since `sockaddr_in` is a struct *not* used in internal functionality, it shouldn't be a problem to just get rid of them.
diff --git a/src/unix/newlib/horizon/mod.rs b/src/unix/newlib/horizon/mod.rs
@@ -35,7 +35,6 @@ s! {
         pub sin_family: ::sa_family_t,
         pub sin_port: ::in_port_t,
         pub sin_addr: ::in_addr,
-        pub sin_zero: [::c_uchar; 8],
     }
 
     pub struct sockaddr_in6 {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ s! {`
`35`	`35`	`pub sin_family: ::sa_family_t,`
`36`	`36`	`pub sin_port: ::in_port_t,`
`37`	`37`	`pub sin_addr: ::in_addr,`
`38`		`- pub sin_zero: [::c_uchar; 8],`
`39`	`38`	`}`
`40`	`39`
`41`	`40`	`pub struct sockaddr_in6 {`