maintenance: Rename "callback param" to "user data"
What changed, and why it matters
This commit is a simple code cleanup: it renames variables and parameters from 'callback param' to 'user data' across several UI component files in the BitBox02 firmware. No behavior changes, bug fixes, or security fixes are present. It is purely a naming convention update to match standard terminology.
No security action required. Treat as routine maintenance/refactoring.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit renames identifiers such as callback_param, param, confirm_callback_param, and cancel_callback_param to user_data, confirm_user_data, and cancel_user_data in C headers/sources and Rust FFI wrappers. Function signatures are updated to use the new parameter names, and comments are adjusted accordingly. There are no logic changes, no new bounds checks, no memory management changes, and no security-related modifications.
Changed components
src/rust/bitbox02/src/ui/ui.rssrc/ui/components/confirm.csrc/ui/components/confirm.hsrc/ui/components/confirm_transaction.csrc/ui/components/confirm_transaction.hsrc/ui/components/sdcard.csrc/ui/components/sdcard.hsrc/ui/components/status.csrc/ui/components/status.hsrc/ui/components/trinary_input_string.csrc/ui/components/trinary_input_string.hInspect captured patch +109 / −111
diff --git a/src/rust/bitbox02/src/ui/ui.rs b/src/rust/bitbox02/src/ui/ui.rs
index 2a01446..edaa6e7 100644
--- a/src/rust/bitbox02/src/ui/ui.rs
+++ b/src/rust/bitbox02/src/ui/ui.rs
@@ -73,7 +73,7 @@ where
// Callback must outlive component.
F: FnMut(zeroize::Zeroizing<String>) + 'a,
{
- unsafe extern "C" fn c_confirm_callback<F2>(password: *const c_char, param: *mut c_void)
+ unsafe extern "C" fn c_confirm_callback<F2>(password: *const c_char, user_data: *mut c_void)
where
F2: FnMut(zeroize::Zeroizing<String>),
{
@@ -84,16 +84,16 @@ where
);
// The callback is dropped afterwards. This is safe because
// this C callback is guaranteed to be called only once.
- let mut callback = unsafe { Box::from_raw(param as *mut F2) };
+ let mut callback = unsafe { Box::from_raw(user_data as *mut F2) };
callback(pw);
}
- unsafe extern "C" fn c_cancel_callback(param: *mut c_void) {
- let callback = param as *mut ContinueCancelCb;
+ unsafe extern "C" fn c_cancel_callback(user_data: *mut c_void) {
+ let callback = user_data as *mut ContinueCancelCb;
unsafe { (*callback)() };
}
- let (cancel_cb, cancel_cb_param) = match cancel_callback {
+ let (cancel_cb, cancel_user_data) = match cancel_callback {
None => (None, core::ptr::null_mut()),
Some(cb) => (
Some(c_cancel_callback as _),
@@ -105,10 +105,10 @@ where
bitbox02_sys::trinary_input_string_create(
¶ms.to_c_params(&mut title_scratch).data, // title copied in C
Some(c_confirm_callback::<F>),
- // passed to c_confirm_callback as `param`.
+ // passed to c_confirm_callback as `user_data`.
Box::into_raw(Box::new(confirm_callback)) as *mut _,
cancel_cb,
- cancel_cb_param,
+ cancel_user_data,
)
};
Component {
@@ -116,8 +116,8 @@ where
is_pushed: false,
on_drop: Some(Box::new(move || unsafe {
// Drop all callbacks.
- if !cancel_cb_param.is_null() {
- drop(Box::from_raw(cancel_cb_param as *mut ContinueCancelCb));
+ if !cancel_user_data.is_null() {
+ drop(Box::from_raw(cancel_user_data as *mut ContinueCancelCb));
}
})),
_p: PhantomData,
@@ -131,13 +131,13 @@ where
// Callback must outlive component.
F: FnMut(bool) + 'a,
{
- unsafe extern "C" fn c_callback<F2>(result: bool, param: *mut c_void)
+ unsafe extern "C" fn c_callback<F2>(result: bool, user_data: *mut c_void)
where
F2: FnMut(bool),
{
// The callback is dropped afterwards. This is safe because
// this C callback is guaranteed to be called only once.
- let mut callback = unsafe { Box::from_raw(param as *mut F2) };
+ let mut callback = unsafe { Box::from_raw(user_data as *mut F2) };
callback(result);
}
let mut title_scratch = Vec::new();
@@ -148,7 +148,7 @@ where
.to_c_params(&mut title_scratch, &mut body_scratch)
.data,
Some(c_callback::<F>),
- // passed to the C callback as `param`
+ // passed to the C callback as `user_data`
Box::into_raw(Box::new(result_callback)) as *mut _,
)
};
@@ -171,13 +171,13 @@ where
// Callback must outlive component.
F: FnMut() + 'a,
{
- unsafe extern "C" fn c_callback<F2>(param: *mut c_void)
+ unsafe extern "C" fn c_callback<F2>(user_data: *mut c_void)
where
F2: FnMut(),
{
// The callback is dropped afterwards. This is safe because
// this C callback is guaranteed to be called only once.
- let mut callback = unsafe { Box::from_raw(param as *mut F2) };
+ let mut callback = unsafe { Box::from_raw(user_data as *mut F2) };
callback();
}
@@ -186,7 +186,7 @@ where
crate::util::str_to_cstr_vec(text).unwrap().as_ptr(), // copied in C
status_success,
Some(c_callback::<F>),
- Box::into_raw(Box::new(callback)) as *mut _, // passed to c_callback as `param`.
+ Box::into_raw(Box::new(callback)) as *mut _, // passed to c_callback as `user_data`.
)
};
Component {
@@ -202,20 +202,20 @@ where
// Callback must outlive component.
F: FnMut(bool) + 'a,
{
- unsafe extern "C" fn c_callback<F2>(sd_done: bool, param: *mut c_void)
+ unsafe extern "C" fn c_callback<F2>(sd_done: bool, user_data: *mut c_void)
where
F2: FnMut(bool),
{
// The callback is dropped afterwards. This is safe because
// this C callback is guaranteed to be called only once.
- let mut callback = unsafe { Box::from_raw(param as *mut F2) };
+ let mut callback = unsafe { Box::from_raw(user_data as *mut F2) };
callback(sd_done);
}
let component = unsafe {
bitbox02_sys::sdcard_create(
Some(c_callback::<F>),
- // passed to the C callback as `param`
+ // passed to the C callback as `user_data`
Box::into_raw(Box::new(callback)) as *mut _,
)
};
@@ -228,13 +228,13 @@ where
}
pub fn menu_create(params: MenuParams<'_>) -> Component<'_> {
- unsafe extern "C" fn c_select_word_cb(word_idx: u8, param: *mut c_void) {
- let callback = param as *mut SelectWordCb;
+ unsafe extern "C" fn c_select_word_cb(word_idx: u8, user_data: *mut c_void) {
+ let callback = user_data as *mut SelectWordCb;
unsafe { (*callback)(word_idx) };
}
- unsafe extern "C" fn c_continue_cancel_cb(param: *mut c_void) {
- let callback = param as *mut ContinueCancelCb;
+ unsafe extern "C" fn c_continue_cancel_cb(user_data: *mut c_void) {
+ let callback = user_data as *mut ContinueCancelCb;
unsafe { (*callback)() };
}
@@ -252,7 +252,7 @@ pub fn menu_create(params: MenuParams<'_>) -> Component<'_> {
let c_words: Vec<*const core::ffi::c_char> =
words.iter().map(|word| word.as_ptr() as _).collect();
- let (select_word_cb, select_word_cb_param) = match params.select_word_cb {
+ let (select_word_cb, select_word_user_data) = match params.select_word_cb {
None => (None, core::ptr::null_mut()),
Some(cb) => (
Some(c_select_word_cb as _),
@@ -260,7 +260,7 @@ pub fn menu_create(params: MenuParams<'_>) -> Component<'_> {
),
};
- let (continue_on_last_cb, continue_on_last_cb_param) = match params.continue_on_last_cb {
+ let (continue_on_last_cb, continue_on_last_user_data) = match params.continue_on_last_cb {
None => (None, core::ptr::null_mut()),
Some(cb) => (
Some(c_continue_cancel_cb as _),
@@ -268,7 +268,7 @@ pub fn menu_create(params: MenuParams<'_>) -> Component<'_> {
),
};
- let (cancel_cb, cancel_cb_param) = match params.cancel_cb {
+ let (cancel_cb, cancel_user_data) = match params.cancel_cb {
None => (None, core::ptr::null_mut()),
Some(cb) => (
Some(c_continue_cancel_cb as _),
@@ -282,16 +282,16 @@ pub fn menu_create(params: MenuParams<'_>) -> Component<'_> {
bitbox02_sys::menu_create(
c_words.as_ptr(),
select_word_cb,
- select_word_cb_param,
+ select_word_user_data,
words.len() as _,
// copied in C
title
.as_ref()
.map_or_else(core::ptr::null, |title| title.as_ptr()),
continue_on_last_cb,
- continue_on_last_cb_param,
+ continue_on_last_user_data,
cancel_cb,
- cancel_cb_param,
+ cancel_user_data,
core::ptr::null_mut(),
)
};
@@ -300,16 +300,16 @@ pub fn menu_create(params: MenuParams<'_>) -> Component<'_> {
is_pushed: false,
on_drop: Some(Box::new(move || unsafe {
// Drop all callbacks.
- if !select_word_cb_param.is_null() {
- drop(Box::from_raw(select_word_cb_param as *mut SelectWordCb));
+ if !select_word_user_data.is_null() {
+ drop(Box::from_raw(select_word_user_data as *mut SelectWordCb));
}
- if !continue_on_last_cb_param.is_null() {
+ if !continue_on_last_user_data.is_null() {
drop(Box::from_raw(
- continue_on_last_cb_param as *mut ContinueCancelCb,
+ continue_on_last_user_data as *mut ContinueCancelCb,
));
}
- if !cancel_cb_param.is_null() {
- drop(Box::from_raw(cancel_cb_param as *mut ContinueCancelCb));
+ if !cancel_user_data.is_null() {
+ drop(Box::from_raw(cancel_user_data as *mut ContinueCancelCb));
}
})),
_p: PhantomData,
@@ -323,12 +323,12 @@ pub fn trinary_choice_create<'a>(
label_right: Option<&'a str>,
chosen_callback: TrinaryChoiceCb,
) -> Component<'a> {
- unsafe extern "C" fn c_chosen_cb(choice: TrinaryChoice, param: *mut c_void) {
- let callback = param as *mut TrinaryChoiceCb;
+ unsafe extern "C" fn c_chosen_cb(choice: TrinaryChoice, user_data: *mut c_void) {
+ let callback = user_data as *mut TrinaryChoiceCb;
unsafe { (*callback)(choice) };
}
- let chosen_cb_param = Box::into_raw(Box::new(chosen_callback)) as *mut c_void;
+ let chosen_user_data = Box::into_raw(Box::new(chosen_callback)) as *mut c_void;
let label_left = label_left.map(|label| crate::util::str_to_cstr_vec(label).unwrap());
let label_middle = label_middle.map(|label| crate::util::str_to_cstr_vec(label).unwrap());
@@ -350,7 +350,7 @@ pub fn trinary_choice_create<'a>(
.as_ref()
.map_or_else(core::ptr::null, |label| label.as_ptr()),
Some(c_chosen_cb as _),
- chosen_cb_param,
+ chosen_user_data,
core::ptr::null_mut(), // parent component, there is no parent.
)
};
@@ -359,7 +359,7 @@ pub fn trinary_choice_create<'a>(
is_pushed: false,
on_drop: Some(Box::new(move || unsafe {
// Drop all callbacks.
- drop(Box::from_raw(chosen_cb_param as *mut TrinaryChoiceCb));
+ drop(Box::from_raw(chosen_user_data as *mut TrinaryChoiceCb));
})),
_p: PhantomData,
}
@@ -370,18 +370,18 @@ pub fn confirm_transaction_address_create<'a, 'b>(
address: &'a str,
callback: AcceptRejectCb<'b>,
) -> Component<'b> {
- unsafe extern "C" fn c_callback(result: bool, param: *mut c_void) {
- let callback = param as *mut AcceptRejectCb;
+ unsafe extern "C" fn c_callback(result: bool, user_data: *mut c_void) {
+ let callback = user_data as *mut AcceptRejectCb;
unsafe { (*callback)(result) };
}
- let callback_param = Box::into_raw(Box::new(callback)) as *mut c_void;
+ let user_data = Box::into_raw(Box::new(callback)) as *mut c_void;
let component = unsafe {
bitbox02_sys::confirm_transaction_address_create(
crate::util::str_to_cstr_vec(amount).unwrap().as_ptr(), // copied in C
crate::util::str_to_cstr_vec(address).unwrap().as_ptr(), // copied in C
Some(c_callback as _),
- callback_param,
+ user_data,
)
};
Component {
@@ -389,7 +389,7 @@ pub fn confirm_transaction_address_create<'a, 'b>(
is_pushed: false,
on_drop: Some(Box::new(move || unsafe {
// Drop all callbacks.
- drop(Box::from_raw(callback_param as *mut AcceptRejectCb));
+ drop(Box::from_raw(user_data as *mut AcceptRejectCb));
})),
_p: PhantomData,
}
@@ -401,19 +401,19 @@ pub fn confirm_transaction_fee_create<'a, 'b>(
longtouch: bool,
callback: AcceptRejectCb<'b>,
) -> Component<'b> {
- unsafe extern "C" fn c_callback(result: bool, param: *mut c_void) {
- let callback = param as *mut AcceptRejectCb;
+ unsafe extern "C" fn c_callback(result: bool, user_data: *mut c_void) {
+ let callback = user_data as *mut AcceptRejectCb;
unsafe { (*callback)(result) };
}
- let callback_param = Box::into_raw(Box::new(callback)) as *mut c_void;
+ let user_data = Box::into_raw(Box::new(callback)) as *mut c_void;
let component = unsafe {
bitbox02_sys::confirm_transaction_fee_create(
crate::util::str_to_cstr_vec(amount).unwrap().as_ptr(), // copied in C
crate::util::str_to_cstr_vec(fee).unwrap().as_ptr(), // copied in C
longtouch,
Some(c_callback as _),
- callback_param,
+ user_data,
)
};
Component {
@@ -421,7 +421,7 @@ pub fn confirm_transaction_fee_create<'a, 'b>(
is_pushed: false,
on_drop: Some(Box::new(move || unsafe {
// Drop all callbacks.
- drop(Box::from_raw(callback_param as *mut AcceptRejectCb));
+ drop(Box::from_raw(user_data as *mut AcceptRejectCb));
})),
_p: PhantomData,
}
diff --git a/src/ui/components/confirm.c b/src/ui/components/confirm.c
index 1a8bcb4..5ce723a 100644
--- a/src/ui/components/confirm.c
+++ b/src/ui/components/confirm.c
@@ -28,14 +28,14 @@
typedef struct {
void (*callback)(bool, void* param);
- void* callback_param;
+ void* user_data;
} data_t;
static void _dispatch_confirm(component_t* self)
{
data_t* data = (data_t*)self->data;
if (data->callback) {
- data->callback(true, data->callback_param);
+ data->callback(true, data->user_data);
data->callback = NULL;
}
}
@@ -58,7 +58,7 @@ static void _on_cancel(component_t* component)
component_t* self = component->parent;
data_t* data = (data_t*)self->data;
if (data->callback) {
- data->callback(false, data->callback_param);
+ data->callback(false, data->user_data);
data->callback = NULL;
}
}
@@ -78,8 +78,8 @@ static const component_functions_t _component_functions = {
component_t* confirm_create(
const confirm_params_t* params,
- void (*callback)(bool, void* param),
- void* callback_param)
+ void (*callback)(bool result, void* user_data),
+ void* user_data)
{
if (!callback) {
Abort("confirm_create callback missing");
@@ -96,7 +96,7 @@ component_t* confirm_create(
}
memset(data, 0, sizeof(data_t));
data->callback = callback;
- data->callback_param = callback_param;
+ data->user_data = user_data;
confirm->data = data;
confirm->f = &_component_functions;
diff --git a/src/ui/components/confirm.h b/src/ui/components/confirm.h
index abba721..12424a4 100644
--- a/src/ui/components/confirm.h
+++ b/src/ui/components/confirm.h
@@ -47,11 +47,11 @@ typedef struct {
* @param[in] params see confirm_params_t for details.
* @param[in] callback The callback triggered when the user accepts or rejects. Will be called at
* most once.
- * @param[in] callback_param passed through to the callback.
+ * @param[in] user_data passed through to the callback.
*/
component_t* confirm_create(
const confirm_params_t* params,
- void (*callback)(bool, void* param),
- void* callback_param);
+ void (*callback)(bool result, void* user_data),
+ void* user_data);
#endif
diff --git a/src/ui/components/confirm_transaction.c b/src/ui/components/confirm_transaction.c
index 9632f66..357d186 100644
--- a/src/ui/components/confirm_transaction.c
+++ b/src/ui/components/confirm_transaction.c
@@ -33,8 +33,8 @@ typedef struct {
bool has_address;
// accepted: true means the user accepted the info shown, false means the user rejected the
// info.
- void (*callback)(bool accepted, void* param);
- void* callback_param;
+ void (*callback)(bool accepted, void* user_data);
+ void* user_data;
} data_t;
static void _render(component_t* component)
@@ -55,7 +55,7 @@ static void _on_event(const event_t* event, component_t* component)
if (event->id == EVENT_CONFIRM) {
data_t* data = (data_t*)component->data;
if (data->callback) {
- data->callback(true, data->callback_param);
+ data->callback(true, data->user_data);
data->callback = NULL;
}
}
@@ -66,7 +66,7 @@ static void _cancel(component_t* cancel_button)
component_t* component = cancel_button->parent;
data_t* data = (data_t*)component->data;
if (data->callback != NULL) {
- data->callback(false, data->callback_param);
+ data->callback(false, data->user_data);
data->callback = NULL;
}
}
@@ -90,8 +90,8 @@ static component_t* _confirm_transaction_create(
const char* fee,
bool verify_total, /* if true, verify total and fee, otherwise verify amount and address */
bool longtouch,
- void (*callback)(bool, void*),
- void* callback_param)
+ void (*callback)(bool accepted, void* user_data),
+ void* user_data)
{
if (address && fee) {
Abort("Error: confirm btc does not support displaying both address and fee");
@@ -112,7 +112,7 @@ static component_t* _confirm_transaction_create(
data->has_address = strlens(address);
data->callback = callback;
- data->callback_param = callback_param;
+ data->user_data = user_data;
confirm->data = data;
confirm->f = &_component_functions;
confirm->dimension.width = SCREEN_WIDTH;
@@ -153,20 +153,18 @@ static component_t* _confirm_transaction_create(
component_t* confirm_transaction_address_create(
const char* amount,
const char* address,
- void (*callback)(bool accepted, void* param),
- void* callback_param)
+ void (*callback)(bool accepted, void* user_data),
+ void* user_data)
{
- return _confirm_transaction_create(
- amount, address, NULL, false, false, callback, callback_param);
+ return _confirm_transaction_create(amount, address, NULL, false, false, callback, user_data);
}
component_t* confirm_transaction_fee_create(
const char* amount,
const char* fee,
bool longtouch,
- void (*callback)(bool accepted, void* param),
- void* callback_param)
+ void (*callback)(bool accepted, void* user_data),
+ void* user_data)
{
- return _confirm_transaction_create(
- amount, NULL, fee, true, longtouch, callback, callback_param);
+ return _confirm_transaction_create(amount, NULL, fee, true, longtouch, callback, user_data);
}
diff --git a/src/ui/components/confirm_transaction.h b/src/ui/components/confirm_transaction.h
index f63e0fb..ffa5586 100644
--- a/src/ui/components/confirm_transaction.h
+++ b/src/ui/components/confirm_transaction.h
@@ -23,13 +23,13 @@
* @param[in] address to send coins
* @param[in] callback The callback triggered when the user accepts or rejects. Is called at most
* once.
- * @param[in] callback_param Passed to `callback`.
+ * @param[in] user_data Passed to `callback`.
*/
component_t* confirm_transaction_address_create(
const char* amount,
const char* address,
- void (*callback)(bool accepted, void* param),
- void* callback_param);
+ void (*callback)(bool accepted, void* user_data),
+ void* user_data);
/**
* Creates a confirm screen.
@@ -39,13 +39,13 @@ component_t* confirm_transaction_address_create(
* next-arrow is shown.
* @param[in] callback The callback triggered when the user accepts or rejects. Is called at most
* once.
- * @param[in] callback_param Passed to `callback`.
+ * @param[in] user_data Passed to `callback`.
*/
component_t* confirm_transaction_fee_create(
const char* amount,
const char* fee,
bool longtouch,
- void (*callback)(bool accepted, void* param),
- void* callback_param);
+ void (*callback)(bool accepted, void* user_data),
+ void* user_data);
#endif
diff --git a/src/ui/components/sdcard.c b/src/ui/components/sdcard.c
index 795b229..829c5e7 100644
--- a/src/ui/components/sdcard.c
+++ b/src/ui/components/sdcard.c
@@ -23,8 +23,8 @@
#include <ui/screen_stack.h>
typedef struct {
- void (*callback)(bool, void*);
- void* callback_param;
+ void (*callback)(bool inserted, void* user_data);
+ void* user_data;
// TODO: use a TIMER interrupt to get a more accurate timer.
// 250 is ~0.5 sec. Unit: rendering rate.
int check_interval;
@@ -35,7 +35,7 @@ static void _insert_poll_callback(component_t* component)
{
data_t* data = (data_t*)component->data;
if (data->callback && sd_card_inserted()) {
- data->callback(true, data->callback_param);
+ data->callback(true, data->user_data);
data->callback = NULL;
return;
}
@@ -68,12 +68,12 @@ static void _cancel_callback(component_t* component)
{
data_t* data = (data_t*)component->parent->data;
if (data->callback) {
- data->callback(false, data->callback_param);
+ data->callback(false, data->user_data);
data->callback = NULL;
}
}
-component_t* sdcard_create(void (*callback)(bool, void*), void* callback_param)
+component_t* sdcard_create(void (*callback)(bool inserted, void* user_data), void* user_data)
{
component_t* component = malloc(sizeof(component_t));
if (!component) {
@@ -87,7 +87,7 @@ component_t* sdcard_create(void (*callback)(bool, void*), void* callback_param)
memset(component, 0, sizeof(component_t));
data->callback = callback;
- data->callback_param = callback_param;
+ data->user_data = user_data;
data->check_interval = 250;
data->count = 0;
component->data = data;
diff --git a/src/ui/components/sdcard.h b/src/ui/components/sdcard.h
index 5c6c00d..e9a168c 100644
--- a/src/ui/components/sdcard.h
+++ b/src/ui/components/sdcard.h
@@ -22,6 +22,6 @@
* @param[in] insert if true, the user is asked to insert the sdcard. Otherwise the user is asked to
* remove it.
*/
-component_t* sdcard_create(void (*callback)(bool, void*), void* callback_param);
+component_t* sdcard_create(void (*callback)(bool inserted, void* user_data), void* user_data);
#endif
diff --git a/src/ui/components/status.c b/src/ui/components/status.c
index 42fbba1..962d753 100644
--- a/src/ui/components/status.c
+++ b/src/ui/components/status.c
@@ -26,8 +26,8 @@
typedef struct {
bool status;
int counter;
- void (*callback)(void*);
- void* callback_param;
+ void (*callback)(void* user_data);
+ void* user_data;
} status_data_t;
static void _render(component_t* component)
@@ -41,7 +41,7 @@ static void _render(component_t* component)
}
if (data->callback != NULL) {
if (data->counter == STATUS_DEFAULT_DELAY) {
- data->callback(data->callback_param);
+ data->callback(data->user_data);
data->callback = NULL;
data->counter = 0;
}
@@ -63,8 +63,8 @@ static const component_functions_t _component_functions = {
component_t* status_create(
const char* text,
bool status_success,
- void (*callback)(void*),
- void* callback_param)
+ void (*callback)(void* user_data),
+ void* user_data)
{
component_t* status = malloc(sizeof(component_t));
if (!status) {
@@ -79,7 +79,7 @@ component_t* status_create(
data->status = status_success;
data->callback = callback;
- data->callback_param = callback_param;
+ data->user_data = user_data;
status->data = data;
status->f = &_component_functions;
status->dimension.width = SCREEN_WIDTH;
diff --git a/src/ui/components/status.h b/src/ui/components/status.h
index fc09cd7..9bb00e6 100644
--- a/src/ui/components/status.h
+++ b/src/ui/components/status.h
@@ -29,7 +29,7 @@
component_t* status_create(
const char* text,
bool status_success,
- void (*callback)(void*),
- void* callback_param);
+ void (*callback)(void* user_data),
+ void* user_data);
#endif
diff --git a/src/ui/components/trinary_input_string.c b/src/ui/components/trinary_input_string.c
index 9ab0353..de3a915 100644
--- a/src/ui/components/trinary_input_string.c
+++ b/src/ui/components/trinary_input_string.c
@@ -72,10 +72,10 @@ typedef struct {
bool hide;
// use hold gesture vs. simple tap to confirm.
bool longtouch;
- void (*confirm_cb)(const char* string, void* param);
- void* confirm_callback_param;
- void (*cancel_cb)(void* param);
- void* cancel_callback_param;
+ void (*confirm_cb)(const char* string, void* confirm_user_data);
+ void* confirm_user_data;
+ void (*cancel_cb)(void* cancel_user_data);
+ void* cancel_user_data;
// Internals follow.
@@ -343,7 +343,7 @@ static void _on_event(const event_t* event, component_t* component)
if (event->id == EVENT_CONFIRM && data->can_confirm) {
if (data->confirm_cb) {
- data->confirm_cb(data->string, data->confirm_callback_param);
+ data->confirm_cb(data->string, data->confirm_user_data);
data->confirm_cb = NULL;
}
return;
@@ -366,7 +366,7 @@ static void _on_event(const event_t* event, component_t* component)
if (data->string_index == 0) {
// Back button is cancel.
if (data->cancel_cb != NULL) {
- data->cancel_cb(data->cancel_callback_param);
+ data->cancel_cb(data->cancel_user_data);
}
return;
}
@@ -394,7 +394,7 @@ static void _cancel(component_t* cancel_button)
component_t* component = cancel_button->parent;
data_t* data = (data_t*)component->data;
if (data->cancel_cb != NULL) {
- data->cancel_cb(data->cancel_callback_param);
+ data->cancel_cb(data->cancel_user_data);
}
}
@@ -435,10 +435,10 @@ static const component_functions_t component_functions = {
component_t* trinary_input_string_create(
const trinary_input_string_params_t* params,
- void (*confirm_cb)(const char* input, void* param),
- void* confirm_callback_param,
- void (*cancel_cb)(void* param),
- void* cancel_callback_param)
+ void (*confirm_cb)(const char* input, void* confirm_user_data),
+ void* confirm_user_data,
+ void (*cancel_cb)(void* cancel_user_data),
+ void* cancel_user_data)
{
component_t* component = malloc(sizeof(component_t));
if (!component) {
@@ -456,9 +456,9 @@ component_t* trinary_input_string_create(
}
data->confirm_cb = confirm_cb;
- data->confirm_callback_param = confirm_callback_param;
+ data->confirm_user_data = confirm_user_data;
data->cancel_cb = cancel_cb;
- data->cancel_callback_param = cancel_callback_param;
+ data->cancel_user_data = cancel_user_data;
data->wordlist = params->wordlist;
data->wordlist_size = params->wordlist_size;
data->number_input = params->number_input;
diff --git a/src/ui/components/trinary_input_string.h b/src/ui/components/trinary_input_string.h
index 64c2ba7..b804a8d 100644
--- a/src/ui/components/trinary_input_string.h
+++ b/src/ui/components/trinary_input_string.h
@@ -54,10 +54,10 @@ typedef struct {
*/
component_t* trinary_input_string_create(
const trinary_input_string_params_t* params,
- void (*confirm_cb)(const char* input, void* param),
- void* confirm_callback_param,
- void (*cancel_cb)(void* param),
- void* cancel_callback_param);
+ void (*confirm_cb)(const char* input, void* confirm_user_data),
+ void* confirm_user_data,
+ void (*cancel_cb)(void* cancel_user_data),
+ void* cancel_user_data);
/**
* Only applicable in wordlist-mode.
Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.