From db8827edbef82a31eebc944d46af706086d52687 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 2 Dec 2025 22:05:44 -0600 Subject: [PATCH] Update: Initialize variables with recent FLL practices. --- sources/c/program/firewall/main/common/type.h | 90 +++++++++++++-------------- 1 file changed, 43 insertions(+), 47 deletions(-) diff --git a/sources/c/program/firewall/main/common/type.h b/sources/c/program/firewall/main/common/type.h index 926c78b..3723910 100644 --- a/sources/c/program/firewall/main/common/type.h +++ b/sources/c/program/firewall/main/common/type.h @@ -60,20 +60,19 @@ extern "C" { f_rangess_t basic_contents; } firewall_cache_t; - #define firewall_cache_t_initialize \ - { \ - f_file_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, \ - f_string_dynamic_t_initialize, \ - f_string_dynamics_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_ranges_t_initialize, \ - f_rangess_t_initialize, \ - } + #define firewall_cache_t_initialize { \ + .file = f_file_t_initialize, \ + .buffer = f_string_dynamic_t_initialize, \ + .device = f_string_dynamic_t_initialize, \ + .ip_list = f_string_dynamic_t_initialize, \ + .path_file = f_string_dynamic_t_initialize, \ + .path_file_specific = f_string_dynamic_t_initialize, \ + .protocol = f_string_dynamic_t_initialize, \ + .arguments = f_string_dynamics_t_initialize, \ + .delimits = f_number_unsigneds_t_initialize, \ + .basic_objects = f_ranges_t_initialize, \ + .basic_contents = f_rangess_t_initialize, \ + } #endif // _di_firewall_cache_t_ /** @@ -124,25 +123,24 @@ extern "C" { f_rangess_t rule_contents; } firewall_data_t; - #define firewall_data_t_initialize \ - { \ - firewall_data_is_none_d, \ - firewall_data_has_none_e, \ - 0, \ - 0, \ - 0, \ - 0, \ - 0, \ - f_range_t_initialize, \ - f_string_static_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_ranges_t_initialize, \ - f_ranges_t_initialize, \ - f_ranges_t_initialize, \ - f_rangess_t_initialize, \ - f_rangess_t_initialize, \ - } + #define firewall_data_t_initialize { \ + .is = firewall_data_is_none_d, \ + .has = firewall_data_has_none_e, \ + .chain = 0, \ + .device = 0, \ + .lock = 0, \ + .main = 0, \ + .stop = 0, \ + .range = f_range_t_initialize, \ + .file = f_string_static_t_initialize, \ + .buffer = f_string_dynamic_t_initialize, \ + .chain_ids = f_number_unsigneds_t_initialize, \ + .comments = f_ranges_t_initialize, \ + .chain_objects = f_ranges_t_initialize, \ + .rule_objects = f_ranges_t_initialize, \ + .chain_contents = f_rangess_t_initialize, \ + .rule_contents = f_rangess_t_initialize, \ + } #endif // _di_firewall_data_t_ /** @@ -167,13 +165,12 @@ extern "C" { f_string_dynamics_t devices; } firewall_setting_t; - #define firewall_setting_t_initialize \ - { \ - firewall_main_flag_none_d, \ - f_state_t_initialize, \ - f_string_dynamics_t_initialize, \ - f_string_dynamics_t_initialize, \ - } + #define firewall_setting_t_initialize { \ + .flag = firewall_main_flag_none_d, \ + .state = f_state_t_initialize, \ + .chains = f_string_dynamics_t_initialize, \ + .devices = f_string_dynamics_t_initialize, \ + } #endif // _di_firewall_setting_t_ /** @@ -193,13 +190,12 @@ extern "C" { firewall_cache_t cache; }; - #define firewall_main_t_initialize \ - { \ - fll_program_data_t_initialize, \ - firewall_setting_t_initialize, \ - firewall_data_t_initialize, \ - firewall_cache_t_initialize, \ - } + #define firewall_main_t_initialize { \ + .program = fll_program_data_t_initialize, \ + .setting = firewall_setting_t_initialize, \ + .data = firewall_data_t_initialize, \ + .cache = firewall_cache_t_initialize, \ + } #endif // _di_firewall_main_t_ /** -- 1.8.3.1