block_util: rewrite code and drop allow(clippy::ptr_arg)

The code can be written in a better form and the clippy warning
suppression can be dropped.

No functional change.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2022-01-18 14:48:56 +00:00 committed by Sebastien Boeuf
parent 14ba3f68d3
commit ea2685e928

View File

@ -252,13 +252,12 @@ impl Request {
Ok(req) Ok(req)
} }
#[allow(clippy::ptr_arg)]
pub fn execute<T: Seek + Read + Write>( pub fn execute<T: Seek + Read + Write>(
&self, &self,
disk: &mut T, disk: &mut T,
disk_nsectors: u64, disk_nsectors: u64,
mem: &GuestMemoryMmap, mem: &GuestMemoryMmap,
disk_id: &Vec<u8>, disk_id: &[u8],
) -> result::Result<u32, ExecuteError> { ) -> result::Result<u32, ExecuteError> {
disk.seek(SeekFrom::Start(self.sector << SECTOR_SHIFT)) disk.seek(SeekFrom::Start(self.sector << SECTOR_SHIFT))
.map_err(ExecuteError::Seek)?; .map_err(ExecuteError::Seek)?;
@ -293,7 +292,7 @@ impl Request {
if (*data_len as usize) < disk_id.len() { if (*data_len as usize) < disk_id.len() {
return Err(ExecuteError::BadRequest(Error::InvalidOffset)); return Err(ExecuteError::BadRequest(Error::InvalidOffset));
} }
mem.write_slice(disk_id.as_slice(), *data_addr) mem.write_slice(disk_id, *data_addr)
.map_err(ExecuteError::Write)?; .map_err(ExecuteError::Write)?;
} }
RequestType::Unsupported(t) => return Err(ExecuteError::Unsupported(t)), RequestType::Unsupported(t) => return Err(ExecuteError::Unsupported(t)),