cargo fmt
This commit is contained in:
parent
0d4bf5ac10
commit
52f6f3f3fe
9 changed files with 149 additions and 102 deletions
|
|
@ -2,7 +2,7 @@
|
|||
//!
|
||||
//! prefix `sp_packet_`
|
||||
|
||||
use std::ptr::{NonNull};
|
||||
use std::ptr::NonNull;
|
||||
|
||||
use crate::SPCommand;
|
||||
|
||||
|
|
@ -31,10 +31,12 @@ pub unsafe extern "C" fn sp_packet_from_command(
|
|||
command: *mut SPCommand,
|
||||
) -> *mut SPPacket {
|
||||
assert!(!command.is_null());
|
||||
let command = unsafe {*Box::from_raw(command)};
|
||||
let command = unsafe { *Box::from_raw(command) };
|
||||
if let Ok(packet) = command.0.try_into() {
|
||||
Box::leak(Box::new(SPPacket(packet)))
|
||||
} else { std::ptr::null_mut() }
|
||||
} else {
|
||||
std::ptr::null_mut()
|
||||
}
|
||||
}
|
||||
|
||||
/// Tries to load a [SPPacket] from the passed array with the specified length.
|
||||
|
|
@ -59,7 +61,7 @@ pub unsafe extern "C" fn sp_packet_try_load(
|
|||
length: usize,
|
||||
) -> *mut SPPacket {
|
||||
assert!(!data.is_null());
|
||||
let data = unsafe {std::slice::from_raw_parts(data, length)};
|
||||
let data = unsafe { std::slice::from_raw_parts(data, length) };
|
||||
match servicepoint::Packet::try_from(data) {
|
||||
Err(_) => std::ptr::null_mut(),
|
||||
Ok(packet) => Box::into_raw(Box::new(SPPacket(packet))),
|
||||
|
|
@ -105,7 +107,8 @@ pub unsafe extern "C" fn sp_packet_from_parts(
|
|||
let payload = if payload.is_null() {
|
||||
vec![]
|
||||
} else {
|
||||
let payload = unsafe {std::slice::from_raw_parts(payload, payload_len) };
|
||||
let payload =
|
||||
unsafe { std::slice::from_raw_parts(payload, payload_len) };
|
||||
Vec::from(payload)
|
||||
};
|
||||
|
||||
|
|
@ -144,7 +147,7 @@ pub unsafe extern "C" fn sp_packet_clone(
|
|||
packet: *const SPPacket,
|
||||
) -> NonNull<SPPacket> {
|
||||
assert!(!packet.is_null());
|
||||
let result = Box::new(SPPacket(unsafe {(*packet).0.clone()}));
|
||||
let result = Box::new(SPPacket(unsafe { (*packet).0.clone() }));
|
||||
NonNull::from(Box::leak(result))
|
||||
}
|
||||
|
||||
|
|
@ -163,5 +166,5 @@ pub unsafe extern "C" fn sp_packet_clone(
|
|||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_packet_free(packet: *mut SPPacket) {
|
||||
assert!(!packet.is_null());
|
||||
_ = unsafe {Box::from_raw(packet)}
|
||||
_ = unsafe { Box::from_raw(packet) }
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue