@@ -48,7 +48,7 @@ impl VariableAllocator {
48
48
return None ;
49
49
}
50
50
51
- let s = unsafe { core:: slice:: from_raw_parts ( name as * const u16 , len + 1 ) } ;
51
+ let s = unsafe { core:: slice:: from_raw_parts ( name, len + 1 ) } ;
52
52
let mut name: Vec < u16 > = Vec :: new ( ) ;
53
53
name. extend_from_slice ( s) ;
54
54
let guid = unsafe { & * guid } ;
@@ -118,7 +118,7 @@ impl VariableAllocator {
118
118
return efi:: Status :: INVALID_PARAMETER ;
119
119
}
120
120
let mut a = Descriptor :: new ( ) ;
121
- let name = unsafe { core:: slice:: from_raw_parts ( name as * const u16 , len + 1 ) } ;
121
+ let name = unsafe { core:: slice:: from_raw_parts ( name, len + 1 ) } ;
122
122
a. name . extend_from_slice ( name) ;
123
123
a. guid = unsafe { * guid } ;
124
124
a. attr = attr & !efi:: VARIABLE_APPEND_WRITE ;
@@ -225,13 +225,7 @@ mod tests {
225
225
226
226
let size = 0 ;
227
227
let attr = ATTR | efi:: VARIABLE_APPEND_WRITE ;
228
- let status = allocator. set (
229
- NAME . as_ptr ( ) ,
230
- & GUID ,
231
- attr,
232
- size,
233
- core:: ptr:: null ( ) as * const core:: ffi:: c_void ,
234
- ) ;
228
+ let status = allocator. set ( NAME . as_ptr ( ) , & GUID , attr, size, core:: ptr:: null ( ) ) ;
235
229
236
230
assert_eq ! ( status, efi:: Status :: SUCCESS ) ;
237
231
assert_eq ! ( allocator. allocations[ 0 ] . name, NAME ) ;
@@ -263,13 +257,7 @@ mod tests {
263
257
264
258
let size = 0 ;
265
259
let attr = ATTR ;
266
- let status = allocator. set (
267
- NAME . as_ptr ( ) ,
268
- & GUID ,
269
- attr,
270
- size,
271
- core:: ptr:: null ( ) as * const core:: ffi:: c_void ,
272
- ) ;
260
+ let status = allocator. set ( NAME . as_ptr ( ) , & GUID , attr, size, core:: ptr:: null ( ) ) ;
273
261
274
262
assert_eq ! ( status, efi:: Status :: SUCCESS ) ;
275
263
assert ! ( allocator. allocations. is_empty( ) ) ;
@@ -316,7 +304,7 @@ mod tests {
316
304
let status = allocator. get (
317
305
NAME . as_ptr ( ) ,
318
306
& GUID ,
319
- core:: ptr:: null_mut ( ) as * mut u32 ,
307
+ core:: ptr:: null_mut ( ) ,
320
308
& mut size,
321
309
data. as_mut_ptr ( ) as * mut core:: ffi:: c_void ,
322
310
) ;
0 commit comments