From: Kevin Day Date: Sat, 6 Dec 2025 05:08:11 +0000 (-0600) Subject: Update: Main program structures to follow consistent styling across several projects. X-Git-Tag: 0.7.4~13 X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=627afe9d82f0de82585f6403bb8fc5ad086606e2;p=controller Update: Main program structures to follow consistent styling across several projects. Switch to use the `_main_t` styling where `controller_t` is now `controller_main_t`. --- diff --git a/sources/c/program/controller/controller/main.c b/sources/c/program/controller/controller/main.c index 0fc3aec..945bd80 100644 --- a/sources/c/program/controller/controller/main.c +++ b/sources/c/program/controller/controller/main.c @@ -2,7 +2,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { - controller_t data = controller_t_initialize; + controller_main_t data = controller_t_initialize; data.program.debug.flag |= controller_print_flag_debug_e | controller_print_flag_out_e; data.program.error.flag |= controller_print_flag_error_e | controller_print_flag_out_e; diff --git a/sources/c/program/controller/init/init.c b/sources/c/program/controller/init/init.c index b9cfa0b..0c29bdc 100644 --- a/sources/c/program/controller/init/init.c +++ b/sources/c/program/controller/init/init.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_init_process_entry_setup_ - f_status_t controller_init_process_entry_setup(controller_t * const main, controller_entry_t * const entry) { + f_status_t controller_init_process_entry_setup(controller_main_t * const main, controller_entry_t * const entry) { if (!main || !entry) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/init/init.h b/sources/c/program/controller/init/init.h index 730b46c..207573d 100644 --- a/sources/c/program/controller/init/init.h +++ b/sources/c/program/controller/init/init.h @@ -41,7 +41,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_controller_init_process_entry_setup_ - extern f_status_t controller_init_process_entry_setup(controller_t * const main, controller_entry_t * const entry); + extern f_status_t controller_init_process_entry_setup(controller_main_t * const main, controller_entry_t * const entry); #endif // _di_controller_init_process_entry_setup_ #ifdef __cplusplus diff --git a/sources/c/program/controller/init/main.c b/sources/c/program/controller/init/main.c index 13c2b3c..a620d0f 100644 --- a/sources/c/program/controller/init/main.c +++ b/sources/c/program/controller/init/main.c @@ -2,7 +2,7 @@ int main(const int argc, const f_string_t *argv, const f_string_t *envp) { - controller_t data = controller_t_initialize; + controller_main_t data = controller_t_initialize; data.program.debug.flag |= controller_print_flag_debug_e | controller_print_flag_out_e; data.program.error.flag |= controller_print_flag_error_e | controller_print_flag_out_e; diff --git a/sources/c/program/controller/init/print.h b/sources/c/program/controller/init/print.h index 06f3408..103a596 100644 --- a/sources/c/program/controller/init/print.h +++ b/sources/c/program/controller/init/print.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/init/signal.c b/sources/c/program/controller/init/signal.c index 7068d68..b39f15e 100644 --- a/sources/c/program/controller/init/signal.c +++ b/sources/c/program/controller/init/signal.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_init_signal_thread_ - void controller_init_signal_thread(controller_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute) { + void controller_init_signal_thread(controller_main_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute) { if (!main || !attribute) return; if (!(main->setting.flag & controller_main_flag_interruptible_d)) return; diff --git a/sources/c/program/controller/init/signal.h b/sources/c/program/controller/init/signal.h index 9c5598f..79c0e74 100644 --- a/sources/c/program/controller/init/signal.h +++ b/sources/c/program/controller/init/signal.h @@ -34,7 +34,7 @@ extern "C" { * Must not be NULL. */ #ifndef _di_controller_init_signal_thread_ - extern void controller_init_signal_thread(controller_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute); + extern void controller_init_signal_thread(controller_main_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute); #endif // _di_controller_init_signal_thread_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/common.c b/sources/c/program/controller/main/common.c index 36f2111..28ff594 100644 --- a/sources/c/program/controller/main/common.c +++ b/sources/c/program/controller/main/common.c @@ -75,7 +75,7 @@ extern "C" { #endif // _di_controller_range_after_number_sign_ #ifndef _di_controller_setting_load_ - void controller_setting_load(const f_console_arguments_t arguments, controller_t * const main) { + void controller_setting_load(const f_console_arguments_t arguments, controller_main_t * const main) { if (!main) return; diff --git a/sources/c/program/controller/main/common.h b/sources/c/program/controller/main/common.h index c26574b..134e142 100644 --- a/sources/c/program/controller/main/common.h +++ b/sources/c/program/controller/main/common.h @@ -73,7 +73,7 @@ extern "C" { * @see fll_program_parameter_process_context() */ #ifndef _di_controller_setting_load_ - extern void controller_setting_load(const f_console_arguments_t arguments, controller_t * const main); + extern void controller_setting_load(const f_console_arguments_t arguments, controller_main_t * const main); #endif // _di_controller_setting_load_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/common/type.c b/sources/c/program/controller/main/common/type.c index edd5b7c..d11f66b 100644 --- a/sources/c/program/controller/main/common/type.c +++ b/sources/c/program/controller/main/common/type.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_delete_ - void controller_delete(controller_t * const controller) { + void controller_delete(controller_main_t * const controller) { if (!controller) return; diff --git a/sources/c/program/controller/main/common/type.h b/sources/c/program/controller/main/common/type.h index 15bef51..a163101 100644 --- a/sources/c/program/controller/main/common/type.h +++ b/sources/c/program/controller/main/common/type.h @@ -70,12 +70,12 @@ extern "C" { * - process_entry_setup: Perform any optional initialization on the entry. * - process_thread_signal: Handle signals for threaded operation. */ -#ifndef _di_controller_t_ +#ifndef _di_controller_main_t_ typedef struct { f_status_t (*print_message_help)(fl_print_t * const print); - 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); + f_status_t (*process_entry_setup)(controller_main_t * const main, controller_entry_t * const entry); + void (*process_thread_signal)(controller_main_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute); } controller_call_t; #define controller_call_t_initialize { \ @@ -83,7 +83,7 @@ extern "C" { .process_entry_setup = 0, \ .process_thread_signal = 0, \ } -#endif // _di_controller_t_ +#endif // _di_controller_main_t_ /** * The main program data. @@ -93,13 +93,13 @@ extern "C" { * Properties: * - program: The main program data. * - * - call: The callbacks. - * - process: The process data. - * - setting: The settings data. - * - thread: The thread data. + * - call: The callbacks. + * - process: The process data. + * - setting: The settings data. + * - thread: The thread data. */ -#ifndef _di_controller_t_ - struct controller_t_ { +#ifndef _di_controller_main_t_ + struct controller_main_t_ { fll_program_data_t program; controller_call_t call; @@ -110,12 +110,12 @@ extern "C" { #define controller_t_initialize { \ .program = fll_program_data_t_initialize, \ - .call = controller_call_t_initialize, \ + .call = controller_call_t_initialize, \ .process = controller_process_t_initialize, \ .setting = controller_setting_t_initialize, \ .thread = controller_thread_t_initialize, \ } -#endif // _di_controller_t_ +#endif // _di_controller_main_t_ /** * De-allocate controller data. @@ -135,7 +135,7 @@ extern "C" { * @see fll_program_data_delete() */ #ifndef _di_controller_delete_ - extern void controller_delete(controller_t * const controller); + extern void controller_delete(controller_main_t * const controller); #endif // _di_controller_delete_ /** diff --git a/sources/c/program/controller/main/common/type/defs.h b/sources/c/program/controller/main/common/type/defs.h index 29bc797..db5c4f2 100644 --- a/sources/c/program/controller/main/common/type/defs.h +++ b/sources/c/program/controller/main/common/type/defs.h @@ -20,7 +20,7 @@ extern "C" { * Pre-define the main type so it can be used in child classes. */ #ifndef _di_fake_main_t_typedef_ - typedef struct controller_t_ controller_t; + typedef struct controller_main_t_ controller_main_t; #endif // _di_fake_main_t_typedef_ /** diff --git a/sources/c/program/controller/main/common/type/instance.h b/sources/c/program/controller/main/common/type/instance.h index ae2d5fe..7cb08af 100644 --- a/sources/c/program/controller/main/common/type/instance.h +++ b/sources/c/program/controller/main/common/type/instance.h @@ -78,7 +78,7 @@ extern "C" { controller_rule_t rule; controller_rules_t stack; controller_cache_t cache; - controller_t *main; + controller_main_t *main; }; #define controller_instance_t_initialize { \ diff --git a/sources/c/program/controller/main/common/type/interrupt.h b/sources/c/program/controller/main/common/type/interrupt.h index 3a3772d..9e5c31b 100644 --- a/sources/c/program/controller/main/common/type/interrupt.h +++ b/sources/c/program/controller/main/common/type/interrupt.h @@ -27,7 +27,7 @@ extern "C" { typedef struct { uint8_t is_normal; - controller_t *main; + controller_main_t *main; } controller_interrupt_t; #define controller_interrupt_t_initialize { \ diff --git a/sources/c/program/controller/main/common/type/thread.h b/sources/c/program/controller/main/common/type/thread.h index a802084..8ed56f8 100644 --- a/sources/c/program/controller/main/common/type/thread.h +++ b/sources/c/program/controller/main/common/type/thread.h @@ -85,7 +85,7 @@ extern "C" { */ #ifndef _di_controller_thread_arguments_t_ typedef struct { - controller_t * const main; + controller_main_t * const main; f_thread_attribute_t * const attribute; } controller_thread_arguments_t; diff --git a/sources/c/program/controller/main/entry.c b/sources/c/program/controller/main/entry.c index 3fab5b3..cb19681 100644 --- a/sources/c/program/controller/main/entry.c +++ b/sources/c/program/controller/main/entry.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_entry_extract_ - f_status_t controller_entry_extract(controller_t * const main, const uint8_t is_entry) { + f_status_t controller_entry_extract(controller_main_t * const main, const uint8_t is_entry) { if (!main) return F_status_set_error(F_parameter); @@ -289,7 +289,7 @@ extern "C" { #endif // _di_controller_entry_extract_ #ifndef _di_controller_entry_read_ - f_status_t controller_entry_read(controller_t * const main, const uint8_t is_entry) { + f_status_t controller_entry_read(controller_main_t * const main, const uint8_t is_entry) { if (!main) return F_status_set_error(F_parameter); @@ -319,7 +319,7 @@ extern "C" { #endif // _di_controller_entry_read_ #ifndef _di_controller_entry_load_ - f_status_t controller_entry_load(controller_t * const main, const uint8_t is_entry) { + f_status_t controller_entry_load(controller_main_t * const main, const uint8_t is_entry) { if (!main) return F_status_set_error(F_parameter); @@ -389,7 +389,7 @@ extern "C" { #endif // _di_controller_entry_load_ #ifndef _di_controller_entry_load_rules_ - f_status_t controller_entry_load_rules(controller_t * const main, const uint8_t is_entry) { + f_status_t controller_entry_load_rules(controller_main_t * const main, const uint8_t is_entry) { if (!main) return F_status_set_error(F_parameter); @@ -549,7 +549,7 @@ extern "C" { #endif // _di_controller_entry_load_rules_ #ifndef _di_controller_entry_setup_ - f_status_t controller_entry_setup(controller_t * const main, controller_entry_t * const entry) { + f_status_t controller_entry_setup(controller_main_t * const main, controller_entry_t * const entry) { if (!main || !entry) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/entry.h b/sources/c/program/controller/main/entry.h index fbabcbb..776a2e5 100644 --- a/sources/c/program/controller/main/entry.h +++ b/sources/c/program/controller/main/entry.h @@ -61,7 +61,7 @@ extern "C" { * @see f_string_dynamic_partial_append() */ #ifndef _di_controller_entry_extract_ - extern f_status_t controller_entry_extract(controller_t * const main, const uint8_t is_entry); + extern f_status_t controller_entry_extract(controller_main_t * const main, const uint8_t is_entry); #endif // _di_controller_entry_extract_ /** @@ -96,7 +96,7 @@ extern "C" { * @see fll_fss_basic_list_read() */ #ifndef _di_controller_entry_load_ - extern f_status_t controller_entry_load(controller_t * const main, const uint8_t is_entry); + extern f_status_t controller_entry_load(controller_main_t * const main, const uint8_t is_entry); #endif // _di_controller_entry_load_ /** @@ -128,7 +128,7 @@ extern "C" { * @see fll_fss_basic_list_read() */ #ifndef _di_controller_entry_load_rules_ - extern f_status_t controller_entry_load_rules(controller_t * const main, const uint8_t is_entry); + extern f_status_t controller_entry_load_rules(controller_main_t * const main, const uint8_t is_entry); #endif // _di_controller_entry_load_rules_ /** @@ -160,7 +160,7 @@ extern "C" { * @see controller_mutex_lock_standard() */ #ifndef _di_controller_entry_read_ - extern f_status_t controller_entry_read(controller_t * const main, const uint8_t is_entry); + extern f_status_t controller_entry_read(controller_main_t * const main, const uint8_t is_entry); #endif // _di_controller_entry_read_ /** @@ -185,7 +185,7 @@ extern "C" { * 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); + extern f_status_t controller_entry_setup(controller_main_t * const main, controller_entry_t * const entry); #endif // _di_controller_entry_setup_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/entry/action.c b/sources/c/program/controller/main/entry/action.c index 489b516..e89fc02 100644 --- a/sources/c/program/controller/main/entry/action.c +++ b/sources/c/program/controller/main/entry/action.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_entry_action_read_ - f_status_t controller_entry_action_read(controller_t * const main, controller_entry_t * const entry, const f_range_t range, controller_entry_actions_t * const actions) { + f_status_t controller_entry_action_read(controller_main_t * const main, controller_entry_t * const entry, const f_range_t range, controller_entry_actions_t * const actions) { if (!main || !entry || !actions) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/entry/action.h b/sources/c/program/controller/main/entry/action.h index dd55031..bac930f 100644 --- a/sources/c/program/controller/main/entry/action.h +++ b/sources/c/program/controller/main/entry/action.h @@ -56,7 +56,7 @@ extern "C" { * @see fll_fss_extended_read() */ #ifndef _di_controller_entry_action_read_ - extern f_status_t controller_entry_action_read(controller_t * const main, controller_entry_t * const entry, const f_range_t range, controller_entry_actions_t * const actions); + extern f_status_t controller_entry_action_read(controller_main_t * const main, controller_entry_t * const entry, const f_range_t range, controller_entry_actions_t * const actions); #endif // _di_controller_entry_action_read_ /** diff --git a/sources/c/program/controller/main/entry/preprocess.c b/sources/c/program/controller/main/entry/preprocess.c index e92ccc3..6310e3e 100644 --- a/sources/c/program/controller/main/entry/preprocess.c +++ b/sources/c/program/controller/main/entry/preprocess.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_entry_preprocess_ - f_status_t controller_entry_preprocess(controller_t * const main, const uint8_t is_entry) { + f_status_t controller_entry_preprocess(controller_main_t * const main, const uint8_t is_entry) { f_status_t status = F_okay; f_status_t status2 = F_okay; diff --git a/sources/c/program/controller/main/entry/preprocess.h b/sources/c/program/controller/main/entry/preprocess.h index 6fd1b86..9f1f8bd 100644 --- a/sources/c/program/controller/main/entry/preprocess.h +++ b/sources/c/program/controller/main/entry/preprocess.h @@ -42,7 +42,7 @@ extern "C" { * @see f_string_dynamic_append() */ #ifndef _di_controller_entry_preprocess_ - extern f_status_t controller_entry_preprocess(controller_t * const main, const uint8_t is_entry); + extern f_status_t controller_entry_preprocess(controller_main_t * const main, const uint8_t is_entry); #endif // _di_controller_entry_preprocess_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/entry/process.c b/sources/c/program/controller/main/entry/process.c index e2c4e40..586e0bd 100644 --- a/sources/c/program/controller/main/entry/process.c +++ b/sources/c/program/controller/main/entry/process.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_entry_process_ - f_status_t controller_entry_process(controller_t * const main, const uint8_t is_entry, const uint8_t failsafe) { + f_status_t controller_entry_process(controller_main_t * const main, const uint8_t is_entry, const uint8_t failsafe) { f_status_t status = F_okay; f_status_t status_lock = F_okay; diff --git a/sources/c/program/controller/main/entry/process.h b/sources/c/program/controller/main/entry/process.h index e49ac49..85aab0c 100644 --- a/sources/c/program/controller/main/entry/process.h +++ b/sources/c/program/controller/main/entry/process.h @@ -48,7 +48,7 @@ extern "C" { * @see controller_perform_ready() */ #ifndef _di_controller_entry_process_ - extern f_status_t controller_entry_process(controller_t * const main, const uint8_t is_entry, const uint8_t failsafe); + extern f_status_t controller_entry_process(controller_main_t * const main, const uint8_t is_entry, const uint8_t failsafe); #endif // _di_controller_entry_process_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/entry/setting.c b/sources/c/program/controller/main/entry/setting.c index 584f6fc..c43a803 100644 --- a/sources/c/program/controller/main/entry/setting.c +++ b/sources/c/program/controller/main/entry/setting.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_entry_setting_read_ - f_status_t controller_entry_setting_read(controller_t * const main, const uint8_t is_entry, const f_range_t content_range) { + f_status_t controller_entry_setting_read(controller_main_t * const main, const uint8_t is_entry, const f_range_t content_range) { if (!main) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/entry/setting.h b/sources/c/program/controller/main/entry/setting.h index b7e0641..688e8f3 100644 --- a/sources/c/program/controller/main/entry/setting.h +++ b/sources/c/program/controller/main/entry/setting.h @@ -59,7 +59,7 @@ extern "C" { * @see controller_path_canonical_relative() */ #ifndef _di_controller_entry_setting_read_ - extern f_status_t controller_entry_setting_read(controller_t * const main, const uint8_t is_entry, const f_range_t content_range); + extern f_status_t controller_entry_setting_read(controller_main_t * const main, const uint8_t is_entry, const f_range_t content_range); #endif // _di_controller_entry_setting_read_ /** diff --git a/sources/c/program/controller/main/file.c b/sources/c/program/controller/main/file.c index b7d31f4..c45d9e5 100644 --- a/sources/c/program/controller/main/file.c +++ b/sources/c/program/controller/main/file.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_file_load_ - f_status_t controller_file_load(controller_t * const main, const uint8_t required, const f_string_static_t path_prefix, const f_string_static_t path_name, const f_string_static_t path_suffix) { + f_status_t controller_file_load(controller_main_t * const main, const uint8_t required, const f_string_static_t path_prefix, const f_string_static_t path_name, const f_string_static_t path_suffix) { if (!main) return F_status_set_error(F_parameter); @@ -120,7 +120,7 @@ extern "C" { #endif // _di_controller_file_load_ #if defined(_support_controller_controlfile_) && !defined(_di_controller_file_load_controlfile_) - f_status_t controller_file_load_controlfile(controller_t * const main) { + f_status_t controller_file_load_controlfile(controller_main_t * const main) { if (!main) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/file.h b/sources/c/program/controller/main/file.h index 75604e1..f38269d 100644 --- a/sources/c/program/controller/main/file.h +++ b/sources/c/program/controller/main/file.h @@ -54,7 +54,7 @@ extern "C" { * @see f_string_append() */ #ifndef _di_controller_file_load_ - extern f_status_t controller_file_load(controller_t * const main, const uint8_t required, const f_string_static_t path_prefix, const f_string_static_t path_name, const f_string_static_t path_suffix); + extern f_status_t controller_file_load(controller_main_t * const main, const uint8_t required, const f_string_static_t path_prefix, const f_string_static_t path_name, const f_string_static_t path_suffix); #endif // _di_controller_file_load_ /** @@ -81,7 +81,7 @@ extern "C" { * @see f_file_stream_read() */ #if defined(_support_controller_controlfile_) && !defined(_di_controller_file_load_controlfile_) - extern f_status_t controller_file_load_controlfile(controller_t * const main); + extern f_status_t controller_file_load_controlfile(controller_main_t * const main); #endif // defined(_support_controller_controlfile_) && !defined(_di_controller_file_load_controlfile_) /** diff --git a/sources/c/program/controller/main/instance/prepare.c b/sources/c/program/controller/main/instance/prepare.c index 7195ad5..ce2dbac 100644 --- a/sources/c/program/controller/main/instance/prepare.c +++ b/sources/c/program/controller/main/instance/prepare.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_instance_prepare_ - f_status_t controller_instance_prepare(controller_t * const main, const uint8_t is_normal, const uint8_t action, const f_string_static_t alias, controller_instance_t ** const instance) { + f_status_t controller_instance_prepare(controller_main_t * const main, const uint8_t is_normal, const uint8_t action, const f_string_static_t alias, controller_instance_t ** const instance) { if (!main) return F_status_set_error(F_parameter); @@ -65,7 +65,7 @@ extern "C" { #endif // _di_controller_instance_prepare_ #ifndef _di_controller_instance_prepare_instance_type_ - f_status_t controller_instance_prepare_instance_type(controller_t * const main, const uint8_t type, const uint8_t action, const f_string_static_t alias, controller_instance_t ** const instance) { + f_status_t controller_instance_prepare_instance_type(controller_main_t * const main, const uint8_t type, const uint8_t action, const f_string_static_t alias, controller_instance_t ** const instance) { return controller_instance_prepare(main, type != controller_instance_type_exit_e, action, alias, instance); } diff --git a/sources/c/program/controller/main/instance/prepare.h b/sources/c/program/controller/main/instance/prepare.h index 9200362..eee4d07 100644 --- a/sources/c/program/controller/main/instance/prepare.h +++ b/sources/c/program/controller/main/instance/prepare.h @@ -56,7 +56,7 @@ extern "C" { * @see controller_lock_write_standard() */ #ifndef _di_controller_instance_prepare_ - extern f_status_t controller_instance_prepare(controller_t * const main, const uint8_t is_normal, const uint8_t action, const f_string_static_t alias, controller_instance_t ** const instance); + extern f_status_t controller_instance_prepare(controller_main_t * const main, const uint8_t is_normal, const uint8_t action, const f_string_static_t alias, controller_instance_t ** const instance); #endif // _di_controller_instance_prepare_ /** @@ -90,7 +90,7 @@ extern "C" { * @see controller_instance_prepare() */ #ifndef _di_controller_instance_prepare_instance_type_ - extern f_status_t controller_instance_prepare_instance_type(controller_t * const main, const uint8_t type, const uint8_t action, const f_string_static_t alias, controller_instance_t ** const instance); + extern f_status_t controller_instance_prepare_instance_type(controller_main_t * const main, const uint8_t type, const uint8_t action, const f_string_static_t alias, controller_instance_t ** const instance); #endif // _di_controller_instance_prepare_instance_type_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/path.c b/sources/c/program/controller/main/path.c index c86ac48..9be612a 100644 --- a/sources/c/program/controller/main/path.c +++ b/sources/c/program/controller/main/path.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_path_canonical_relative_ - f_status_t controller_path_canonical_relative(controller_t * const main, const f_string_static_t current, const f_string_static_t source, f_string_dynamic_t * const destination) { + f_status_t controller_path_canonical_relative(controller_main_t * const main, const f_string_static_t current, const f_string_static_t source, f_string_dynamic_t * const destination) { if (!main || !destination) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/path.h b/sources/c/program/controller/main/path.h index 8381231..3b8c70a 100644 --- a/sources/c/program/controller/main/path.h +++ b/sources/c/program/controller/main/path.h @@ -54,7 +54,7 @@ extern "C" { * @see memmove() */ #ifndef _di_controller_path_canonical_relative_ - extern f_status_t controller_path_canonical_relative(controller_t * const main, const f_string_static_t current, const f_string_static_t source, f_string_dynamic_t * const destination); + extern f_status_t controller_path_canonical_relative(controller_main_t * const main, const f_string_static_t current, const f_string_static_t source, f_string_dynamic_t * const destination); #endif // _di_controller_path_canonical_relative_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/perform.c b/sources/c/program/controller/main/perform.c index b7e0391..3a07f4f 100644 --- a/sources/c/program/controller/main/perform.c +++ b/sources/c/program/controller/main/perform.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_perform_ready_ - f_status_t controller_perform_ready(controller_t * const main, const uint8_t is_entry) { + f_status_t controller_perform_ready(controller_main_t * const main, const uint8_t is_entry) { if (!main) return F_status_set_error(F_parameter); if (!is_entry) return F_okay; @@ -59,7 +59,7 @@ extern "C" { #endif // _di_controller_perform_ready_ #ifndef _di_controller_perform_ready_socket_ - f_status_t controller_perform_ready_socket(controller_t * const main) { + f_status_t controller_perform_ready_socket(controller_main_t * const main) { f_status_t status = F_okay; diff --git a/sources/c/program/controller/main/perform.h b/sources/c/program/controller/main/perform.h index 65397e4..df13381 100644 --- a/sources/c/program/controller/main/perform.h +++ b/sources/c/program/controller/main/perform.h @@ -39,7 +39,7 @@ extern "C" { * @see controller_file_pid_create() */ #ifndef _di_controller_perform_ready_ - extern f_status_t controller_perform_ready(controller_t * const main, const uint8_t is_entry); + extern f_status_t controller_perform_ready(controller_main_t * const main, const uint8_t is_entry); #endif // _di_controller_perform_ready_ /** @@ -73,7 +73,7 @@ extern "C" { * @see f_thread_create() */ #ifndef _di_controller_perform_ready_socket_ - extern f_status_t controller_perform_ready_socket(controller_t * const main); + extern f_status_t controller_perform_ready_socket(controller_main_t * const main); #endif // _di_controller_perform_ready_socket_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/print/debug.c b/sources/c/program/controller/main/print/debug.c index 05b6edc..9e6b965 100644 --- a/sources/c/program/controller/main/print/debug.c +++ b/sources/c/program/controller/main/print/debug.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, 0); diff --git a/sources/c/program/controller/main/print/debug.h b/sources/c/program/controller/main/print/debug.h index c3c297d..c7f971d 100644 --- a/sources/c/program/controller/main/print/debug.h +++ b/sources/c/program/controller/main/print/debug.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/debug/perform/control.c b/sources/c/program/controller/main/print/debug/perform/control.c index 15901b3..4643aab 100644 --- a/sources/c/program/controller/main/print/debug/perform/control.c +++ b/sources/c/program/controller/main/print/debug/perform/control.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -30,7 +30,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -48,7 +48,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/debug/perform/control.h b/sources/c/program/controller/main/print/debug/perform/control.h index cced187..6c60acb 100644 --- a/sources/c/program/controller/main/print/debug/perform/control.h +++ b/sources/c/program/controller/main/print/debug/perform/control.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -48,7 +48,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -70,7 +70,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/debug/perform/pid.c b/sources/c/program/controller/main/print/debug/perform/pid.c index cab1d25..eaa6363 100644 --- a/sources/c/program/controller/main/print/debug/perform/pid.c +++ b/sources/c/program/controller/main/print/debug/perform/pid.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -35,7 +35,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; if (F_status_set_fine(status) == F_read_only) { fl_print_format("%r%[%QThe pid file '%]", print->to, f_string_eol_s, print->context, print->prefix, print->context); @@ -60,7 +60,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/debug/perform/pid.h b/sources/c/program/controller/main/print/debug/perform/pid.h index c88dfa0..62e4582 100644 --- a/sources/c/program/controller/main/print/debug/perform/pid.h +++ b/sources/c/program/controller/main/print/debug/perform/pid.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -42,7 +42,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @param status @@ -72,7 +72,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/debug/rule/action.c b/sources/c/program/controller/main/print/debug/rule/action.c index c488850..a06f3e5 100644 --- a/sources/c/program/controller/main/print/debug/rule/action.c +++ b/sources/c/program/controller/main/print/debug/rule/action.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/debug/rule/action.h b/sources/c/program/controller/main/print/debug/rule/action.h index c3ba1a6..3e4f9b6 100644 --- a/sources/c/program/controller/main/print/debug/rule/action.h +++ b/sources/c/program/controller/main/print/debug/rule/action.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/debug/rule/execute.c b/sources/c/program/controller/main/print/debug/rule/execute.c index 037ce8a..87d2cba 100644 --- a/sources/c/program/controller/main/print/debug/rule/execute.c +++ b/sources/c/program/controller/main/print/debug/rule/execute.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !instance || !rerun) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/debug/rule/execute.h b/sources/c/program/controller/main/print/debug/rule/execute.h index fd407c5..3bc59f1 100644 --- a/sources/c/program/controller/main/print/debug/rule/execute.h +++ b/sources/c/program/controller/main/print/debug/rule/execute.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/debug/rule/instance.c b/sources/c/program/controller/main/print/debug/rule/instance.c index 5c073c2..5e26237 100644 --- a/sources/c/program/controller/main/print/debug/rule/instance.c +++ b/sources/c/program/controller/main/print/debug/rule/instance.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !instance) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/debug/rule/instance.h b/sources/c/program/controller/main/print/debug/rule/instance.h index fb9b146..f76d038 100644 --- a/sources/c/program/controller/main/print/debug/rule/instance.h +++ b/sources/c/program/controller/main/print/debug/rule/instance.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error.c b/sources/c/program/controller/main/print/error.c index 424a612..1ad8900 100644 --- a/sources/c/program/controller/main/print/error.c +++ b/sources/c/program/controller/main/print/error.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; f_thread_mutex_lock(&main->thread.lock.print.mutex); @@ -46,7 +46,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; f_thread_mutex_lock(&main->thread.lock.print.mutex); @@ -64,7 +64,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; f_thread_mutex_lock(&main->thread.lock.print.mutex); @@ -82,7 +82,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -102,7 +102,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; f_thread_mutex_lock(&main->thread.lock.print.mutex); diff --git a/sources/c/program/controller/main/print/error.h b/sources/c/program/controller/main/print/error.h index f99d6aa..fea3174 100644 --- a/sources/c/program/controller/main/print/error.h +++ b/sources/c/program/controller/main/print/error.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -48,7 +48,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -76,7 +76,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -108,7 +108,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -142,7 +142,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -170,7 +170,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/entry.c b/sources/c/program/controller/main/print/error/entry.c index 72be129..be464e5 100644 --- a/sources/c/program/controller/main/print/error/entry.c +++ b/sources/c/program/controller/main/print/error/entry.c @@ -11,7 +11,7 @@ extern "C" { if (print->verbosity < f_console_verbosity_error_e) return F_output_not; if (status == F_interrupt) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; f_thread_mutex_lock(&main->thread.lock.print.mutex); @@ -71,7 +71,7 @@ extern "C" { if (print->verbosity < f_console_verbosity_error_e) return F_output_not; if (status == F_interrupt) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; // fll_error_file_print() automatically locks, so manually handle only the mutex locking and flushing rather than calling controller_lock_print(). f_thread_mutex_lock(&main->thread.lock.print.mutex); diff --git a/sources/c/program/controller/main/print/error/entry.h b/sources/c/program/controller/main/print/error/entry.h index c5dcd34..fea0f22 100644 --- a/sources/c/program/controller/main/print/error/entry.h +++ b/sources/c/program/controller/main/print/error/entry.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -62,7 +62,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -95,7 +95,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/entry/action.c b/sources/c/program/controller/main/print/error/entry/action.c index d43c3c9..77d10ec 100644 --- a/sources/c/program/controller/main/print/error/entry/action.c +++ b/sources/c/program/controller/main/print/error/entry/action.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -32,7 +32,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -54,7 +54,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -85,7 +85,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -119,7 +119,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -143,7 +143,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -163,7 +163,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -187,7 +187,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -230,7 +230,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -252,7 +252,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/entry/action.h b/sources/c/program/controller/main/print/error/entry/action.h index 5d78080..393385f 100644 --- a/sources/c/program/controller/main/print/error/entry/action.h +++ b/sources/c/program/controller/main/print/error/entry/action.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -57,7 +57,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -94,7 +94,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -137,7 +137,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -182,7 +182,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -217,7 +217,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -252,7 +252,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -289,7 +289,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -330,7 +330,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -365,7 +365,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/entry/item.c b/sources/c/program/controller/main/print/error/entry/item.c index b74f50c..0c5f36c 100644 --- a/sources/c/program/controller/main/print/error/entry/item.c +++ b/sources/c/program/controller/main/print/error/entry/item.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -32,7 +32,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -54,7 +54,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/entry/item.h b/sources/c/program/controller/main/print/error/entry/item.h index 6fcc3b9..b19d3a9 100644 --- a/sources/c/program/controller/main/print/error/entry/item.h +++ b/sources/c/program/controller/main/print/error/entry/item.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -59,7 +59,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -94,7 +94,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/entry/setting.c b/sources/c/program/controller/main/print/error/entry/setting.c index ad05e5f..0d084e6 100644 --- a/sources/c/program/controller/main/print/error/entry/setting.c +++ b/sources/c/program/controller/main/print/error/entry/setting.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -32,7 +32,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -54,7 +54,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -80,7 +80,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -104,7 +104,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/entry/setting.h b/sources/c/program/controller/main/print/error/entry/setting.h index 963375e..b32d16f 100644 --- a/sources/c/program/controller/main/print/error/entry/setting.h +++ b/sources/c/program/controller/main/print/error/entry/setting.h @@ -25,7 +25,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -64,7 +64,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -97,7 +97,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -134,7 +134,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -171,7 +171,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/lock.c b/sources/c/program/controller/main/print/error/lock.c index d442344..ca0e71b 100644 --- a/sources/c/program/controller/main/print/error/lock.c +++ b/sources/c/program/controller/main/print/error/lock.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e || status == F_interrupt) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/lock.h b/sources/c/program/controller/main/print/error/lock.h index 0d26c3a..47ecbd2 100644 --- a/sources/c/program/controller/main/print/error/lock.h +++ b/sources/c/program/controller/main/print/error/lock.h @@ -24,7 +24,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/perform/pid.c b/sources/c/program/controller/main/print/error/perform/pid.c index 6ff74aa..7349c4c 100644 --- a/sources/c/program/controller/main/print/error/perform/pid.c +++ b/sources/c/program/controller/main/print/error/perform/pid.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/perform/pid.h b/sources/c/program/controller/main/print/error/perform/pid.h index 04b2247..3557bc5 100644 --- a/sources/c/program/controller/main/print/error/perform/pid.h +++ b/sources/c/program/controller/main/print/error/perform/pid.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/rule.c b/sources/c/program/controller/main/print/error/rule.c index 27fd3bb..eff93ca 100644 --- a/sources/c/program/controller/main/print/error/rule.c +++ b/sources/c/program/controller/main/print/error/rule.c @@ -11,7 +11,7 @@ extern "C" { if (print->verbosity < f_console_verbosity_error_e) return F_output_not; if (status == F_interrupt) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; f_thread_mutex_lock(&main->thread.lock.print.mutex); @@ -70,7 +70,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/rule.h b/sources/c/program/controller/main/print/error/rule.h index 3b6a6d5..588d306 100644 --- a/sources/c/program/controller/main/print/error/rule.h +++ b/sources/c/program/controller/main/print/error/rule.h @@ -24,7 +24,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -66,7 +66,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -106,7 +106,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/rule/action.c b/sources/c/program/controller/main/print/error/rule/action.c index 0701aa0..da7b398 100644 --- a/sources/c/program/controller/main/print/error/rule/action.c +++ b/sources/c/program/controller/main/print/error/rule/action.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -44,7 +44,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -66,7 +66,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -88,7 +88,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -129,7 +129,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -156,7 +156,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -178,7 +178,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -202,7 +202,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/rule/action.h b/sources/c/program/controller/main/print/error/rule/action.h index c741985..f1f6e7e 100644 --- a/sources/c/program/controller/main/print/error/rule/action.h +++ b/sources/c/program/controller/main/print/error/rule/action.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -60,7 +60,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -92,7 +92,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -124,7 +124,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -164,7 +164,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -198,7 +198,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -232,7 +232,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -268,7 +268,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/rule/instance.c b/sources/c/program/controller/main/print/error/rule/instance.c index 66e41bc..43ed53f 100644 --- a/sources/c/program/controller/main/print/error/rule/instance.c +++ b/sources/c/program/controller/main/print/error/rule/instance.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !instance) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/rule/instance.h b/sources/c/program/controller/main/print/error/rule/instance.h index 4544d74..d5189f7 100644 --- a/sources/c/program/controller/main/print/error/rule/instance.h +++ b/sources/c/program/controller/main/print/error/rule/instance.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/rule/item.c b/sources/c/program/controller/main/print/error/rule/item.c index 8d7831a..706ca95 100644 --- a/sources/c/program/controller/main/print/error/rule/item.c +++ b/sources/c/program/controller/main/print/error/rule/item.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e || status == F_interrupt) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -28,7 +28,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -282,7 +282,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -306,7 +306,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; @@ -324,7 +324,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/error/rule/item.h b/sources/c/program/controller/main/print/error/rule/item.h index 9db4b5f..4932ac2 100644 --- a/sources/c/program/controller/main/print/error/rule/item.h +++ b/sources/c/program/controller/main/print/error/rule/item.h @@ -24,7 +24,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -59,7 +59,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -96,7 +96,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -131,7 +131,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -164,7 +164,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/error/rule/setting.c b/sources/c/program/controller/main/print/error/rule/setting.c index 7db40c7..0a20b24 100644 --- a/sources/c/program/controller/main/print/error/rule/setting.c +++ b/sources/c/program/controller/main/print/error/rule/setting.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -30,7 +30,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -52,7 +52,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_rule_setting_line_action(main, action, buffer, start, line, state); @@ -75,7 +75,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; if (print->verbosity != f_console_verbosity_debug_e) { if (!(print->verbosity == f_console_verbosity_verbose_e && (main->setting.flag & controller_main_flag_simulate_d))) { @@ -101,7 +101,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -123,7 +123,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -147,7 +147,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -172,7 +172,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -196,7 +196,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -229,7 +229,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity == f_console_verbosity_quiet_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -252,7 +252,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; if (print->verbosity != f_console_verbosity_debug_e) { if (!(print->verbosity == f_console_verbosity_verbose_e && (main->setting.flag & controller_main_flag_simulate_d))) { @@ -285,7 +285,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; if (print->verbosity != f_console_verbosity_debug_e) { if (!(print->verbosity == f_console_verbosity_verbose_e && (main->setting.flag & controller_main_flag_simulate_d))) { diff --git a/sources/c/program/controller/main/print/error/rule/setting.h b/sources/c/program/controller/main/print/error/rule/setting.h index f2516ad..d66c619 100644 --- a/sources/c/program/controller/main/print/error/rule/setting.h +++ b/sources/c/program/controller/main/print/error/rule/setting.h @@ -25,7 +25,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -59,7 +59,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -96,7 +96,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/message.c b/sources/c/program/controller/main/print/message.c index d82b016..4ee474b 100644 --- a/sources/c/program/controller/main/print/message.c +++ b/sources/c/program/controller/main/print/message.c @@ -67,7 +67,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; fll_program_print_help_header(print, controller_program_name_long_s, controller_program_version_s); diff --git a/sources/c/program/controller/main/print/message.h b/sources/c/program/controller/main/print/message.h index 6b3c5ae..51d2af1 100644 --- a/sources/c/program/controller/main/print/message.h +++ b/sources/c/program/controller/main/print/message.h @@ -24,7 +24,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -46,7 +46,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -68,7 +68,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -90,7 +90,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -112,7 +112,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/message/entry.c b/sources/c/program/controller/main/print/message/entry.c index c92cbd9..817fe31 100644 --- a/sources/c/program/controller/main/print/message/entry.c +++ b/sources/c/program/controller/main/print/message/entry.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_normal_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/message/entry.h b/sources/c/program/controller/main/print/message/entry.h index 543b666..83ef010 100644 --- a/sources/c/program/controller/main/print/message/entry.h +++ b/sources/c/program/controller/main/print/message/entry.h @@ -24,7 +24,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/message/entry/action.c b/sources/c/program/controller/main/print/message/entry/action.c index 72aab61..67bf1a9 100644 --- a/sources/c/program/controller/main/print/message/entry/action.c +++ b/sources/c/program/controller/main/print/message/entry/action.c @@ -31,7 +31,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_normal_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -51,7 +51,7 @@ extern "C" { if (!print || !print->custom || !cache || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -96,7 +96,7 @@ extern "C" { if (!print || !print->custom || !cache || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -127,7 +127,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_normal_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/message/entry/action.h b/sources/c/program/controller/main/print/message/entry/action.h index 171ac75..fb30b28 100644 --- a/sources/c/program/controller/main/print/message/entry/action.h +++ b/sources/c/program/controller/main/print/message/entry/action.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -50,7 +50,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -77,7 +77,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -107,7 +107,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -142,7 +142,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/message/entry/item.c b/sources/c/program/controller/main/print/message/entry/item.c index 7f1509e..ae9a35b 100644 --- a/sources/c/program/controller/main/print/message/entry/item.c +++ b/sources/c/program/controller/main/print/message/entry/item.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -30,7 +30,7 @@ extern "C" { if (!print || !print->custom || !parameters) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_normal_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -59,7 +59,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_normal_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -83,7 +83,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -105,7 +105,7 @@ extern "C" { if (!print || !print->custom || !entry || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_normal_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/message/entry/item.h b/sources/c/program/controller/main/print/message/entry/item.h index f9b2ffb..7352935 100644 --- a/sources/c/program/controller/main/print/message/entry/item.h +++ b/sources/c/program/controller/main/print/message/entry/item.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @param is_entry @@ -50,7 +50,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -79,7 +79,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @param is_entry @@ -109,7 +109,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @param is_entry @@ -136,7 +136,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/output/entry/setting.c b/sources/c/program/controller/main/print/output/entry/setting.c index a9f2745..f2122bd 100644 --- a/sources/c/program/controller/main/print/output/entry/setting.c +++ b/sources/c/program/controller/main/print/output/entry/setting.c @@ -9,7 +9,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; if (print->verbosity < f_console_verbosity_debug_e && !((main->setting.flag & controller_main_flag_simulate_d) && print->verbosity > f_console_verbosity_normal_e)) { return F_output_not; @@ -44,7 +44,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_error_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_entry_t * const entry = is_entry ? &main->process.entry : &main->process.exit; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/output/entry/setting.h b/sources/c/program/controller/main/print/output/entry/setting.h index 75e064d..a5625a9 100644 --- a/sources/c/program/controller/main/print/output/entry/setting.h +++ b/sources/c/program/controller/main/print/output/entry/setting.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -56,7 +56,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/output/rule/execute.c b/sources/c/program/controller/main/print/output/rule/execute.c index 6e293dd..f120e2e 100644 --- a/sources/c/program/controller/main/print/output/rule/execute.c +++ b/sources/c/program/controller/main/print/output/rule/execute.c @@ -9,7 +9,7 @@ extern "C" { if (!print || !print->custom || !instance) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/output/rule/execute.h b/sources/c/program/controller/main/print/output/rule/execute.h index 63f8861..90ba0bd 100644 --- a/sources/c/program/controller/main/print/output/rule/execute.h +++ b/sources/c/program/controller/main/print/output/rule/execute.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/output/rule/setting.c b/sources/c/program/controller/main/print/output/rule/setting.c index a0c4c12..ef8fc1f 100644 --- a/sources/c/program/controller/main/print/output/rule/setting.c +++ b/sources/c/program/controller/main/print/output/rule/setting.c @@ -9,7 +9,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; if (print->verbosity < f_console_verbosity_debug_e && !((main->setting.flag & controller_main_flag_simulate_d) && print->verbosity > f_console_verbosity_normal_e)) { return F_output_not; @@ -33,7 +33,7 @@ extern "C" { if (!print || !print->custom) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; if (print->verbosity < f_console_verbosity_debug_e && !((main->setting.flag & controller_main_flag_simulate_d) && print->verbosity > f_console_verbosity_normal_e)) { return F_output_not; diff --git a/sources/c/program/controller/main/print/output/rule/setting.h b/sources/c/program/controller/main/print/output/rule/setting.h index 96ec760..661e516 100644 --- a/sources/c/program/controller/main/print/output/rule/setting.h +++ b/sources/c/program/controller/main/print/output/rule/setting.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -54,7 +54,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/output/rule/validate.c b/sources/c/program/controller/main/print/output/rule/validate.c index ab0e2ca..3f23c27 100644 --- a/sources/c/program/controller/main/print/output/rule/validate.c +++ b/sources/c/program/controller/main/print/output/rule/validate.c @@ -9,7 +9,7 @@ extern "C" { if (!print || !print->custom || !cache || !rule) return F_status_set_error(F_output_not); - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; f_number_unsigned_t i = 0; f_number_unsigned_t j = 0; diff --git a/sources/c/program/controller/main/print/output/rule/validate.h b/sources/c/program/controller/main/print/output/rule/validate.h index b715122..cfa6489 100644 --- a/sources/c/program/controller/main/print/output/rule/validate.h +++ b/sources/c/program/controller/main/print/output/rule/validate.h @@ -26,7 +26,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/warning/entry/action.c b/sources/c/program/controller/main/print/warning/entry/action.c index 4a36cbd..6c75708 100644 --- a/sources/c/program/controller/main/print/warning/entry/action.c +++ b/sources/c/program/controller/main/print/warning/entry/action.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -30,7 +30,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -52,7 +52,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/warning/entry/action.h b/sources/c/program/controller/main/print/warning/entry/action.h index 66433e5..c2d8ddd 100644 --- a/sources/c/program/controller/main/print/warning/entry/action.h +++ b/sources/c/program/controller/main/print/warning/entry/action.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -55,7 +55,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -90,7 +90,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/warning/entry/item.c b/sources/c/program/controller/main/print/warning/entry/item.c index 6d012ad..be8cb0a 100644 --- a/sources/c/program/controller/main/print/warning/entry/item.c +++ b/sources/c/program/controller/main/print/warning/entry/item.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/warning/entry/item.h b/sources/c/program/controller/main/print/warning/entry/item.h index 23442c1..108a19b 100644 --- a/sources/c/program/controller/main/print/warning/entry/item.h +++ b/sources/c/program/controller/main/print/warning/entry/item.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/warning/entry/setting.c b/sources/c/program/controller/main/print/warning/entry/setting.c index fb7cc10..34aa3ea 100644 --- a/sources/c/program/controller/main/print/warning/entry/setting.c +++ b/sources/c/program/controller/main/print/warning/entry/setting.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); @@ -32,7 +32,7 @@ extern "C" { if (!print || !print->custom || !cache) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/warning/entry/setting.h b/sources/c/program/controller/main/print/warning/entry/setting.h index 2f2baf3..7e043fe 100644 --- a/sources/c/program/controller/main/print/warning/entry/setting.h +++ b/sources/c/program/controller/main/print/warning/entry/setting.h @@ -24,7 +24,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * @@ -59,7 +59,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/warning/rule/action.c b/sources/c/program/controller/main/print/warning/rule/action.c index 0dda5f3..4fc3b7e 100644 --- a/sources/c/program/controller/main/print/warning/rule/action.c +++ b/sources/c/program/controller/main/print/warning/rule/action.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/warning/rule/action.h b/sources/c/program/controller/main/print/warning/rule/action.h index 9677970..853c8a3 100644 --- a/sources/c/program/controller/main/print/warning/rule/action.h +++ b/sources/c/program/controller/main/print/warning/rule/action.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/warning/rule/item.c b/sources/c/program/controller/main/print/warning/rule/item.c index 16f7e45..5ae2061 100644 --- a/sources/c/program/controller/main/print/warning/rule/item.c +++ b/sources/c/program/controller/main/print/warning/rule/item.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/warning/rule/item.h b/sources/c/program/controller/main/print/warning/rule/item.h index f735610..6285c59 100644 --- a/sources/c/program/controller/main/print/warning/rule/item.h +++ b/sources/c/program/controller/main/print/warning/rule/item.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/print/warning/rule/setting.c b/sources/c/program/controller/main/print/warning/rule/setting.c index 4fb4a34..eb2b67f 100644 --- a/sources/c/program/controller/main/print/warning/rule/setting.c +++ b/sources/c/program/controller/main/print/warning/rule/setting.c @@ -10,7 +10,7 @@ extern "C" { if (!print || !print->custom || !action) return F_status_set_error(F_output_not); if (print->verbosity < f_console_verbosity_debug_e) return F_output_not; - controller_t * const main = (controller_t *) print->custom; + controller_main_t * const main = (controller_main_t *) print->custom; controller_lock_print(print->to, &main->thread); diff --git a/sources/c/program/controller/main/print/warning/rule/setting.h b/sources/c/program/controller/main/print/warning/rule/setting.h index 81ca71e..a7ff28a 100644 --- a/sources/c/program/controller/main/print/warning/rule/setting.h +++ b/sources/c/program/controller/main/print/warning/rule/setting.h @@ -22,7 +22,7 @@ extern "C" { * @param print * The output structure to print to. * - * This requires print.custom to be controller_t. + * This requires print.custom to be controller_main_t. * * This does not alter print.custom.setting.state.status. * diff --git a/sources/c/program/controller/main/process.c b/sources/c/program/controller/main/process.c index 0fdaf49..e67db44 100644 --- a/sources/c/program/controller/main/process.c +++ b/sources/c/program/controller/main/process.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_process_ - f_status_t controller_process(controller_t * const main) { + f_status_t controller_process(controller_main_t * const main) { if (!main || F_status_is_error(main->setting.state.status)) return F_status_set_error(F_parameter); @@ -134,7 +134,7 @@ extern "C" { #endif // _di_controller_process_ #ifndef _di_controller_process_prepare_ - f_status_t controller_process_prepare(controller_t * const main) { + f_status_t controller_process_prepare(controller_main_t * const main) { if (!main) return F_status_set_error(F_parameter); @@ -186,7 +186,7 @@ extern "C" { #endif // _di_controller_process_prepare_ #ifndef _di_controller_process_run_ - f_status_t controller_process_run(controller_t * const main) { + f_status_t controller_process_run(controller_main_t * const main) { if (!main) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/process.h b/sources/c/program/controller/main/process.h index 2f31053..ee907dc 100644 --- a/sources/c/program/controller/main/process.h +++ b/sources/c/program/controller/main/process.h @@ -49,7 +49,7 @@ extern "C" { * @see controller_process_prepare() */ #ifndef controller_process - extern f_status_t controller_process(controller_t * const main); + extern f_status_t controller_process(controller_main_t * const main); #endif // controller_process /** @@ -77,7 +77,7 @@ extern "C" { * @see f_thread_create() */ #ifndef _di_controller_process_prepare_ - extern f_status_t controller_process_prepare(controller_t * const main); + extern f_status_t controller_process_prepare(controller_main_t * const main); #endif // _di_controller_process_prepare_ /** @@ -105,7 +105,7 @@ extern "C" { * @see f_thread_create() */ #ifndef _di_controller_process_run_ - extern f_status_t controller_process_run(controller_t * const main); + extern f_status_t controller_process_run(controller_main_t * const main); #endif // _di_controller_process_run_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/rule.c b/sources/c/program/controller/main/rule.c index e4ebdd0..f3dfb11 100644 --- a/sources/c/program/controller/main/rule.c +++ b/sources/c/program/controller/main/rule.c @@ -227,7 +227,7 @@ extern "C" { #endif // _di_controller_rule_copy_ #ifndef _di_controller_rule_find_ - f_status_t controller_rule_find(controller_t * const main, const uint8_t is_entry, const f_string_static_t alias, const controller_rules_t rules, controller_rule_t ** const rule) { + f_status_t controller_rule_find(controller_main_t * const main, const uint8_t is_entry, const f_string_static_t alias, const controller_rules_t rules, controller_rule_t ** const rule) { if (!main) return F_status_set_error(F_parameter); if (!alias.used) return F_okay; @@ -261,7 +261,7 @@ extern "C" { #endif // _di_controller_rule_find_ #ifndef _di_controller_rule_id_construct_ - f_status_t controller_rule_id_construct(controller_t * const main, const f_string_static_t source, const f_range_t directory, const f_range_t basename, f_string_dynamic_t * const alias) { + f_status_t controller_rule_id_construct(controller_main_t * const main, const f_string_static_t source, const f_range_t directory, const f_range_t basename, f_string_dynamic_t * const alias) { if (!main || !alias) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/rule.h b/sources/c/program/controller/main/rule.h index 531cfa0..f2a3383 100644 --- a/sources/c/program/controller/main/rule.h +++ b/sources/c/program/controller/main/rule.h @@ -85,7 +85,7 @@ extern "C" { * @see controller_lock_read_standard() */ #ifndef _di_controller_rule_find_ - extern f_status_t controller_rule_find(controller_t * const main, const uint8_t is_entry, const f_string_static_t alias, const controller_rules_t rules, controller_rule_t ** const rule); + extern f_status_t controller_rule_find(controller_main_t * const main, const uint8_t is_entry, const f_string_static_t alias, const controller_rules_t rules, controller_rule_t ** const rule); #endif // _di_controller_rule_find_ /** @@ -115,7 +115,7 @@ extern "C" { * @see f_string_dynamic_partial_append_nulless() */ #ifndef _di_controller_rule_id_construct_ - extern f_status_t controller_rule_id_construct(controller_t * const main, const f_string_static_t source, const f_range_t directory, const f_range_t basename, f_string_dynamic_t * const alias); + extern f_status_t controller_rule_id_construct(controller_main_t * const main, const f_string_static_t source, const f_range_t directory, const f_range_t basename, f_string_dynamic_t * const alias); #endif // _di_controller_rule_id_construct_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/rule/action.c b/sources/c/program/controller/main/rule/action.c index f4a6b56..0975d8f 100644 --- a/sources/c/program/controller/main/rule/action.c +++ b/sources/c/program/controller/main/rule/action.c @@ -56,7 +56,7 @@ extern "C" { #endif // _di_controller_rule_action_type_to_action_execute_type_ #ifndef _di_controller_rule_action_read_ - void controller_rule_action_read(controller_t * const main, controller_cache_t * const cache, const uint8_t is_normal, const uint8_t type, const uint8_t method, controller_rule_item_t * const item, controller_rule_actions_t * const actions, f_range_t * const range, f_state_t * const state) { + void controller_rule_action_read(controller_main_t * const main, controller_cache_t * const cache, const uint8_t is_normal, const uint8_t type, const uint8_t method, controller_rule_item_t * const item, controller_rule_actions_t * const actions, f_range_t * const range, f_state_t * const state) { if (!state) return; @@ -463,7 +463,7 @@ extern "C" { #endif // _di_controller_rule_action_read_ #ifndef _di_controller_rule_action_read_rerun_number_ - f_status_t controller_rule_action_read_rerun_number(controller_t * const main, controller_cache_t * const cache, const f_string_static_t name, f_number_unsigned_t * const index, f_number_unsigned_t * const number) { + f_status_t controller_rule_action_read_rerun_number(controller_main_t * const main, controller_cache_t * const cache, const f_string_static_t name, f_number_unsigned_t * const index, f_number_unsigned_t * const number) { f_status_t status = F_okay; f_number_signed_t parsed = 0; diff --git a/sources/c/program/controller/main/rule/action.h b/sources/c/program/controller/main/rule/action.h index 9daeedb..c2f238b 100644 --- a/sources/c/program/controller/main/rule/action.h +++ b/sources/c/program/controller/main/rule/action.h @@ -97,7 +97,7 @@ extern "C" { * @see f_memory_array_increase_by() */ #ifndef _di_controller_rule_action_read_ - extern void controller_rule_action_read(controller_t * const main, controller_cache_t * const cache, const uint8_t is_normal, const uint8_t type, const uint8_t method, controller_rule_item_t * const item, controller_rule_actions_t * const actions, f_range_t * const range, f_state_t * const state); + extern void controller_rule_action_read(controller_main_t * const main, controller_cache_t * const cache, const uint8_t is_normal, const uint8_t type, const uint8_t method, controller_rule_item_t * const item, controller_rule_actions_t * const actions, f_range_t * const range, f_state_t * const state); #endif // _di_controller_rule_action_read_ /** @@ -135,7 +135,7 @@ extern "C" { * @see fl_conversion_dynamic_partial_to_signed_detect() */ #ifndef _di_controller_rule_action_read_rerun_number_ - extern f_status_t controller_rule_action_read_rerun_number(controller_t * const main, controller_cache_t * const cache, const f_string_static_t name, f_number_unsigned_t * const index, f_number_unsigned_t * const number); + extern f_status_t controller_rule_action_read_rerun_number(controller_main_t * const main, controller_cache_t * const cache, const f_string_static_t name, f_number_unsigned_t * const index, f_number_unsigned_t * const number); #endif // _di_controller_rule_action_read_rerun_number_ diff --git a/sources/c/program/controller/main/rule/execute.c b/sources/c/program/controller/main/rule/execute.c index 81b3fdd..2bdbbf8 100644 --- a/sources/c/program/controller/main/rule/execute.c +++ b/sources/c/program/controller/main/rule/execute.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_rule_execute_ - f_status_t controller_rule_execute(controller_t * const main, controller_instance_t * const instance, const uint8_t action, const uint8_t options) { + f_status_t controller_rule_execute(controller_main_t * const main, controller_instance_t * const instance, const uint8_t action, const uint8_t options) { if (!main || !instance) return F_status_set_error(F_parameter); @@ -427,7 +427,7 @@ extern "C" { if (!instance || !instance->main) return F_status_set_error(F_parameter); - controller_t * const main = instance->main; + controller_main_t * const main = instance->main; f_status_t status = F_okay; f_execute_result_t result = f_execute_result_t_initialize; @@ -597,7 +597,7 @@ extern "C" { if (!execute_set || !instance || !instance->main) return F_status_set_error(F_parameter); - controller_t * const main = instance->main; + controller_main_t * const main = instance->main; f_status_t status = F_okay; f_execute_result_t result = f_execute_result_t_initialize; @@ -760,7 +760,7 @@ extern "C" { const int result = WIFEXITED(instance->result) && WEXITSTATUS(instance->result); if (item->reruns[action].is & (result ? controller_rule_rerun_is_failure_d : controller_rule_rerun_is_success_d)) { - controller_t * const main = instance->main; + controller_main_t * const main = instance->main; controller_rule_rerun_item_t * const rerun_item = result ? &item->reruns[action].failure : &item->reruns[action].success; if (!rerun_item->max || rerun_item->count < rerun_item->max) { diff --git a/sources/c/program/controller/main/rule/execute.h b/sources/c/program/controller/main/rule/execute.h index 2802d8e..be3296e 100644 --- a/sources/c/program/controller/main/rule/execute.h +++ b/sources/c/program/controller/main/rule/execute.h @@ -61,7 +61,7 @@ extern "C" { * On failure, the individual status for the Rule is set to an appropriate error status. */ #ifndef _di_controller_rule_execute_ - extern f_status_t controller_rule_execute(controller_t * const main, controller_instance_t * const instance, const uint8_t action, const uint8_t options); + extern f_status_t controller_rule_execute(controller_main_t * const main, controller_instance_t * const instance, const uint8_t action, const uint8_t options); #endif // _di_controller_rule_execute_ /** diff --git a/sources/c/program/controller/main/rule/expand.c b/sources/c/program/controller/main/rule/expand.c index 166e130..be9068a 100644 --- a/sources/c/program/controller/main/rule/expand.c +++ b/sources/c/program/controller/main/rule/expand.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_rule_expand_ - f_status_t controller_rule_expand(controller_t * const main, const controller_rule_action_t action, controller_instance_t * const instance) { + f_status_t controller_rule_expand(controller_main_t * const main, const controller_rule_action_t action, controller_instance_t * const instance) { if (!main || !instance) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/rule/expand.h b/sources/c/program/controller/main/rule/expand.h index 616b1e1..9cf409d 100644 --- a/sources/c/program/controller/main/rule/expand.h +++ b/sources/c/program/controller/main/rule/expand.h @@ -38,7 +38,7 @@ extern "C" { * @see controller_rule_expand_iki() */ #ifndef _di_controller_rule_expand_ - extern f_status_t controller_rule_expand(controller_t * const main, const controller_rule_action_t action, controller_instance_t * const instance); + extern f_status_t controller_rule_expand(controller_main_t * const main, const controller_rule_action_t action, controller_instance_t * const instance); #endif // _di_controller_rule_expand_ /** diff --git a/sources/c/program/controller/main/rule/instance.c b/sources/c/program/controller/main/rule/instance.c index fab05a9..4e9aa63 100644 --- a/sources/c/program/controller/main/rule/instance.c +++ b/sources/c/program/controller/main/rule/instance.c @@ -9,7 +9,7 @@ extern "C" { if (!instance || !instance->main) return F_status_set_error(F_parameter); - controller_t * const main = instance->main; + controller_main_t * const main = instance->main; switch (instance->action) { case controller_rule_action_type_freeze_e: @@ -420,7 +420,7 @@ extern "C" { #endif // _di_controller_rule_instance_ #ifndef _di_controller_rule_instance_begin_ - f_status_t controller_rule_instance_begin(controller_t * const main, controller_cache_t * const cache, const uint8_t options_force, const f_string_static_t alias_rule, const uint8_t action, const uint8_t options, const uint8_t type, const controller_rules_t stack) { + f_status_t controller_rule_instance_begin(controller_main_t * const main, controller_cache_t * const cache, const uint8_t options_force, const f_string_static_t alias_rule, const uint8_t action, const uint8_t options, const uint8_t type, const controller_rules_t stack) { if (!main || !cache) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/rule/instance.h b/sources/c/program/controller/main/rule/instance.h index 829f4ce..2ccf48e 100644 --- a/sources/c/program/controller/main/rule/instance.h +++ b/sources/c/program/controller/main/rule/instance.h @@ -103,7 +103,7 @@ extern "C" { * @see f_thread_create() */ #ifndef _di_controller_rule_instance_begin_ - extern f_status_t controller_rule_instance_begin(controller_t * const main, controller_cache_t * const cache, const uint8_t options_force, const f_string_static_t alias_rule, const uint8_t action, const uint8_t options, const uint8_t type, const controller_rules_t stack); + extern f_status_t controller_rule_instance_begin(controller_main_t * const main, controller_cache_t * const cache, const uint8_t options_force, const f_string_static_t alias_rule, const uint8_t action, const uint8_t options, const uint8_t type, const controller_rules_t stack); #endif // _di_controller_rule_instance_begin_ /** diff --git a/sources/c/program/controller/main/rule/item.c b/sources/c/program/controller/main/rule/item.c index 2c843a2..24563a6 100644 --- a/sources/c/program/controller/main/rule/item.c +++ b/sources/c/program/controller/main/rule/item.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_rule_item_read_ - void controller_rule_item_read(controller_t * const main, controller_cache_t * const cache, const uint8_t is_normal, controller_rule_item_t * const item, f_state_t * const state) { + void controller_rule_item_read(controller_main_t * const main, controller_cache_t * const cache, const uint8_t is_normal, controller_rule_item_t * const item, f_state_t * const state) { if (!state) return; diff --git a/sources/c/program/controller/main/rule/item.h b/sources/c/program/controller/main/rule/item.h index b0317ca..f96a493 100644 --- a/sources/c/program/controller/main/rule/item.h +++ b/sources/c/program/controller/main/rule/item.h @@ -51,7 +51,7 @@ extern "C" { * @see f_string_dynamic_partial_append_nulless() */ #ifndef _di_controller_rule_item_read_ - extern void controller_rule_item_read(controller_t * const main, controller_cache_t * const cache, const uint8_t is_normal, controller_rule_item_t * const item, f_state_t * const state); + extern void controller_rule_item_read(controller_main_t * const main, controller_cache_t * const cache, const uint8_t is_normal, controller_rule_item_t * const item, f_state_t * const state); #endif // _di_controller_rule_item_read_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/rule/parameter.c b/sources/c/program/controller/main/rule/parameter.c index cf4c00f..8347437 100644 --- a/sources/c/program/controller/main/rule/parameter.c +++ b/sources/c/program/controller/main/rule/parameter.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_rule_parameters_read_ - void controller_rule_parameters_read(controller_t * const main, const f_string_static_t buffer, f_range_t * const object, f_ranges_t * const content, controller_rule_action_t * const action, f_state_t * const state) { + void controller_rule_parameters_read(controller_main_t * const main, const f_string_static_t buffer, f_range_t * const object, f_ranges_t * const content, controller_rule_action_t * const action, f_state_t * const state) { if (!state) return; diff --git a/sources/c/program/controller/main/rule/parameter.h b/sources/c/program/controller/main/rule/parameter.h index 87ac350..13fd639 100644 --- a/sources/c/program/controller/main/rule/parameter.h +++ b/sources/c/program/controller/main/rule/parameter.h @@ -61,7 +61,7 @@ extern "C" { * @see fl_iki_read() */ #ifndef _di_controller_rule_parameters_read_ - extern void controller_rule_parameters_read(controller_t * const main, const f_string_static_t buffer, f_range_t * const object, f_ranges_t * const content, controller_rule_action_t * const action, f_state_t * const state); + extern void controller_rule_parameters_read(controller_main_t * const main, const f_string_static_t buffer, f_range_t * const object, f_ranges_t * const content, controller_rule_action_t * const action, f_state_t * const state); #endif // _di_controller_rule_parameters_read_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/rule/read.c b/sources/c/program/controller/main/rule/read.c index d078321..14cf019 100644 --- a/sources/c/program/controller/main/rule/read.c +++ b/sources/c/program/controller/main/rule/read.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_rule_read_ - f_status_t controller_rule_read(controller_t * const main, controller_cache_t * const cache, const uint8_t is_normal, const f_string_static_t alias, controller_entry_t * const entry, controller_rule_t * const rule) { + f_status_t controller_rule_read(controller_main_t * const main, controller_cache_t * const cache, const uint8_t is_normal, const f_string_static_t alias, controller_entry_t * const entry, controller_rule_t * const rule) { if (!main || !cache || !entry || !rule) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/rule/read.h b/sources/c/program/controller/main/rule/read.h index 3133c1b..efea7f8 100644 --- a/sources/c/program/controller/main/rule/read.h +++ b/sources/c/program/controller/main/rule/read.h @@ -55,7 +55,7 @@ extern "C" { * @see fll_fss_basic_list_read(). */ #ifndef _di_controller_rule_read_ - extern f_status_t controller_rule_read(controller_t * const main, controller_cache_t * const cache, const uint8_t is_normal, const f_string_static_t alias, controller_entry_t * const entry, controller_rule_t * const rule); + extern f_status_t controller_rule_read(controller_main_t * const main, controller_cache_t * const cache, const uint8_t is_normal, const f_string_static_t alias, controller_entry_t * const entry, controller_rule_t * const rule); #endif // _di_controller_rule_read_ diff --git a/sources/c/program/controller/main/rule/setting.c b/sources/c/program/controller/main/rule/setting.c index de6e685..577a44c 100644 --- a/sources/c/program/controller/main/rule/setting.c +++ b/sources/c/program/controller/main/rule/setting.c @@ -86,7 +86,7 @@ extern "C" { #endif // _di_controller_rule_setting_limit_type_name_ #ifndef _di_controller_rule_setting_line_action_ - f_status_t controller_rule_setting_line_action(controller_t * const main, controller_cache_action_t * const action, const f_string_static_t buffer, const f_number_unsigned_t start, const f_number_unsigned_t line, f_state_t * const state) { + f_status_t controller_rule_setting_line_action(controller_main_t * const main, controller_cache_action_t * const action, const f_string_static_t buffer, const f_number_unsigned_t start, const f_number_unsigned_t line, f_state_t * const state) { if (!main || !action || !state) return F_status_set_error(F_parameter); @@ -114,7 +114,7 @@ extern "C" { #endif // _di_controller_rule_setting_line_action_ #ifndef _di_controller_rule_setting_read_ - f_status_t controller_rule_setting_read(controller_t * const main, controller_cache_t * const cache, const uint8_t is_normal, controller_rule_t * const rule) { + f_status_t controller_rule_setting_read(controller_main_t * const main, controller_cache_t * const cache, const uint8_t is_normal, controller_rule_t * const rule) { if (!main || !cache || !rule) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/rule/setting.h b/sources/c/program/controller/main/rule/setting.h index c0d3b7d..d603d08 100644 --- a/sources/c/program/controller/main/rule/setting.h +++ b/sources/c/program/controller/main/rule/setting.h @@ -75,7 +75,7 @@ extern "C" { * @see f_fss_count_lines() */ #ifndef _di_controller_rule_setting_line_action_ - extern f_status_t controller_rule_setting_line_action(controller_t * const main, controller_cache_action_t * const action, const f_string_static_t buffer, const f_number_unsigned_t start, const f_number_unsigned_t line, f_state_t * const state); + extern f_status_t controller_rule_setting_line_action(controller_main_t * const main, controller_cache_action_t * const action, const f_string_static_t buffer, const f_number_unsigned_t start, const f_number_unsigned_t line, f_state_t * const state); #endif // _di_controller_rule_setting_line_action_ /** @@ -120,7 +120,7 @@ extern "C" { * @see controller_path_canonical_relative() */ #ifndef _di_controller_rule_setting_read_ - extern f_status_t controller_rule_setting_read(controller_t * const main, controller_cache_t * const cache, const uint8_t is_normal, controller_rule_t * const rule); + extern f_status_t controller_rule_setting_read(controller_main_t * const main, controller_cache_t * const cache, const uint8_t is_normal, controller_rule_t * const rule); #endif // _di_controller_rule_setting_read_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/rule/wait.c b/sources/c/program/controller/main/rule/wait.c index 797d581..e8d91da 100644 --- a/sources/c/program/controller/main/rule/wait.c +++ b/sources/c/program/controller/main/rule/wait.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_rule_wait_all_ - f_status_t controller_rule_wait_all(controller_t * const main, const uint8_t is_normal, const uint8_t required) { + f_status_t controller_rule_wait_all(controller_main_t * const main, const uint8_t is_normal, const uint8_t required) { if (!main) return F_status_set_error(F_parameter); @@ -165,7 +165,7 @@ extern "C" { #endif // _di_controller_rule_wait_all_ #ifndef _di_controller_rule_wait_all_instance_type_ - f_status_t controller_rule_wait_all_instance_type(controller_t * const main, const uint8_t type, const uint8_t required) { + f_status_t controller_rule_wait_all_instance_type(controller_main_t * const main, const uint8_t type, const uint8_t required) { if (!main) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/rule/wait.h b/sources/c/program/controller/main/rule/wait.h index 72d555a..757c7e5 100644 --- a/sources/c/program/controller/main/rule/wait.h +++ b/sources/c/program/controller/main/rule/wait.h @@ -42,7 +42,7 @@ extern "C" { * F_require (with error bit set) if a required process is in failed status when required is TRUE. */ #ifndef _di_controller_rule_wait_all_ - extern f_status_t controller_rule_wait_all(controller_t * const main, const uint8_t is_normal, const uint8_t required); + extern f_status_t controller_rule_wait_all(controller_main_t * const main, const uint8_t is_normal, const uint8_t required); #endif // _di_controller_rule_wait_all_ /** @@ -68,7 +68,7 @@ extern "C" { * @see controller_rule_wait_all() */ #ifndef _di_controller_rule_wait_all_instance_type_ - extern f_status_t controller_rule_wait_all_instance_type(controller_t * const main, const uint8_t type, const uint8_t required); + extern f_status_t controller_rule_wait_all_instance_type(controller_main_t * const main, const uint8_t type, const uint8_t required); #endif // _di_controller_rule_wait_all_instance_type_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/signal.c b/sources/c/program/controller/main/signal.c index 50ef3f2..b3d333a 100644 --- a/sources/c/program/controller/main/signal.c +++ b/sources/c/program/controller/main/signal.c @@ -5,7 +5,7 @@ extern "C" { #endif #if !defined(_di_controller_signal_handler_) && !defined(_di_thread_support_) - void controller_signal_handler(controller_t * const main) { + void controller_signal_handler(controller_main_t * const main) { if (!main) return; @@ -65,7 +65,7 @@ extern "C" { #endif // !defined(_di_controller_signal_handler_) && !defined(_di_thread_support_) #ifndef _di_controller_signal_set_up_ - f_status_t controller_signal_set_up(controller_t * const main) { + f_status_t controller_signal_set_up(controller_main_t * const main) { if (!main) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/signal.h b/sources/c/program/controller/main/signal.h index 6e159bf..8b4b1f6 100644 --- a/sources/c/program/controller/main/signal.h +++ b/sources/c/program/controller/main/signal.h @@ -47,7 +47,7 @@ extern "C" { * @see fll_program_standard_signal_received_wait() */ #if !defined(_di_controller_signal_handler_) && !defined(_di_thread_support_) - extern void controller_signal_handler(controller_t * const main); + extern void controller_signal_handler(controller_main_t * const main); #endif // !defined(_di_controller_signal_handler_) && !defined(_di_thread_support_) /** @@ -76,7 +76,7 @@ extern "C" { * @see f_signal_set_fill() */ #ifndef _di_controller_signal_set_up_ - extern f_status_t controller_signal_set_up(controller_t * const main); + extern f_status_t controller_signal_set_up(controller_main_t * const main); #endif // _di_controller_signal_set_up_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/thread/cleanup.c b/sources/c/program/controller/main/thread/cleanup.c index 0d8df19..b076590 100644 --- a/sources/c/program/controller/main/thread/cleanup.c +++ b/sources/c/program/controller/main/thread/cleanup.c @@ -12,7 +12,7 @@ extern "C" { f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); f_thread_name_set(f_thread_caller(), controller_thread_cleanup_s); - controller_t * const main = (controller_t *) argument; + controller_main_t * const main = (controller_main_t *) argument; f_time_spec_t delay = f_time_spec_t_initialize; f_time_spec_t now = f_time_spec_t_initialize; @@ -79,7 +79,7 @@ extern "C" { #endif // _di_controller_thread_cleanup_ #ifndef _di_controller_thread_cleanup_perform_ - f_status_t controller_thread_cleanup_perform(controller_t * const main) { + f_status_t controller_thread_cleanup_perform(controller_main_t * const main) { if (!main) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/thread/cleanup.h b/sources/c/program/controller/main/thread/cleanup.h index be5b4aa..c3ada2c 100644 --- a/sources/c/program/controller/main/thread/cleanup.h +++ b/sources/c/program/controller/main/thread/cleanup.h @@ -22,7 +22,7 @@ extern "C" { * @param argument * The main program data. * - * Must be of type controller_t. + * Must be of type controller_main_t. * Must not be NULL. * * @return @@ -53,7 +53,7 @@ extern "C" { * @see f_thread_lock_read_try() */ #ifndef _di_controller_thread_cleanup_perform_ - extern f_status_t controller_thread_cleanup_perform(controller_t * const main); + extern f_status_t controller_thread_cleanup_perform(controller_main_t * const main); #endif // _di_controller_thread_cleanup_perform_ #ifdef __cplusplus diff --git a/sources/c/program/controller/main/thread/control.c b/sources/c/program/controller/main/thread/control.c index 1241d06..e8f39ee 100644 --- a/sources/c/program/controller/main/thread/control.c +++ b/sources/c/program/controller/main/thread/control.c @@ -12,7 +12,7 @@ extern "C" { f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); f_thread_name_set(f_thread_caller(), controller_thread_control_s); - controller_t * const main = (controller_t *) argument; + controller_main_t * const main = (controller_main_t *) argument; if (controller_thread_enable_get(&main->thread) != controller_thread_enable_e) return 0; diff --git a/sources/c/program/controller/main/thread/control.h b/sources/c/program/controller/main/thread/control.h index adb8afb..d39047a 100644 --- a/sources/c/program/controller/main/thread/control.h +++ b/sources/c/program/controller/main/thread/control.h @@ -22,7 +22,7 @@ extern "C" { * @param argument * The main program data. * - * Must be of type controller_t. + * Must be of type controller_main_t. * Must not be NULL. * * @return diff --git a/sources/c/program/controller/main/thread/entry.c b/sources/c/program/controller/main/thread/entry.c index 5da22a9..1525271 100644 --- a/sources/c/program/controller/main/thread/entry.c +++ b/sources/c/program/controller/main/thread/entry.c @@ -12,7 +12,7 @@ extern "C" { f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); f_thread_name_set(f_thread_caller(), controller_thread_entry_s); - controller_t * const main = (controller_t *) argument; + controller_main_t * const main = (controller_main_t *) argument; if (!controller_thread_enable_is_normal(&main->thread, F_true)) return 0; @@ -119,7 +119,7 @@ extern "C" { f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); - controller_t * const main = (controller_t *) argument; + controller_main_t * const main = (controller_main_t *) argument; f_status_t * const status = &main->thread.status; // The exit file is loaded on start, so go straight into the pre-process. diff --git a/sources/c/program/controller/main/thread/entry.h b/sources/c/program/controller/main/thread/entry.h index 5879e69..2e1d833 100644 --- a/sources/c/program/controller/main/thread/entry.h +++ b/sources/c/program/controller/main/thread/entry.h @@ -25,7 +25,7 @@ extern "C" { * @param arguments * The main program data. * - * Must be of type controller_t. + * Must be of type controller_main_t. * Must not be NULL. * * @return @@ -47,7 +47,7 @@ extern "C" { * @param argument * The main program data. * - * Must be of type controller_t. + * Must be of type controller_main_t. * Must not be NULL. * * @return diff --git a/sources/c/program/controller/main/thread/instance.c b/sources/c/program/controller/main/thread/instance.c index 24f0dff..fe6ba7b 100644 --- a/sources/c/program/controller/main/thread/instance.c +++ b/sources/c/program/controller/main/thread/instance.c @@ -37,7 +37,7 @@ extern "C" { #endif // _di_controller_thread_instance_ #ifndef _di_controller_thread_instance_cancel_ - void controller_thread_instance_cancel(controller_t * const main, const uint8_t is_normal, const uint8_t by) { + void controller_thread_instance_cancel(controller_main_t * const main, const uint8_t is_normal, const uint8_t by) { if (!main) return; @@ -420,7 +420,7 @@ extern "C" { #endif // _di_controller_thread_instance_cancel_ #ifndef _di_controller_thread_instance_exit_ - void controller_thread_instance_exit(controller_t * const main) { + void controller_thread_instance_exit(controller_main_t * const main) { if (!main || controller_thread_enable_get(&main->thread) != controller_thread_enable_exit_e) return; diff --git a/sources/c/program/controller/main/thread/instance.h b/sources/c/program/controller/main/thread/instance.h index f8a3f3a..f0090bb 100644 --- a/sources/c/program/controller/main/thread/instance.h +++ b/sources/c/program/controller/main/thread/instance.h @@ -53,7 +53,7 @@ extern "C" { * If controller_thread_cancel_execute_e, then this was called from within the Entry/Exit for executing a process, so cancel the signal thread but not the Entry thread. */ #ifndef _di_controller_thread_instance_cancel_ - extern void controller_thread_instance_cancel(controller_t * const main, const uint8_t is_normal, const uint8_t by); + extern void controller_thread_instance_cancel(controller_main_t * const main, const uint8_t is_normal, const uint8_t by); #endif // _di_controller_thread_instance_cancel_ /** @@ -67,7 +67,7 @@ extern "C" { * This does not alter main.setting.state.status. */ #ifndef _di_controller_thread_instance_exit_ - extern void controller_thread_instance_exit(controller_t * const main); + extern void controller_thread_instance_exit(controller_main_t * const main); #endif // _di_controller_thread_instance_exit_ /** diff --git a/sources/c/program/controller/main/thread/rule.c b/sources/c/program/controller/main/thread/rule.c index e5daa4d..e64c2c7 100644 --- a/sources/c/program/controller/main/thread/rule.c +++ b/sources/c/program/controller/main/thread/rule.c @@ -12,7 +12,7 @@ extern "C" { f_thread_cancel_state_set(PTHREAD_CANCEL_DEFERRED, 0); f_thread_name_set(f_thread_caller(), controller_thread_rule_s); - controller_t * const main = (controller_t *) argument; + controller_main_t * const main = (controller_main_t *) argument; if (!controller_thread_enable_is_normal(&main->thread, F_true)) return 0; diff --git a/sources/c/program/controller/main/thread/rule.h b/sources/c/program/controller/main/thread/rule.h index 897f41b..42e2f5a 100644 --- a/sources/c/program/controller/main/thread/rule.h +++ b/sources/c/program/controller/main/thread/rule.h @@ -27,7 +27,7 @@ extern "C" { * @param argument * The main program data. * - * Must be of type controller_t. + * Must be of type controller_main_t. * Must not be NULL. * * @return diff --git a/sources/c/program/controller/main/thread/signal.c b/sources/c/program/controller/main/thread/signal.c index a78a113..b6bedfe 100644 --- a/sources/c/program/controller/main/thread/signal.c +++ b/sources/c/program/controller/main/thread/signal.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_controller_thread_signal_ - void controller_thread_signal(controller_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute) { + void controller_thread_signal(controller_main_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute) { if (!main || !attribute) return; if (!(main->setting.flag & controller_main_flag_interruptible_d)) return; @@ -61,7 +61,7 @@ extern "C" { #endif // _di_controller_thread_signal_ #ifndef _di_controller_thread_signal_create_ - f_status_t controller_thread_signal_create(controller_t * const main, const f_void_pointer_call_t routine) { + f_status_t controller_thread_signal_create(controller_main_t * const main, const f_void_pointer_call_t routine) { if (!routine) return F_status_set_error(F_parameter); if (!main->thread.id_signal) return F_none; @@ -105,7 +105,7 @@ extern "C" { #endif // _di_controller_thread_signal_get_ #ifndef _di_controller_thread_signal_received_set_ - f_status_t controller_thread_signal_received_set(controller_t * const main, const uint32_t value) { + f_status_t controller_thread_signal_received_set(controller_main_t * const main, const uint32_t value) { if (!main) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/thread/signal.h b/sources/c/program/controller/main/thread/signal.h index f99c7b7..9d002af 100644 --- a/sources/c/program/controller/main/thread/signal.h +++ b/sources/c/program/controller/main/thread/signal.h @@ -30,7 +30,7 @@ * Must not be NULL. */ #ifndef _di_controller_thread_signal_ - extern void controller_thread_signal(controller_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute); + extern void controller_thread_signal(controller_main_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute); #endif // _di_controller_thread_signal_ /** @@ -58,7 +58,7 @@ * @see f_thread_lock_write_timed() */ #ifndef _di_controller_thread_signal_create_ - extern f_status_t controller_thread_signal_create(controller_t * const main, const f_void_pointer_call_t routine); + extern f_status_t controller_thread_signal_create(controller_main_t * const main, const f_void_pointer_call_t routine); #endif // _di_controller_thread_signal_create_ /** @@ -120,7 +120,7 @@ * @see f_thread_unlock() */ #ifndef _di_controller_thread_signal_received_set_ - extern f_status_t controller_thread_signal_received_set(controller_t * const main, const uint32_t value); + extern f_status_t controller_thread_signal_received_set(controller_main_t * const main, const uint32_t value); #endif // _di_controller_thread_signal_received_set_ /** @@ -188,7 +188,7 @@ * @param argument * The main program data. * - * Must be of type controller_t. + * Must be of type controller_main_t. * Must not be NULL. * * @return @@ -206,7 +206,7 @@ * @param argument * The main program data. * - * Must be of type controller_t. + * Must be of type controller_main_t. * Must not be NULL. * * @return diff --git a/sources/c/program/controller/main/time.c b/sources/c/program/controller/main/time.c index d6a957e..d3b0d95 100644 --- a/sources/c/program/controller/main/time.c +++ b/sources/c/program/controller/main/time.c @@ -42,7 +42,7 @@ extern "C" { #endif // _di_controller_time_now_ #ifndef _di_controller_time_sleep_nanoseconds_ - f_status_t controller_time_sleep_nanoseconds(controller_t * const main, const f_time_spec_t time) { + f_status_t controller_time_sleep_nanoseconds(controller_main_t * const main, const f_time_spec_t time) { if (!main) return F_status_set_error(F_parameter); diff --git a/sources/c/program/controller/main/time.h b/sources/c/program/controller/main/time.h index 3e4678c..2ff9017 100644 --- a/sources/c/program/controller/main/time.h +++ b/sources/c/program/controller/main/time.h @@ -52,7 +52,7 @@ * @see f_time_of_day_get() */ #ifndef _di_controller_time_sleep_nanoseconds_ - extern f_status_t controller_time_sleep_nanoseconds(controller_t * const main, const f_time_spec_t time); + extern f_status_t controller_time_sleep_nanoseconds(controller_main_t * const main, const f_time_spec_t time); #endif // _di_controller_time_sleep_nanoseconds_ #ifdef __cplusplus