From 17a77f475c966581ca4158d0856d5a821a80fa82 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 5 Dec 2025 22:53:28 -0600 Subject: [PATCH] Cleanup: Switch from 'callback' to 'call'. --- sources/c/program/controller/controller/main.c | 6 +++--- sources/c/program/controller/init/init.h | 2 +- sources/c/program/controller/init/main.c | 6 +++--- sources/c/program/controller/main/common/type.h | 12 ++++++------ sources/c/program/controller/main/common/type/instance.h | 2 +- sources/c/program/controller/main/common/type/rule.h | 9 +++++---- sources/c/program/controller/main/entry.c | 4 ++-- sources/c/program/controller/main/entry.h | 2 +- sources/c/program/controller/main/process.c | 4 ++-- sources/c/program/controller/main/thread/signal.c | 8 ++++---- 10 files changed, 28 insertions(+), 27 deletions(-) diff --git a/sources/c/program/controller/controller/main.c b/sources/c/program/controller/controller/main.c index 5121a13..0fc3aec 100644 --- a/sources/c/program/controller/controller/main.c +++ b/sources/c/program/controller/controller/main.c @@ -17,9 +17,9 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { f_console_parameter_t parameters[] = controller_console_parameter_t_initialize; - data.callback.print_message_help = 0; - data.callback.process_entry_setup = 0; - data.callback.process_thread_signal = &controller_thread_signal; + data.call.print_message_help = 0; + data.call.process_entry_setup = 0; + data.call.process_thread_signal = &controller_thread_signal; data.program.parameters.array = parameters; data.program.parameters.used = controller_parameter_total_d; diff --git a/sources/c/program/controller/init/init.h b/sources/c/program/controller/init/init.h index 08aad9b..730b46c 100644 --- a/sources/c/program/controller/init/init.h +++ b/sources/c/program/controller/init/init.h @@ -21,7 +21,7 @@ extern "C" { #endif /** - * The init program implementation of the process_entry_setup() callback. + * The init program implementation of the process_entry_setup() call back. * * @param main * The main program data. diff --git a/sources/c/program/controller/init/main.c b/sources/c/program/controller/init/main.c index 19f7ffb..13c2b3c 100644 --- a/sources/c/program/controller/init/main.c +++ b/sources/c/program/controller/init/main.c @@ -29,9 +29,9 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { data.program.pipe = fll_program_data_pipe_input_e; } - data.callback.print_message_help = &controller_init_print_message_help; - data.callback.process_entry_setup = &controller_init_process_entry_setup; - data.callback.process_thread_signal = &controller_init_signal_thread; + data.call.print_message_help = &controller_init_print_message_help; + data.call.process_entry_setup = &controller_init_process_entry_setup; + data.call.process_thread_signal = &controller_init_signal_thread; data.process.entry.pid = controller_entry_pid_disable_e; data.process.entry.show = controller_entry_show_init_e; diff --git a/sources/c/program/controller/main/common/type.h b/sources/c/program/controller/main/common/type.h index bdfa342..15bef51 100644 --- a/sources/c/program/controller/main/common/type.h +++ b/sources/c/program/controller/main/common/type.h @@ -63,7 +63,7 @@ extern "C" { #endif // _di_controller_setting_t_ /** - * The Controller callbacks. + * The Controller call backs. * * Properties: * - print_message_help: Callback for printing the help message. @@ -76,9 +76,9 @@ extern "C" { f_status_t (*process_entry_setup)(controller_t * const main, controller_entry_t * const entry); void (*process_thread_signal)(controller_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute); - } controller_callback_t; + } controller_call_t; - #define controller_callback_t_initialize { \ + #define controller_call_t_initialize { \ .print_message_help = 0, \ .process_entry_setup = 0, \ .process_thread_signal = 0, \ @@ -93,7 +93,7 @@ extern "C" { * Properties: * - program: The main program data. * - * - callback: The callbacks. + * - call: The callbacks. * - process: The process data. * - setting: The settings data. * - thread: The thread data. @@ -102,7 +102,7 @@ extern "C" { struct controller_t_ { fll_program_data_t program; - controller_callback_t callback; + controller_call_t call; controller_process_t process; controller_setting_t setting; controller_thread_t thread; @@ -110,7 +110,7 @@ extern "C" { #define controller_t_initialize { \ .program = fll_program_data_t_initialize, \ - .callback = controller_callback_t_initialize, \ + .call = controller_call_t_initialize, \ .process = controller_process_t_initialize, \ .setting = controller_setting_t_initialize, \ .thread = controller_thread_t_initialize, \ diff --git a/sources/c/program/controller/main/common/type/instance.h b/sources/c/program/controller/main/common/type/instance.h index e61a27d..ae2d5fe 100644 --- a/sources/c/program/controller/main/common/type/instance.h +++ b/sources/c/program/controller/main/common/type/instance.h @@ -167,7 +167,7 @@ extern "C" { #endif // _di_controller_instance_initialize_ /** - * A callback intended to be passed to f_memory_arrays_resize() for an f_instances_t structure. + * A call back intended to be passed to f_memory_arrays_resize() for an f_instances_t structure. * * This is only called when shrinking the array and generally should perform de-allocations. * diff --git a/sources/c/program/controller/main/common/type/rule.h b/sources/c/program/controller/main/common/type/rule.h index cf57054..85554da 100644 --- a/sources/c/program/controller/main/common/type/rule.h +++ b/sources/c/program/controller/main/common/type/rule.h @@ -406,7 +406,7 @@ extern "C" { #endif // _di_controller_rule_action_delete_ /** - * A callback intended to be passed to f_memory_arrays_resize() for an controller_rule_actions_t structure. + * A call back intended to be passed to f_memory_arrays_resize() for an controller_rule_actions_t structure. * * This is only called when shrinking the array and generally should perform de-allocations. * @@ -472,8 +472,9 @@ extern "C" { #ifndef _di_controller_rule_item_delete_ extern void controller_rule_item_delete(controller_rule_item_t * const item); #endif // _di_controller_rule_item_delete_ + /** - * A callback intended to be passed to f_memory_arrays_resize() for an controller_rule_items_t structure. + * A call back intended to be passed to f_memory_arrays_resize() for an controller_rule_items_t structure. * * This is only called when shrinking the array and generally should perform de-allocations. * @@ -512,7 +513,7 @@ extern "C" { #endif // _di_controller_rule_on_delete_ /** - * A callback intended to be passed to f_memory_arrays_resize() for an controller_rule_ons_t structure. + * A call back intended to be passed to f_memory_arrays_resize() for an controller_rule_ons_t structure. * * This is only called when shrinking the array and generally should perform de-allocations. * @@ -539,7 +540,7 @@ extern "C" { #endif // _di_controller_rule_ons_delete_callback_ /** - * A callback intended to be passed to f_memory_arrays_resize() for an f_rules_t structure. + * A call back intended to be passed to f_memory_arrays_resize() for an f_rules_t structure. * * This is only called when shrinking the array and generally should perform de-allocations. * diff --git a/sources/c/program/controller/main/entry.c b/sources/c/program/controller/main/entry.c index 9a30473..3fab5b3 100644 --- a/sources/c/program/controller/main/entry.c +++ b/sources/c/program/controller/main/entry.c @@ -557,8 +557,8 @@ extern "C" { entry->items.used = 0; entry->session = controller_entry_session_same_e; - if (main->callback.process_entry_setup) { - const f_status_t status = main->callback.process_entry_setup(main, entry); + if (main->call.process_entry_setup) { + const f_status_t status = main->call.process_entry_setup(main, entry); if (F_status_is_error(status)) return status; } diff --git a/sources/c/program/controller/main/entry.h b/sources/c/program/controller/main/entry.h index acf059b..fbabcbb 100644 --- a/sources/c/program/controller/main/entry.h +++ b/sources/c/program/controller/main/entry.h @@ -182,7 +182,7 @@ extern "C" { * * F_parameter (with error bit) if a parameter is invalid. * - * Errors (with error bit) from: main->callback.process_entry_setup(). + * Errors (with error bit) from: main->call.process_entry_setup(). */ #ifndef _di_controller_entry_setup_ extern f_status_t controller_entry_setup(controller_t * const main, controller_entry_t * const entry); diff --git a/sources/c/program/controller/main/process.c b/sources/c/program/controller/main/process.c index 08930bf..0fdaf49 100644 --- a/sources/c/program/controller/main/process.c +++ b/sources/c/program/controller/main/process.c @@ -11,8 +11,8 @@ extern "C" { if (main->setting.flag & controller_main_flag_version_copyright_help_d) { if (main->setting.flag & controller_main_flag_help_d) { - if (main->callback.print_message_help) { - main->callback.print_message_help(&main->program.message); + if (main->call.print_message_help) { + main->call.print_message_help(&main->program.message); } else { controller_print_message_help(&main->program.message); diff --git a/sources/c/program/controller/main/thread/signal.c b/sources/c/program/controller/main/thread/signal.c index eb1c8ff..a78a113 100644 --- a/sources/c/program/controller/main/thread/signal.c +++ b/sources/c/program/controller/main/thread/signal.c @@ -203,8 +203,8 @@ extern "C" { if (argument) { controller_thread_arguments_t * const arguments = (controller_thread_arguments_t *) argument; - if (arguments->main && arguments->main->callback.process_thread_signal) { - arguments->main->callback.process_thread_signal(arguments->main, F_true, arguments->attribute); + if (arguments->main && arguments->main->call.process_thread_signal) { + arguments->main->call.process_thread_signal(arguments->main, F_true, arguments->attribute); } } @@ -221,8 +221,8 @@ extern "C" { if (argument) { controller_thread_arguments_t * const arguments = (controller_thread_arguments_t *) argument; - if (arguments->main && arguments->main->callback.process_thread_signal) { - arguments->main->callback.process_thread_signal(arguments->main, F_false, arguments->attribute); + if (arguments->main && arguments->main->call.process_thread_signal) { + arguments->main->call.process_thread_signal(arguments->main, F_false, arguments->attribute); } } -- 1.8.3.1