Merge pull request #167 from LedgerHQ/y333/c_callbacks

Using transmute is not required when defining callbacks used by C API
LedgerHQ · Jun 25, 2024 · 077383a · 077383a
2 parents c29f244 + ef702b8
commit 077383a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ledger_device_sdk/Cargo.toml b/ledger_device_sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.10.4"
+version = "1.10.5"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true

diff --git a/ledger_device_sdk/src/nbgl.rs b/ledger_device_sdk/src/nbgl.rs
@@ -107,7 +107,11 @@ pub extern "C" fn io_recv_and_process_event() -> bool {
 }
 
 /// Callback triggered by the NBGL API when a setting switch is toggled.
-unsafe fn settings_callback(token: ::core::ffi::c_int, _index: u8, _page: ::core::ffi::c_int) {
+unsafe extern "C" fn settings_callback(
+    token: ::core::ffi::c_int,
+    _index: u8,
+    _page: ::core::ffi::c_int,
+) {
     let idx = token - FIRST_USER_TOKEN as i32;
     if idx < 0 || idx >= SETTINGS_SIZE as i32 {
         panic!("Invalid token.");
@@ -237,10 +241,7 @@ impl<'a> NbglHomeAndSettings<'a> {
                             nbSwitches: self.nb_settings,
                         },
                     },
-                    contentActionCallback: transmute(
-                        (|token, index, page| settings_callback(token, index, page))
-                            as fn(::core::ffi::c_int, u8, ::core::ffi::c_int),
-                    ),
+                    contentActionCallback: Some(settings_callback),
                     type_: SWITCHES_LIST,
                 };