From 67e79dcfdb285a9a1ef7352412ef7e42271f0088 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 18 Aug 2023 23:32:42 -0500 Subject: [PATCH] Update: Syncrhonize with latest FLL API changes. --- sources/c/remove/main/common.c | 8 ++++---- sources/c/remove/main/common/print.c | 3 ++- sources/c/remove/main/common/print.h | 3 ++- sources/c/remove/main/common/type.c | 4 ++-- sources/c/tacocat/main/common.c | 16 ++++++++-------- sources/c/tacocat/main/common/print.c | 5 +---- sources/c/tacocat/main/common/print.h | 5 +---- sources/c/tacocat/main/common/type.c | 8 ++++---- 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/sources/c/remove/main/common.c b/sources/c/remove/main/common.c index f6f9cd1..2a8f6bf 100644 --- a/sources/c/remove/main/common.c +++ b/sources/c/remove/main/common.c @@ -505,10 +505,10 @@ extern "C" { return; } - main->setting.state.status = f_uint32s_increase_by(total_arguments, &main->setting.groups); + main->setting.state.status = f_memory_array_increase_by(total_arguments, sizeof(uint32_t), (void **) &main->setting.groups.array, &main->setting.groups.used, &main->setting.groups.size); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_uint32s_increase_by)); + kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_increase_by)); return; } @@ -705,10 +705,10 @@ extern "C" { return; } - main->setting.state.status = f_uint32s_increase_by(total_arguments, &main->setting.users); + main->setting.state.status = f_memory_array_increase_by(total_arguments, sizeof(uint32_t), (void **) &main->setting.users.array, &main->setting.users.used, &main->setting.users.size); if (F_status_is_error(main->setting.state.status)) { - kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_uint32s_increase_by)); + kt_remove_print_error(&main->program.error, macro_kt_remove_f(f_memory_array_increase_by)); return; } diff --git a/sources/c/remove/main/common/print.c b/sources/c/remove/main/common/print.c index b7195ad..c68df24 100644 --- a/sources/c/remove/main/common/print.c +++ b/sources/c/remove/main/common/print.c @@ -11,9 +11,10 @@ extern "C" { "f_file_mode_from_string", "f_file_mode_to_mode", "f_file_remove", + "f_memory_array_increase_by", + "f_memory_array_resize", "f_string_dynamics_increase_by", "f_thread_create", - "f_uint32s_increase_by", "f_utf_is_digit", "f_utf_is_whitespace", "fl_conversion_dynamic_partial_to_unsigned_detect", diff --git a/sources/c/remove/main/common/print.h b/sources/c/remove/main/common/print.h index 21e0dcf..4137c96 100644 --- a/sources/c/remove/main/common/print.h +++ b/sources/c/remove/main/common/print.h @@ -44,9 +44,10 @@ extern "C" { kt_remove_f_f_file_mode_from_string_e, kt_remove_f_f_file_mode_to_mode_e, kt_remove_f_f_file_remove_e, + kt_remove_f_f_memory_array_increase_by_e, + kt_remove_f_f_memory_array_resize_e, kt_remove_f_f_string_dynamics_increase_by_e, kt_remove_f_f_thread_create_e, - kt_remove_f_f_uint32s_increase_by_e, kt_remove_f_f_utf_is_digit_e, kt_remove_f_f_utf_is_whitespace_e, kt_remove_f_fl_conversion_dynamic_partial_to_unsigned_detect_e, diff --git a/sources/c/remove/main/common/type.c b/sources/c/remove/main/common/type.c index cf1285c..89b5217 100644 --- a/sources/c/remove/main/common/type.c +++ b/sources/c/remove/main/common/type.c @@ -27,8 +27,8 @@ extern "C" { kt_remove_dates_resize(0, &setting->updated); kt_remove_modes_resize(0, &setting->modes); - f_uint32s_resize(0, &setting->groups); - f_uint32s_resize(0, &setting->users); + f_memory_array_resize(0, sizeof(uint32_t), (void **) &setting->groups.array, &setting->groups.used, &setting->groups.size); + f_memory_array_resize(0, sizeof(uint32_t), (void **) &setting->users.array, &setting->users.used, &setting->users.size); f_directory_recurse_do_delete(&setting->recurse); diff --git a/sources/c/tacocat/main/common.c b/sources/c/tacocat/main/common.c index 2425f8b..fdd47eb 100644 --- a/sources/c/tacocat/main/common.c +++ b/sources/c/tacocat/main/common.c @@ -271,25 +271,25 @@ extern "C" { macro_setting_load_handle_send_receive_error_continue_1(f_string_dynamics_increase_by); - main->setting.state.status = f_fss_simple_packet_ranges_increase_by(total, &sets[i]->packets); + main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_fss_simple_packet_t), (void **) &sets[i]->packets.array, &sets[i]->packets.used, &sets[i]->packets.size); - macro_setting_load_handle_send_receive_error_continue_1(f_fss_simple_packet_ranges_increase_by); + macro_setting_load_handle_send_receive_error_continue_1(f_memory_array_increase_by); main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_file_t), (void **) &sets[i]->files.array, &sets[i]->files.used, &sets[i]->files.size); macro_setting_load_handle_send_receive_error_continue_1(f_memory_array_increase_by); - main->setting.state.status = f_sockets_increase_by(total, &sets[i]->sockets); + main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_file_t), (void **) &sets[i]->sockets.array, &sets[i]->sockets.used, &sets[i]->sockets.size); - macro_setting_load_handle_send_receive_error_continue_1(f_sockets_increase_by); + macro_setting_load_handle_send_receive_error_continue_1(f_memory_array_increase_by); - main->setting.state.status = f_statuss_increase_by(total, &sets[i]->statuss); + main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_status_t), (void **) &sets[i]->statuss.array, &sets[i]->statuss.used, &sets[i]->statuss.size); - macro_setting_load_handle_send_receive_error_continue_1(f_statuss_increase_by); + macro_setting_load_handle_send_receive_error_continue_1(f_memory_array_increase_by); - main->setting.state.status = f_polls_increase_by(total, &sets[i]->polls); + main->setting.state.status = f_memory_array_increase_by(total, sizeof(f_poll_t), (void **) &sets[i]->polls.array, &sets[i]->polls.used, &sets[i]->polls.size); - macro_setting_load_handle_send_receive_error_continue_1(f_polls_increase_by); + macro_setting_load_handle_send_receive_error_continue_1(f_memory_array_increase_by); for (j = 0; j < main->program.parameters.array[parameters[i]].values.used; j += 2) { diff --git a/sources/c/tacocat/main/common/print.c b/sources/c/tacocat/main/common/print.c index bcf521d..6704dac 100644 --- a/sources/c/tacocat/main/common/print.c +++ b/sources/c/tacocat/main/common/print.c @@ -9,11 +9,10 @@ extern "C" { "f_console_parameter_process", "f_file_open", "f_fss_simple_packet_identify", - "f_fss_simple_packet_increase_by", "f_memory_array_increase_by", + "f_memory_array_resize", "f_network_from_ip_name", "f_network_is_ip_address", - "f_polls_increase_by", "f_socket_accept", "f_socket_bind_inet4", "f_socket_bind_inet6", @@ -23,8 +22,6 @@ extern "C" { "f_socket_disconnect", "f_socket_listen", "f_socket_read_stream", - "f_sockets_increase_by", - "f_statuss_increase_by", "f_string_append_nulless", "f_string_dynamic_append", "f_string_dynamic_append_nulless", diff --git a/sources/c/tacocat/main/common/print.h b/sources/c/tacocat/main/common/print.h index e5e92d4..338a0ba 100644 --- a/sources/c/tacocat/main/common/print.h +++ b/sources/c/tacocat/main/common/print.h @@ -42,11 +42,10 @@ extern "C" { kt_tacocat_f_f_console_parameter_process_e, kt_tacocat_f_f_file_open_e, kt_tacocat_f_f_fss_simple_packet_identify_e, - kt_tacocat_f_f_fss_simple_packet_ranges_increase_by_e, kt_tacocat_f_f_memory_array_increase_by_e, + kt_tacocat_f_f_memory_array_resize_e, kt_tacocat_f_f_network_from_ip_name_e, kt_tacocat_f_f_network_is_ip_address_e, - kt_tacocat_f_f_polls_increase_by_e, kt_tacocat_f_f_socket_accept_e, kt_tacocat_f_f_socket_bind_inet4_e, kt_tacocat_f_f_socket_bind_inet6_e, @@ -56,8 +55,6 @@ extern "C" { kt_tacocat_f_f_socket_disconnect_e, kt_tacocat_f_f_socket_listen_e, kt_tacocat_f_f_socket_read_stream_e, - kt_tacocat_f_f_sockets_increase_by_e, - kt_tacocat_f_f_statuss_increase_by_e, kt_tacocat_f_f_string_append_nulless_e, kt_tacocat_f_f_string_dynamic_append_e, kt_tacocat_f_f_string_dynamic_append_nulless_e, diff --git a/sources/c/tacocat/main/common/type.c b/sources/c/tacocat/main/common/type.c index 5334b06..30adbcb 100644 --- a/sources/c/tacocat/main/common/type.c +++ b/sources/c/tacocat/main/common/type.c @@ -40,13 +40,13 @@ extern "C" { f_memory_array_resize(0, sizeof(uint16_t), (void **) &sets[i]->flags.array, &sets[i]->flags.used, &sets[i]->flags.size); f_memory_array_resize(0, sizeof(f_file_t), (void **) &sets[i]->files.array, &sets[i]->files.used, &sets[i]->files.size); - f_polls_resize(0, &sets[i]->polls); - f_sockets_resize(0, &sets[i]->sockets); - f_statuss_resize(0, &sets[i]->statuss); + f_memory_array_resize(0, sizeof(f_poll_t), (void **) &sets[i]->polls.array, &sets[i]->polls.used, &sets[i]->polls.size); + f_memory_array_resize(0, sizeof(f_socket_t), (void **) &sets[i]->sockets.array, &sets[i]->sockets.used, &sets[i]->sockets.size); + f_memory_array_resize(0, sizeof(f_status_t), (void **) &sets[i]->statuss.array, &sets[i]->statuss.used, &sets[i]->statuss.size); f_string_dynamics_resize(0, &sets[i]->names); f_string_dynamics_resize(0, &sets[i]->buffers); - f_fss_simple_packet_ranges_resize(0, &sets[i]->packets); + f_memory_array_resize(0, sizeof(f_fss_simple_packet_range_t), (void **) &sets[i]->packets.array, &sets[i]->packets.used, &sets[i]->packets.size); } // for } -- 1.8.3.1