From: Kevin Day Date: Wed, 3 Dec 2025 04:46:47 +0000 (-0600) Subject: Update: Initialize variables with recent FLL practices. X-Git-Tag: 0.7.4~19 X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=19ea521cd21a7a902b91b2967eb5ad1e0d991d89;p=controller Update: Initialize variables with recent FLL practices. --- diff --git a/sources/c/program/controller/main/common/type.h b/sources/c/program/controller/main/common/type.h index db71d23..bdfa342 100644 --- a/sources/c/program/controller/main/common/type.h +++ b/sources/c/program/controller/main/common/type.h @@ -45,22 +45,20 @@ extern "C" { } controller_setting_t; #ifdef _support_controller_controlfile_ - #define controller_setting_t_initialize \ - { \ - controller_main_flag_none_d, \ - f_state_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - } + #define controller_setting_t_initialize { \ + .flag = controller_main_flag_none_d, \ + .state = f_state_t_initialize, \ + .path_pid = f_string_dynamic_t_initialize, \ + .path_setting = f_string_dynamic_t_initialize, \ + .path_controlfile = f_string_dynamic_t_initialize, \ + } #else - #define controller_setting_t_initialize \ - { \ - controller_main_flag_none_d, \ - f_state_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - } + #define controller_setting_t_initialize { \ + .flag = controller_main_flag_none_d, \ + .state = f_state_t_initialize, \ + .path_pid = f_string_dynamic_t_initialize, \ + .path_setting = f_string_dynamic_t_initialize, \ + } #endif // _support_controller_controlfile_ #endif // _di_controller_setting_t_ @@ -80,7 +78,11 @@ extern "C" { void (*process_thread_signal)(controller_t * const main, const uint8_t is_normal, f_thread_attribute_t * const attribute); } controller_callback_t; - #define controller_callback_t_initialize { 0, 0, 0 } + #define controller_callback_t_initialize { \ + .print_message_help = 0, \ + .process_entry_setup = 0, \ + .process_thread_signal = 0, \ + } #endif // _di_controller_t_ /** @@ -106,14 +108,13 @@ extern "C" { controller_thread_t thread; }; - #define controller_t_initialize \ - { \ - fll_program_data_t_initialize, \ - controller_callback_t_initialize, \ - controller_process_t_initialize, \ - controller_setting_t_initialize, \ - controller_thread_t_initialize, \ - } + #define controller_t_initialize { \ + .program = fll_program_data_t_initialize, \ + .callback = controller_callback_t_initialize, \ + .process = controller_process_t_initialize, \ + .setting = controller_setting_t_initialize, \ + .thread = controller_thread_t_initialize, \ + } #endif // _di_controller_t_ /** diff --git a/sources/c/program/controller/main/common/type/cache.h b/sources/c/program/controller/main/common/type/cache.h index 20f0bde..f343613 100644 --- a/sources/c/program/controller/main/common/type/cache.h +++ b/sources/c/program/controller/main/common/type/cache.h @@ -41,21 +41,22 @@ extern "C" { } controller_cache_action_t; #define controller_cache_action_t_initialize { \ - 0, \ - 0, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ + .line_action = 0, \ + .line_item = 0, \ + .name_action = f_string_dynamic_t_initialize, \ + .name_file = f_string_dynamic_t_initialize, \ + .name_item = f_string_dynamic_t_initialize, \ + .generic = f_string_dynamic_t_initialize, \ } - #define macro_controller_cache_action_t_clear(cache) \ + #define macro_controller_cache_action_t_clear(cache) { \ cache.line_action = 0; \ cache.line_item = 0; \ macro_f_string_dynamic_t_clear(cache.name_action) \ macro_f_string_dynamic_t_clear(cache.name_file) \ macro_f_string_dynamic_t_clear(cache.name_item) \ - macro_f_string_dynamic_t_clear(cache.generic) + macro_f_string_dynamic_t_clear(cache.generic) \ + } #endif // _di_controller_cache_action_t_ /** @@ -116,27 +117,26 @@ extern "C" { controller_rules_t stack; }; - #define controller_cache_t_initialize \ - { \ - f_time_simple_t_initialize, \ - f_range_t_initialize, \ - f_range_t_initialize, \ - f_ranges_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_ranges_t_initialize, \ - f_rangess_t_initialize, \ - f_rangess_t_initialize, \ - f_ranges_t_initialize, \ - f_ranges_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamics_t_initialize, \ - controller_cache_action_t_initialize, \ - controller_rules_t_initialize, \ - } + #define controller_cache_t_initialize { \ + .timestamp = f_time_simple_t_initialize, \ + .range_action = f_range_t_initialize, \ + .close = f_range_t_initialize, \ + .comments = f_ranges_t_initialize, \ + .ats = f_number_unsigneds_t_initialize, \ + .delimits = f_number_unsigneds_t_initialize, \ + .content_action = f_ranges_t_initialize, \ + .content_actions = f_rangess_t_initialize, \ + .content_items = f_rangess_t_initialize, \ + .object_actions = f_ranges_t_initialize, \ + .object_items = f_ranges_t_initialize, \ + .buffer = f_string_dynamic_t_initialize, \ + .buffer_file = f_string_dynamic_t_initialize, \ + .buffer_item = f_string_dynamic_t_initialize, \ + .buffer_path = f_string_dynamic_t_initialize, \ + .expanded = f_string_dynamics_t_initialize, \ + .action = controller_cache_action_t_initialize, \ + .stack = controller_rules_t_initialize, \ + } #endif // _di_controller_cache_t_ /** diff --git a/sources/c/program/controller/main/common/type/control.h b/sources/c/program/controller/main/common/type/control.h index 64a4ad5..52f580b 100644 --- a/sources/c/program/controller/main/common/type/control.h +++ b/sources/c/program/controller/main/common/type/control.h @@ -54,17 +54,17 @@ extern "C" { } controller_control_t; #define controller_control_t_initialize { \ - 0, \ - -1, \ - -1, \ - 0, \ - f_socket_t_initialize, \ - f_socket_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ + .flag = 0, \ + .user = -1, \ + .group = -1, \ + .mode = 0, \ + .server = f_socket_t_initialize, \ + .client = f_socket_t_initialize, \ + .cache_1 = f_string_dynamic_t_initialize, \ + .cache_2 = f_string_dynamic_t_initialize, \ + .cache_3 = f_string_dynamic_t_initialize, \ + .input = f_string_dynamic_t_initialize, \ + .output = f_string_dynamic_t_initialize, \ } #endif // _di_controller_control_t_ diff --git a/sources/c/program/controller/main/common/type/entry.h b/sources/c/program/controller/main/common/type/entry.h index dd7255a..cf0395f 100644 --- a/sources/c/program/controller/main/common/type/entry.h +++ b/sources/c/program/controller/main/common/type/entry.h @@ -43,13 +43,13 @@ extern "C" { } controller_entry_action_t; #define controller_entry_action_t_initialize { \ - 0, \ - 0, \ - 0, \ - controller_entry_action_flag_none_e, \ - 0, \ - F_known_not, \ - f_string_dynamics_t_initialize, \ + .type = 0, \ + .code = 0, \ + .flag = 0, \ + .line = controller_entry_action_flag_none_e, \ + .number = 0, \ + .status = F_known_not, \ + .parameters = f_string_dynamics_t_initialize, \ } #endif // _di_controller_entry_action_t_ @@ -69,7 +69,11 @@ extern "C" { f_number_unsigned_t size; } controller_entry_actions_t; - #define controller_entry_actions_t_initialize { 0, 0, 0 } + #define controller_entry_actions_t_initialize { \ + .array = 0, \ + .used = 0, \ + .size = 0, \ + } #endif // _di_controller_entry_actions_t_ /** @@ -88,12 +92,11 @@ extern "C" { controller_entry_actions_t actions; } controller_entry_item_t; - #define controller_entry_item_t_initialize \ - { \ - 0, \ - f_string_dynamic_t_initialize, \ - controller_entry_actions_t_initialize, \ - } + #define controller_entry_item_t_initialize { \ + 0, \ + f_string_dynamic_t_initialize, \ + controller_entry_actions_t_initialize, \ + } #endif // _di_controller_entry_item_t_ /** @@ -112,7 +115,11 @@ extern "C" { f_number_unsigned_t size; } controller_entry_items_t; - #define controller_entry_items_t_initialize { 0, 0, 0 } + #define controller_entry_items_t_initialize { \ + .array = 0, \ + .used = 0, \ + .size = 0, \ + } #define macro_controller_entry_items_t_clear(items) { \ items.array = 0; \ @@ -164,33 +171,33 @@ extern "C" { } controller_entry_t; #define controller_entry_t_initialize { \ - F_known_not, \ - controller_entry_pid_require_e, \ - 0, \ - 0, \ - 0, \ - controller_thread_timeout_exit_d, \ - 0, \ - 0, \ - 0, \ - f_string_maps_t_initialize, \ - f_string_maps_t_initialize, \ - controller_entry_items_t_initialize, \ + .status = F_known_not, \ + .pid = controller_entry_pid_require_e, \ + .session = 0, \ + .show = 0, \ + .flag = 0, \ + .timeout_exit = controller_thread_timeout_exit_d, \ + .timeout_kill = 0, \ + .timeout_start = 0, \ + .timeout_stop = 0, \ + .define = f_string_maps_t_initialize, \ + .parameter = f_string_maps_t_initialize, \ + .items = controller_entry_items_t_initialize, \ } - #define macro_controller_entry_t_initialize_1(flag) { \ - F_known_not, \ - controller_entry_pid_require_e, \ - 0, \ - 0, \ - flag, \ - controller_thread_timeout_exit_d, \ - 0, \ - 0, \ - 0, \ - f_string_maps_t_initialize, \ - f_string_maps_t_initialize, \ - controller_entry_items_t_initialize, \ + #define macro_controller_entry_t_initialize_1(flag_value) { \ + .status = F_known_not, \ + .pid = controller_entry_pid_require_e, \ + .session = 0, \ + .show = 0, \ + .flag = flag_value, \ + .timeout_exit = controller_thread_timeout_exit_d, \ + .timeout_kill = 0, \ + .timeout_start = 0, \ + .timeout_stop = 0, \ + .define = f_string_maps_t_initialize, \ + .parameter = f_string_maps_t_initialize, \ + .items = controller_entry_items_t_initialize, \ } #endif // _di_controller_entry_t_ diff --git a/sources/c/program/controller/main/common/type/execute.h b/sources/c/program/controller/main/common/type/execute.h index bb9c694..db5efcd 100644 --- a/sources/c/program/controller/main/common/type/execute.h +++ b/sources/c/program/controller/main/common/type/execute.h @@ -34,9 +34,9 @@ extern "C" { fl_execute_as_t_initialize \ } - #define macro_controller_execute_set_t_initialize_1(option, wait, environment, signals, main, as) { \ - macro_fl_execute_parameter_t_initialize_1(option, wait, environment, signals, main), \ - as, \ + #define macro_controller_execute_set_t_initialize_1(option_value, wait_value, environment_value, signals_value, main_value, as_value) { \ + .parameter = macro_fl_execute_parameter_t_initialize_1(option_value, wait_value, environment_value, signals_value, main_value), \ + .as = as_value, \ } #endif // _di_controller_execute_set_t_ diff --git a/sources/c/program/controller/main/common/type/interrupt.h b/sources/c/program/controller/main/common/type/interrupt.h index 425d914..3a3772d 100644 --- a/sources/c/program/controller/main/common/type/interrupt.h +++ b/sources/c/program/controller/main/common/type/interrupt.h @@ -31,13 +31,13 @@ extern "C" { } controller_interrupt_t; #define controller_interrupt_t_initialize { \ - F_true, \ - 0, \ + .is_normal = F_true, \ + .main = 0, \ } - #define macro_controller_interrupt_t_initialize_1(is_normal, main) { \ - is_normal, \ - main, \ + #define macro_controller_interrupt_t_initialize_1(is_normal_value, main_value) { \ + .is_normal = is_normal_value, \ + .main = main_value, \ } #endif // _di_controller_interrupt_t_ diff --git a/sources/c/program/controller/main/common/type/lock.h b/sources/c/program/controller/main/common/type/lock.h index ed8e2e9..706b54c 100644 --- a/sources/c/program/controller/main/common/type/lock.h +++ b/sources/c/program/controller/main/common/type/lock.h @@ -64,18 +64,18 @@ extern "C" { } controller_lock_t; #define controller_lock_t_initialize { \ - 0, \ - f_thread_mutex_full_t_initialize, \ - f_thread_mutex_full_t_initialize, \ - f_thread_mutex_full_t_initialize, \ - f_thread_mutex_full_t_initialize, \ - f_thread_mutex_full_t_initialize, \ - f_thread_lock_t_initialize, \ - f_thread_lock_t_initialize, \ - f_thread_lock_t_initialize, \ - f_thread_lock_t_initialize, \ - f_thread_condition_t_initialize, \ - f_thread_condition_t_initialize, \ + .flag = 0, \ + .alert = f_thread_mutex_full_t_initialize, \ + .cancel = f_thread_mutex_full_t_initialize, \ + .entry = f_thread_mutex_full_t_initialize, \ + .print = f_thread_mutex_full_t_initialize, \ + .reap = f_thread_mutex_full_t_initialize, \ + .enable = f_thread_lock_t_initialize, \ + .instance = f_thread_lock_t_initialize, \ + .rule = f_thread_lock_t_initialize, \ + .signal = f_thread_lock_t_initialize, \ + .alert_condition = f_thread_condition_t_initialize, \ + .reap_condition = f_thread_condition_t_initialize, \ } #endif // _di_controller_lock_t_ diff --git a/sources/c/program/controller/main/common/type/rule.h b/sources/c/program/controller/main/common/type/rule.h index 358d25d..cf57054 100644 --- a/sources/c/program/controller/main/common/type/rule.h +++ b/sources/c/program/controller/main/common/type/rule.h @@ -33,17 +33,18 @@ extern "C" { f_number_unsigned_t max; } controller_rule_rerun_item_t; - #define controller_rule_rerun_item_initialize { \ - F_false, \ - 0, \ - 5000, \ - 0, \ + #define controller_rule_rerun_item_t_initialize { \ + .reset = F_false, \ + .count = 0, \ + .delay = 5000, \ + .max = 0, \ + } - #define macro_controller_rule_rerun_item_initialize(item) { \ + #define macro_controller_rule_rerun_item_t_initialize_1(item) { \ item.reset = F_false; \ item.count = 0; \ item.delay = 5000; \ - item.max = 0; \ + item.max = 0; \ } #endif // _di_controller_rule_rerun_item_t_ @@ -67,10 +68,10 @@ extern "C" { controller_rule_rerun_item_t success; } controller_rule_rerun_t; - #define controller_rule_rerun_initialize { \ - 0, \ - controller_rule_rerun_item_initialize, \ - controller_rule_rerun_item_initialize, \ + #define controller_rule_rerun_t_initialize { \ + .is = 0, \ + .failure = controller_rule_rerun_item_t_initialize, \ + .success = controller_rule_rerun_item_t_initialize, \ } #endif // _di_controller_rule_rerun_t_ @@ -82,6 +83,7 @@ extern "C" { * - line: The line number where the Rule Action begins. * - status: The last execution status of the Rule Action. * - parameters: All parameters associated with the Rule Action. + * - ikis: The IKI data. */ #ifndef _di_controller_rule_action_t_ typedef struct { @@ -94,11 +96,11 @@ extern "C" { } controller_rule_action_t; #define controller_rule_action_t_initialize { \ - 0, \ - 0, \ - F_known_not, \ - f_string_dynamics_t_initialize, \ - f_iki_datas_t_initialize, \ + .type = 0, \ + .line = 0, \ + .status = F_known_not, \ + .parameters = f_string_dynamics_t_initialize, \ + .ikis = f_iki_datas_t_initialize, \ } #endif // _di_controller_rule_action_t_ @@ -118,7 +120,11 @@ extern "C" { f_number_unsigned_t size; } controller_rule_actions_t; - #define controller_rule_actions_t_initialize { 0, 0, 0 } + #define controller_rule_actions_t_initialize { \ + .array = 0, \ + .used = 0, \ + .size = 0, \ + } #endif // _di_controller_rule_actions_t_ /** @@ -142,25 +148,24 @@ extern "C" { controller_rule_actions_t actions; } controller_rule_item_t; - #define controller_rule_item_t_initialize \ - { \ - 0, \ - 0, \ - 0, \ - f_string_dynamic_t_initialize, \ - { \ - controller_rule_rerun_t_initialize, \ - controller_rule_rerun_t_initialize, \ - controller_rule_rerun_t_initialize, \ - controller_rule_rerun_t_initialize, \ - controller_rule_rerun_t_initialize, \ - controller_rule_rerun_t_initialize, \ - controller_rule_rerun_t_initialize, \ - controller_rule_rerun_t_initialize, \ - controller_rule_rerun_t_initialize, \ - }, \ - controller_rule_actions_t_initialize, \ - } + #define controller_rule_item_t_initialize { \ + .type = 0, \ + .with = 0, \ + .line = 0, \ + .pid_file = f_string_dynamic_t_initialize, \ + .reruns = { \ + controller_rule_rerun_t_initialize, \ + controller_rule_rerun_t_initialize, \ + controller_rule_rerun_t_initialize, \ + controller_rule_rerun_t_initialize, \ + controller_rule_rerun_t_initialize, \ + controller_rule_rerun_t_initialize, \ + controller_rule_rerun_t_initialize, \ + controller_rule_rerun_t_initialize, \ + controller_rule_rerun_t_initialize, \ + }, \ + .actions = controller_rule_actions_t_initialize, \ + } #endif // _di_controller_rule_item_t_ /** @@ -179,7 +184,11 @@ extern "C" { f_number_unsigned_t size; } controller_rule_items_t; - #define controller_rule_items_initialize { 0, 0, 0 } + #define controller_rule_items_initialize { \ + .array = 0, \ + .used = 0, \ + .size = 0, \ + } #endif // _di_controller_rule_items_t_ /** @@ -201,10 +210,10 @@ extern "C" { } controller_rule_on_t; #define controller_rule_on_initialize { \ - 0, \ - f_string_dynamics_t_initialize, \ - f_string_dynamics_t_initialize, \ - f_string_dynamics_t_initialize, \ + .action = 0, \ + .need = f_string_dynamics_t_initialize, \ + .want = f_string_dynamics_t_initialize, \ + .wish = f_string_dynamics_t_initialize, \ } #endif // _di_controller_rule_on_t_ @@ -224,7 +233,11 @@ extern "C" { f_number_unsigned_t size; } controller_rule_ons_t; - #define controller_rule_ons_t_initialize { 0, 0, 0 } + #define controller_rule_ons_t_initialize { \ + .array = 0, \ + .used = 0, \ + .size = 0, \ + } #endif // _di_controller_rule_ons_t_ /** @@ -296,47 +309,47 @@ extern "C" { }; #define controller_rule_t_initialize { \ - { \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - F_known_not, \ - }, \ - 0, \ - 0, \ - 0, \ - 0, \ - 0, \ - 0, \ - 0, \ - f_time_simple_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_maps_t_initialize, \ - f_string_maps_t_initialize, \ - f_string_dynamics_t_initialize, \ - f_string_dynamics_t_initialize, \ - f_int32s_t_initialize, \ - f_capability_t_initialize, \ - f_control_group_t_initialize, \ - f_int32s_t_initialize, \ - f_limit_sets_t_initialize, \ - f_execute_scheduler_t_initialize, \ - controller_rule_ons_initialize, \ - controller_rule_items_initialize, \ + .status = { \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + F_known_not, \ + }, \ + .timeout_kill = 0, \ + .timeout_start = 0, \ + .timeout_stop = 0, \ + .has = 0, \ + .nice = 0, \ + .user = 0, \ + .group = 0, \ + .timestamp = f_time_simple_t_initialize, \ + .alias = f_string_dynamic_t_initialize, \ + .engine = f_string_dynamic_t_initialize, \ + .name = f_string_dynamic_t_initialize, \ + .path = f_string_dynamic_t_initialize, \ + .define = f_string_maps_t_initialize, \ + .parameter = f_string_maps_t_initialize, \ + .engine_arguments = f_string_dynamics_t_initialize, \ + .environment = f_string_dynamics_t_initialize, \ + .affinity = f_int32s_t_initialize, \ + .capability = f_capability_t_initialize, \ + .cgroup = f_control_group_t_initialize, \ + .groups = f_int32s_t_initialize, \ + .limits = f_limit_sets_t_initialize, \ + .scheduler = f_execute_scheduler_t_initialize, \ + .ons = controller_rule_ons_initialize, \ + .items = controller_rule_items_initialize, \ } #endif // _di_controller_rule_t_ @@ -358,7 +371,11 @@ extern "C" { f_number_unsigned_t size; }; - #define controller_rules_t_initialize { 0, 0, 0 } + #define controller_rules_t_initialize { \ + .array = 0, \ + .used = 0, \ + .size = 0, \ + } #endif // _di_controller_rules_t_ /** diff --git a/sources/c/program/controller/main/common/type/thread.h b/sources/c/program/controller/main/common/type/thread.h index 9a0462d..a802084 100644 --- a/sources/c/program/controller/main/common/type/thread.h +++ b/sources/c/program/controller/main/common/type/thread.h @@ -91,11 +91,14 @@ extern "C" { // This really should not be used under normal circumstances because these values are constants. #define controller_thread_arguments_t_initialize { \ - 0, \ - 0, \ + .main = 0, \ + .attribute = 0, \ } - #define macro_controller_thread_arguments_t_initialize_1(main, attribute) { main, attribute } + #define macro_controller_thread_arguments_t_initialize_1(main_value, attribute_value) { \ + .main = main_value, \ + .attribute = attribute_value, \ + } #endif // _di_controller_thread_arguments_t_ /** diff --git a/sources/c/program/controller/main/rule/read.c b/sources/c/program/controller/main/rule/read.c index a93742e..d078321 100644 --- a/sources/c/program/controller/main/rule/read.c +++ b/sources/c/program/controller/main/rule/read.c @@ -118,8 +118,8 @@ extern "C" { rule->items.array[i].reruns[j].is = 0; - macro_controller_rule_rerun_item_initialize(rule->items.array[i].reruns[j].failure); - macro_controller_rule_rerun_item_initialize(rule->items.array[i].reruns[j].success); + macro_controller_rule_rerun_item_t_initialize_1(rule->items.array[i].reruns[j].failure); + macro_controller_rule_rerun_item_t_initialize_1(rule->items.array[i].reruns[j].success); } // for for (j = 0; j < rule->items.array[i].actions.size; ++j) {