bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Using read_unaligned instead of memcpy.

Browse source
This commit is contained in:
LinkTed 2020-08-25 18:09:35 +02:00
parent 8783b06bd2
commit 8784ffbb4e
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
library/std/src/sys/unix/ext/net/ancillary.rs
View file

@ -4,7 +4,7 @@ use crate::marker::PhantomData;
use crate::mem::{size_of, zeroed}; use crate::mem::{size_of, zeroed};
use crate::os::unix::io::RawFd; use crate::os::unix::io::RawFd;
use crate::path::Path; use crate::path::Path;
use crate::ptr::null_mut; use crate::ptr::{null_mut, read_unaligned};
use crate::slice::from_raw_parts; use crate::slice::from_raw_parts;
use crate::sys::unix::ext::net::addr::{sockaddr_un, SocketAddr}; use crate::sys::unix::ext::net::addr::{sockaddr_un, SocketAddr};
use crate::sys::unix::net::Socket; use crate::sys::unix::net::Socket;
@ -131,16 +131,14 @@ impl<'a, T> Iterator for AncillaryDataIter<'a, T> {
type Item = T; type Item = T;
fn next(&mut self) -> Option<T> { fn next(&mut self) -> Option<T> {
unsafe { if size_of::<T>() <= self.data.len() {
let mut unit = zeroed(); unsafe {
if size_of::<T>() <= self.data.len() { let unit = read_unaligned(self.data.as_ptr().cast());
let unit_ptr: *mut T = &mut unit;
libc::memcpy(unit_ptr.cast(), self.data.as_ptr().cast(), size_of::<T>());
self.data = &self.data[size_of::<T>()..]; self.data = &self.data[size_of::<T>()..];
Some(unit) Some(unit)
} else {
None
} }
} else {
None
} }
} }
} }