kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

all: remove unnecessary mem:: prefix

Browse source
This commit is contained in:
Julian Orth 2024-10-12 14:49:37 +02:00
parent c00ef63afe
commit 1e45a243de
22 changed files with 61 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/video/drm.rs
View file

@ -457,26 +457,26 @@ impl DrmMaster {
let mut t = MaybeUninit::<T>::uninit();
match mode_getprobblob(self.raw(), blob.0, &mut t) {
Err(e) => Err(DrmError::GetPropBlob(e)),
Ok(n) if n != mem::size_of::<T>() => Err(DrmError::InvalidProbSize),
Ok(n) if n != size_of::<T>() => Err(DrmError::InvalidProbSize),
_ => unsafe { Ok(t.assume_init()) },
}
}
pub fn getblob_vec<T: Pod>(&self, blob: DrmBlob) -> Result<Vec<T>, DrmError> {
assert_ne!(mem::size_of::<T>(), 0);
assert_ne!(size_of::<T>(), 0);
let mut vec = vec![];
loop {
let (_, bytes) = vec.split_at_spare_mut_bytes_ext();
match mode_getprobblob(self.raw(), blob.0, bytes) {
Err(e) => return Err(DrmError::GetPropBlob(e)),
Ok(n) if n % mem::size_of::<T>() != 0 => return Err(DrmError::UnalignedPropSize),
Ok(n) if n % size_of::<T>() != 0 => return Err(DrmError::UnalignedPropSize),
Ok(n) if n <= bytes.len() => {
unsafe {
vec.set_len(n / mem::size_of::<T>());
vec.set_len(n / size_of::<T>());
}
return Ok(vec);
}
Ok(n) => vec.reserve_exact(n / mem::size_of::<T>()),
Ok(n) => vec.reserve_exact(n / size_of::<T>()),
}
}
}
@ -499,10 +499,10 @@ impl DrmMaster {
}
let formats_start = header.formats_offset as usize;
let formats_end = formats_start
.wrapping_add((header.count_formats as usize).wrapping_mul(mem::size_of::<u32>()));
.wrapping_add((header.count_formats as usize).wrapping_mul(size_of::<u32>()));
let modifiers_start = header.modifiers_offset as usize;
let modifiers_end = modifiers_start.wrapping_add(
(header.count_modifiers as usize).wrapping_mul(mem::size_of::<drm_format_modifier>()),
(header.count_modifiers as usize).wrapping_mul(size_of::<drm_format_modifier>()),
);
if blob.len() < formats_end || formats_end < formats_start {
log::error!("Formats of IN_FORMATS blob don't fit in the blob");

5
src/video/drm/sys.rs
View file

@ -16,7 +16,6 @@ use {
std::{
ffi::CString,
io::{BufRead, BufReader},
mem,
},
uapi::{c, pod_zeroed, OwnedFd, Pod, Ustring},
};
@ -921,7 +920,7 @@ const DRM_IOCTL_MODE_CREATEPROPBLOB: u64 = drm_iowr::<drm_mode_create_blob>(0xbd
pub fn mode_create_blob<T>(fd: c::c_int, t: &T) -> Result<DrmBlob, OsError> {
let mut res = drm_mode_create_blob {
data: t as *const T as _,
length: mem::size_of_val(t) as _,
length: size_of_val(t) as _,
blob_id: 0,
};
@ -1096,7 +1095,7 @@ pub fn mode_getprobblob<T: Pod + ?Sized>(
) -> Result<usize, OsError> {
let mut res = drm_mode_get_blob {
blob_id,
length: mem::size_of_val(t) as _,
length: size_of_val(t) as _,
data: t as *const T as *const u8 as _,
};
unsafe {