]> Kevux Git Server - kevux-tools/commitdiff
Update: Syncrhonize with latest FLL API changes.
authorKevin Day <thekevinday@gmail.com>
Sat, 19 Aug 2023 04:32:42 +0000 (23:32 -0500)
committerKevin Day <thekevinday@gmail.com>
Sat, 19 Aug 2023 04:32:42 +0000 (23:32 -0500)
sources/c/remove/main/common.c
sources/c/remove/main/common/print.c
sources/c/remove/main/common/print.h
sources/c/remove/main/common/type.c
sources/c/tacocat/main/common.c
sources/c/tacocat/main/common/print.c
sources/c/tacocat/main/common/print.h
sources/c/tacocat/main/common/type.c

index f6f9cd120b332badc257eb089a157c4d9aa3e96a..2a8f6bf7864c82c5e2e0900d8e9aa34d19dbed08 100644 (file)
@@ -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;
       }
index b7195adfcddd9598470aca769d6e52db9effde5e..c68df2471d106ba7b8b6ab5906186a2b42c6c6a0 100644 (file)
@@ -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",
index 21e0dcf817ba5465e900903c3ac480aeceb84133..4137c967434572fad333a2ebbb44f7f09456d966 100644 (file)
@@ -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,
index cf1285cda5e371af1c9a913936e85c5a380a7b45..89b5217f5d4544849cd2fe6087142751c77a499f 100644 (file)
@@ -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);
 
index 2425f8b85ecc69346e8ae2067bb9fd0444117f02..fdd47eb5b4dc09f3125ff7f022da35ab911f79e7 100644 (file)
@@ -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) {
 
index bcf521dbb027e01396274e5521cf97d1bca63963..6704dac7d33b48bd69665b98b7c261515019e25a 100644 (file)
@@ -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",
index e5e92d4a43ce424853e6fe5c8bc3eccb46d51dc4..338a0ba02573ba22e903f3989eb49be3cc9d5f3b 100644 (file)
@@ -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,
index 5334b063d0b7ecef394a5d52b5dd2b19c6f1a06c..30adbcb36e69c72a6322bd875d07796441f0a069 100644 (file)
@@ -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
     }