From 1a8ca43fa9c72f1028ea7c45853f6a9dfaf41a37 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 2 Dec 2025 21:42:37 -0600 Subject: [PATCH] Update: Initialize variables with recent FLL practices. --- .../program/kevux/tools/tacocat/main/common/type.h | 370 +++++++++++---------- 1 file changed, 196 insertions(+), 174 deletions(-) diff --git a/sources/c/program/kevux/tools/tacocat/main/common/type.h b/sources/c/program/kevux/tools/tacocat/main/common/type.h index 5a94a4c..0de9e43 100644 --- a/sources/c/program/kevux/tools/tacocat/main/common/type.h +++ b/sources/c/program/kevux/tools/tacocat/main/common/type.h @@ -66,6 +66,7 @@ extern "C" { * cache: A cache used for various purposes, but primarily for the building of the send packet. * client: A single client address for some network connection. * header: A buffer used for the header part and possibly the reset of a packet, except for the actual payload. + * id: The identifier. * name: A file name for reading from or writing to. * network: A network name for the socket. * time: A representation of time added for informative purposes to the packet (in a human friendly format). @@ -128,139 +129,146 @@ extern "C" { f_string_maps_t headers; } kt_tacocat_socket_set_t; - #define kt_tacocat_socket_set_t_initialize \ - { \ - kt_tacocat_block_size_d, \ - 0, \ - 0, \ - kt_tacocat_socket_step_flag_none_d, \ - kt_tacocat_socket_step_receive_none_e, \ - 0, \ - f_file_t_initialize, \ - f_socket_t_initialize, \ - f_status_t_initialize, \ - f_range_t_initialize, \ - f_ranges_t_initialize, \ - f_ranges_t_initialize, \ - f_ranges_t_initialize, \ - f_rangess_t_initialize, \ - f_rangess_t_initialize, \ - f_rangess_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_uint8s_t_initialize, \ - f_uint8s_t_initialize, \ - f_uint8ss_t_initialize, \ - f_uint8ss_t_initialize, \ - f_ranges_t_initialize, \ - f_state_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_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_fss_simple_packet_range_t_initialize, \ - fl_fss_payload_header_state_t_initialize, \ - f_abstruse_maps_t_initialize, \ - f_string_maps_t_initialize, \ - } - - #define macro_kt_tacocat_socket_set_t_initialize_1(size_block) \ - { \ - size_block, \ - 0, \ - 0, \ - kt_tacocat_socket_step_flag_none_d, \ - kt_tacocat_socket_step_receive_none_e, \ - 0, \ - f_file_t_initialize, \ - f_poll_t_initialize, \ - f_socket_t_initialize, \ - f_status_t_initialize, \ - f_range_t_initialize, \ - f_ranges_t_initialize, \ - f_ranges_t_initialize, \ - f_ranges_t_initialize, \ - f_rangess_t_initialize, \ - f_rangess_t_initialize, \ - f_rangess_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_uint8s_t_initialize, \ - f_uint8s_t_initialize, \ - f_uint8ss_t_initialize, \ - f_uint8ss_t_initialize, \ - f_ranges_t_initialize, \ - f_state_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_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_fss_simple_packet_range_t_initialize, \ - fl_fss_payload_header_state_t_initialize, \ - f_abstruse_maps_t_initialize, \ - f_string_maps_t_initialize, \ - } - - #define macro_kt_tacocat_socket_set_t_initialize_2(size_block, write_state) \ - { \ - size_block, \ - 0, \ - 0, \ - kt_tacocat_socket_step_flag_none_d, \ - kt_tacocat_socket_step_receive_none_e, \ - 0, \ - f_file_t_initialize, \ - f_poll_t_initialize, \ - f_socket_t_initialize, \ - f_status_t_initialize, \ - f_range_t_initialize, \ - f_ranges_t_initialize, \ - f_ranges_t_initialize, \ - f_ranges_t_initialize, \ - f_rangess_t_initialize, \ - f_rangess_t_initialize, \ - f_rangess_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_number_unsigneds_t_initialize, \ - f_uint8s_t_initialize, \ - f_uint8s_t_initialize, \ - f_uint8ss_t_initialize, \ - f_uint8ss_t_initialize, \ - f_ranges_t_initialize, \ - f_state_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_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_string_dynamic_t_initialize, \ - f_fss_simple_packet_range_t_initialize, \ - write_state, \ - f_abstruse_maps_t_initialize, \ - f_string_maps_t_initialize, \ - } + #define kt_tacocat_socket_set_t_initialize { \ + .size_block = kt_tacocat_block_size_d, \ + .size_done = 0, \ + .size_total = 0, \ + .flag = kt_tacocat_socket_step_flag_none_d, \ + .step = kt_tacocat_socket_step_receive_none_e, \ + .retry = 0, \ + .part = 0, \ + .port = 0, \ + .file = f_file_t_initialize, \ + .socket = f_socket_t_initialize, \ + .status = f_status_t_initialize, \ + .range = f_range_t_initialize, \ + .objects = f_ranges_t_initialize, \ + .objects_header = f_ranges_t_initialize, \ + .objects_signature = f_ranges_t_initialize, \ + .contents = f_rangess_t_initialize, \ + .contents_header = f_rangess_t_initialize, \ + .contents_signature = f_rangess_t_initialize, \ + .objects_delimits = f_number_unsigneds_t_initialize, \ + .objects_delimits_header = f_number_unsigneds_t_initialize, \ + .objects_delimits_signature = f_number_unsigneds_t_initialize, \ + .contents_delimits = f_number_unsigneds_t_initialize, \ + .contents_delimits_header = f_number_unsigneds_t_initialize, \ + .contents_delimits_signature = f_number_unsigneds_t_initialize, \ + .parts = f_number_unsigneds_t_initialize, \ + .objects_quoted_header = f_uint8s_t_initialize, \ + .objects_quoted_signature = f_uint8s_t_initialize, \ + .contents_quoted_header = f_uint8ss_t_initialize, \ + .contents_quoted_signature = f_uint8ss_t_initialize, \ + .comments = f_ranges_t_initialize, \ + .state = f_state_t_initialize, \ + .as = f_string_dynamic_t_initialize, \ + .buffer = f_string_dynamic_t_initialize, \ + .cache = f_string_dynamic_t_initialize, \ + .client = f_string_dynamic_t_initialize, \ + .header = f_string_dynamic_t_initialize, \ + .id = f_string_dynamic_t_initialize, \ + .name = f_string_dynamic_t_initialize, \ + .network = f_string_dynamic_t_initialize, \ + .time = f_string_dynamic_t_initialize, \ + .packet = f_fss_simple_packet_range_t_initialize, \ + .write_state = fl_fss_payload_header_state_t_initialize, \ + .abstruses = f_abstruse_maps_t_initialize, \ + .headers = f_string_maps_t_initialize, \ + } + + #define macro_kt_tacocat_socket_set_t_initialize_1(size_block_value) { \ + .size_block = size_block_value, \ + .size_done = 0, \ + .size_total = 0, \ + .flag = kt_tacocat_socket_step_flag_none_d, \ + .step = kt_tacocat_socket_step_receive_none_e, \ + .retry = 0, \ + .part = 0, \ + .port = 0, \ + .file = f_file_t_initialize, \ + .socket = f_socket_t_initialize, \ + .status = f_status_t_initialize, \ + .range = f_range_t_initialize, \ + .objects = f_ranges_t_initialize, \ + .objects_header = f_ranges_t_initialize, \ + .objects_signature = f_ranges_t_initialize, \ + .contents = f_rangess_t_initialize, \ + .contents_header = f_rangess_t_initialize, \ + .contents_signature = f_rangess_t_initialize, \ + .objects_delimits = f_number_unsigneds_t_initialize, \ + .objects_delimits_header = f_number_unsigneds_t_initialize, \ + .objects_delimits_signature = f_number_unsigneds_t_initialize, \ + .contents_delimits = f_number_unsigneds_t_initialize, \ + .contents_delimits_header = f_number_unsigneds_t_initialize, \ + .contents_delimits_signature = f_number_unsigneds_t_initialize, \ + .parts = f_number_unsigneds_t_initialize, \ + .objects_quoted_header = f_uint8s_t_initialize, \ + .objects_quoted_signature = f_uint8s_t_initialize, \ + .contents_quoted_header = f_uint8ss_t_initialize, \ + .contents_quoted_signature = f_uint8ss_t_initialize, \ + .comments = f_ranges_t_initialize, \ + .state = f_state_t_initialize, \ + .as = f_string_dynamic_t_initialize, \ + .buffer = f_string_dynamic_t_initialize, \ + .cache = f_string_dynamic_t_initialize, \ + .client = f_string_dynamic_t_initialize, \ + .header = f_string_dynamic_t_initialize, \ + .id = f_string_dynamic_t_initialize, \ + .name = f_string_dynamic_t_initialize, \ + .network = f_string_dynamic_t_initialize, \ + .time = f_string_dynamic_t_initialize, \ + .packet = f_fss_simple_packet_range_t_initialize, \ + .write_state = fl_fss_payload_header_state_t_initialize, \ + .abstruses = f_abstruse_maps_t_initialize, \ + .headers = f_string_maps_t_initialize, \ + } + + #define macro_kt_tacocat_socket_set_t_initialize_2(size_block_value, write_state_value) { \ + .size_block = kt_tacocat_block_size_d, \ + .size_done = 0, \ + .size_total = 0, \ + .flag = kt_tacocat_socket_step_flag_none_d, \ + .step = kt_tacocat_socket_step_receive_none_e, \ + .retry = 0, \ + .part = 0, \ + .port = 0, \ + .file = f_file_t_initialize, \ + .socket = f_socket_t_initialize, \ + .status = f_status_t_initialize, \ + .range = f_range_t_initialize, \ + .objects = f_ranges_t_initialize, \ + .objects_header = f_ranges_t_initialize, \ + .objects_signature = f_ranges_t_initialize, \ + .contents = f_rangess_t_initialize, \ + .contents_header = f_rangess_t_initialize, \ + .contents_signature = f_rangess_t_initialize, \ + .objects_delimits = f_number_unsigneds_t_initialize, \ + .objects_delimits_header = f_number_unsigneds_t_initialize, \ + .objects_delimits_signature = f_number_unsigneds_t_initialize, \ + .contents_delimits = f_number_unsigneds_t_initialize, \ + .contents_delimits_header = f_number_unsigneds_t_initialize, \ + .contents_delimits_signature = f_number_unsigneds_t_initialize, \ + .parts = f_number_unsigneds_t_initialize, \ + .objects_quoted_header = f_uint8s_t_initialize, \ + .objects_quoted_signature = f_uint8s_t_initialize, \ + .contents_quoted_header = f_uint8ss_t_initialize, \ + .contents_quoted_signature = f_uint8ss_t_initialize, \ + .comments = f_ranges_t_initialize, \ + .state = f_state_t_initialize, \ + .as = f_string_dynamic_t_initialize, \ + .buffer = f_string_dynamic_t_initialize, \ + .cache = f_string_dynamic_t_initialize, \ + .client = f_string_dynamic_t_initialize, \ + .header = f_string_dynamic_t_initialize, \ + .id = f_string_dynamic_t_initialize, \ + .name = f_string_dynamic_t_initialize, \ + .network = f_string_dynamic_t_initialize, \ + .time = f_string_dynamic_t_initialize, \ + .packet = f_fss_simple_packet_range_t_initialize, \ + .write_state = write_state_value, \ + .abstruses = f_abstruse_maps_t_initialize, \ + .headers = f_string_maps_t_initialize, \ + } #endif // _di_kt_tacocat_socket_set_t_ /** @@ -278,10 +286,29 @@ extern "C" { f_number_unsigned_t size; } kt_tacocat_socket_sets_t; - #define kt_tacocat_socket_sets_t_initialize { 0, 0, 0 } + #define kt_tacocat_socket_sets_t_initialize { \ + .array = 0, \ + .used = 0, \ + .size = 0, \ + } + + #define macro_kt_tacocat_socket_sets_t_initialize_1(array_value, used_value, size_value) { \ + .array = array_value, \ + .used = used_value, \ + .size = size_value, \ + } + + #define macro_kt_tacocat_socket_sets_t_initialize_2(array_value, length_value) { \ + .array = array_value, \ + .used = length_value, \ + .size = length_value, \ + } - #define macro_kt_tacocat_socket_sets_t_initialize_1(array_value, used_value, size_value) { .array = array_value, .used = used_value, .size = size_value } - #define macro_kt_tacocat_socket_sets_t_initialize_2(array_value, length_value) { .array = array_value, .used = length_value, .size = length_value } + #define macro_kt_tacocat_socket_sets_t_initialize_3(array_value, length_value) { \ + .array = array_value, \ + .used = length_value, \ + .size = 0, \ + } #define macro_kt_tacocat_socket_sets_t_clear(socket_set) { \ socket_set.array = 0; \ @@ -335,22 +362,21 @@ extern "C" { kt_tacocat_socket_sets_t send; } kt_tacocat_setting_t; - #define kt_tacocat_setting_t_initialize \ - { \ - kt_tacocat_main_flag_max_buffer_d, \ - kt_tacocat_interval_poll_d, \ - kt_tacocat_interval_poll_fast_d, \ - kt_tacocat_max_buffer_d, \ - 0, \ - 0, \ - F_okay, \ - F_okay, \ - macro_f_state_t_initialize_1(kt_tacocat_allocation_large_d, kt_tacocat_allocation_small_d, F_okay, 0, 0, &fll_program_standard_signal_handle, 0, 0, 0, 0), \ - f_polls_t_initialize, \ - f_polls_t_initialize, \ - kt_tacocat_socket_sets_t_initialize, \ - kt_tacocat_socket_sets_t_initialize, \ - } + #define kt_tacocat_setting_t_initialize { \ + .flag = kt_tacocat_main_flag_max_buffer_d, \ + .interval = kt_tacocat_interval_poll_d, \ + .interval_fast = kt_tacocat_interval_poll_fast_d, \ + .max_buffer = kt_tacocat_max_buffer_d, \ + .active_receive = 0, \ + .active_send = 0, \ + .status_receive = F_okay, \ + .status_send = F_okay, \ + .state = macro_f_state_t_initialize_1(kt_tacocat_allocation_large_d, kt_tacocat_allocation_small_d, F_okay, 0, 0, &fll_program_standard_signal_handle, 0, 0, 0, 0), \ + .receive_polls = f_polls_t_initialize, \ + .send_polls = f_polls_t_initialize, \ + .receive = kt_tacocat_socket_sets_t_initialize, \ + .send = kt_tacocat_socket_sets_t_initialize, \ + } #endif // _di_kt_tacocat_setting_t_ /** @@ -367,11 +393,10 @@ extern "C" { f_string_dynamic_t buffer; } kt_tacocat_cache_t; - #define kt_tacocat_cache_t_initialize \ - { \ - { 0 }, \ - f_string_dynamic_t_initialize, \ - } + #define kt_tacocat_cache_t_initialize { \ + .peek = { 0 }, \ + .buffer = f_string_dynamic_t_initialize, \ + } #endif // _di_kt_tacocat_cache_t_ /** @@ -384,10 +409,9 @@ extern "C" { void (*setting_load_send_receive)(const f_console_arguments_t arguments, kt_tacocat_main_t * const main); } kt_tacocat_callback_t; - #define kt_tacocat_callback_t_initialize \ - { \ - 0, \ - } + #define kt_tacocat_callback_t_initialize { \ + .setting_load_send_receive = 0, \ + } #endif // _di_kt_tacocat_callback_t_ /** @@ -399,11 +423,10 @@ extern "C" { f_thread_id_t id_send; } kt_tacocat_thread_t; - #define kt_tacocat_thread_t_initialize \ - { \ - f_thread_id_t_initialize, \ - f_thread_id_t_initialize, \ - } + #define kt_tacocat_thread_t_initialize { \ + .id_receive = f_thread_id_t_initialize, \ + .id_send = f_thread_id_t_initialize, \ + } #endif // _di_kt_tacocat_thread_t_ /** @@ -423,14 +446,13 @@ extern "C" { kt_tacocat_cache_t cache; }; - #define kt_tacocat_main_t_initialize \ - { \ - fll_program_data_t_initialize, \ - kt_tacocat_setting_t_initialize, \ - kt_tacocat_callback_t_initialize, \ - kt_tacocat_thread_t_initialize, \ - kt_tacocat_cache_t_initialize, \ - } + #define kt_tacocat_main_t_initialize { \ + .program = fll_program_data_t_initialize, \ + .setting = kt_tacocat_setting_t_initialize, \ + .callback = kt_tacocat_callback_t_initialize, \ + .thread = kt_tacocat_thread_t_initialize, \ + .cache = kt_tacocat_cache_t_initialize, \ + } #endif // _di_kt_tacocat_main_t_ /** -- 1.8.3.1