From 03e499d28b63c8b0fc425a80f126efc096f05035 Mon Sep 17 00:00:00 2001 From: medigor Date: Sun, 11 Dec 2022 23:49:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20unsafe=20=D0=B2=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D1=8B=D1=85=20=D0=BC=D0=B5=D1=81=D1=82=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ffi.rs | 7 +++---- src/lib.rs | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/ffi.rs b/src/ffi.rs index c05735f..3506063 100644 --- a/src/ffi.rs +++ b/src/ffi.rs @@ -342,7 +342,7 @@ unsafe extern "system" fn register_extension_as( return false; }; data.copy_from_slice(extension_name); - unsafe { *name = data.as_mut_ptr() }; + *name = data.as_mut_ptr(); true } @@ -704,11 +704,10 @@ pub struct Connection { unsafe fn get_str<'a>(s: *const u16) -> &'a [u16] { unsafe fn strlen(s: *const u16) -> usize { let mut i = 0; - while unsafe { *s.add(i) } != 0 { + while *s.add(i) != 0 { i += 1; } - i += 1; - i + i + 1 } let len = strlen(s); diff --git a/src/lib.rs b/src/lib.rs index 9212661..c627313 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -46,10 +46,8 @@ pub extern "C" fn GetClassNames() -> *const u16 { #[allow(non_snake_case)] #[no_mangle] -pub extern "C" fn SetPlatformCapabilities(capabilities: c_int) -> c_int { - unsafe { - PLATFORM_CAPABILITIES.store(capabilities, Ordering::Relaxed); - } +pub unsafe extern "C" fn SetPlatformCapabilities(capabilities: c_int) -> c_int { + PLATFORM_CAPABILITIES.store(capabilities, Ordering::Relaxed); 3 }