The core library's `CStr` has a `from_bytes_until_nul` method that we can leverage to simplify this function.
Signed-off-by: Alexandre Courbot <[email protected]> --- drivers/gpu/nova-core/util.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/nova-core/util.rs b/drivers/gpu/nova-core/util.rs index 8b2a4b99c55b..2cccbce78c14 100644 --- a/drivers/gpu/nova-core/util.rs +++ b/drivers/gpu/nova-core/util.rs @@ -2,15 +2,10 @@ /// Converts a null-terminated byte slice to a string, or `None` if the array does not /// contains any null byte or contains invalid characters. -/// -/// Contrary to [`core::ffi::CStr::from_bytes_with_nul`], the null byte can be anywhere in the -/// slice, and not only in the last position. pub(crate) fn str_from_null_terminated(bytes: &[u8]) -> Option<&str> { use core::ffi::CStr; - bytes - .iter() - .position(|&b| b == 0) - .and_then(|null_pos| CStr::from_bytes_with_nul(&bytes[..=null_pos]).ok()) + CStr::from_bytes_until_nul(bytes) + .ok() .and_then(|cstr| cstr.to_str().ok()) } -- 2.52.0
