Minimize unsafe code

This commit is contained in:
Greg Fitzgerald
2018-09-02 23:31:50 -10:00
parent c9a1ac9b8c
commit d18ea501b7

View File

@ -152,8 +152,8 @@ pub fn decode_blocks(
} }
data_arg.push(x.as_mut_ptr()); data_arg.push(x.as_mut_ptr());
} }
unsafe { let ret = unsafe {
let ret = jerasure_matrix_decode( jerasure_matrix_decode(
data.len() as i32, data.len() as i32,
coding.len() as i32, coding.len() as i32,
ERASURE_W, ERASURE_W,
@ -163,7 +163,8 @@ pub fn decode_blocks(
data_arg.as_ptr(), data_arg.as_ptr(),
coding_arg.as_ptr(), coding_arg.as_ptr(),
data[0].len() as i32, data[0].len() as i32,
); )
};
trace!("jerasure_matrix_decode ret: {}", ret); trace!("jerasure_matrix_decode ret: {}", ret);
for x in data[erasures[0] as usize][0..8].iter() { for x in data[erasures[0] as usize][0..8].iter() {
trace!("{} ", x) trace!("{} ", x)
@ -172,7 +173,6 @@ pub fn decode_blocks(
if ret < 0 { if ret < 0 {
return Err(ErasureError::DecodeError); return Err(ErasureError::DecodeError);
} }
}
Ok(()) Ok(())
} }