]> Kevux Git Server - fll/commitdiff
Update: wrap some macros in functions and minor cleanups.
authorKevin Day <thekevinday@gmail.com>
Tue, 15 Dec 2020 17:47:00 +0000 (11:47 -0600)
committerKevin Day <thekevinday@gmail.com>
Tue, 15 Dec 2020 17:47:00 +0000 (11:47 -0600)
The macro design has its uses but to save compiled size provide functions that are essentially wrappers to the macros.
Macros can also be flakey and sensitive while being harder to debug.
The delete functions that wrap the macros use the delete_simple macro.

Make the fss_macro.h and its contents private.

When decreasing, instead of using "if (X - 1 > 0)..." use "if (X > 1)...".
This avoids performing a math operation when it could otherwise be avoided.

79 files changed:
build/level_1/settings
build/monolithic/settings
level_0/f_type/c/type_array.h
level_1/fl_fss/c/fss.h
level_1/fl_fss/c/fss_basic.c
level_1/fl_fss/c/fss_basic.h
level_1/fl_fss/c/fss_basic_list.c
level_1/fl_fss/c/fss_basic_list.h
level_1/fl_fss/c/fss_embedded_list.c
level_1/fl_fss/c/fss_embedded_list.h
level_1/fl_fss/c/fss_extended.c
level_1/fl_fss/c/fss_extended.h
level_1/fl_fss/c/fss_extended_list.c
level_1/fl_fss/c/fss_extended_list.h
level_1/fl_fss/c/private-fss.c
level_1/fl_fss/c/private-fss.h
level_1/fl_fss/c/private-fss_macro.h [moved from level_1/fl_fss/c/fss_macro.h with 67% similarity]
level_1/fl_fss/data/build/settings
level_1/fl_string/c/private-string.c
level_1/fl_string/c/private-string.h
level_1/fl_string/c/string.c
level_1/fl_string/c/string.h
level_1/fl_type/c/private-type.c [new file with mode: 0644]
level_1/fl_type/c/private-type.h [new file with mode: 0644]
level_1/fl_type/c/type.c
level_1/fl_type/c/type.h
level_1/fl_type/data/build/settings
level_2/fll_execute/c/execute.c
level_2/fll_execute/c/execute.h
level_2/fll_execute/c/private-execute.c
level_2/fll_execute/c/private-execute.h
level_2/fll_fss/c/fss.c
level_2/fll_fss/c/fss.h
level_2/fll_fss/c/fss_basic.h
level_2/fll_fss/c/fss_basic_list.h
level_2/fll_fss/c/fss_embedded_list.h
level_2/fll_fss/c/fss_extended.h
level_2/fll_fss/c/fss_extended_list.h
level_2/fll_fss/c/fss_status.h
level_2/fll_program/c/program.c
level_3/controller/c/private-common.h
level_3/controller/c/private-controller.c
level_3/controller/c/private-controller.h
level_3/fake/c/fake.c
level_3/fake/c/private-build.c
level_3/fake/c/private-build.h
level_3/fake/c/private-fake.c
level_3/fake/c/private-fake.h
level_3/fake/c/private-make.c
level_3/fake/c/private-make.h
level_3/fake/c/private-skeleton.c
level_3/firewall/c/firewall.c
level_3/firewall/c/private-firewall.c
level_3/fss_basic_list_read/c/fss_basic_list_read.c
level_3/fss_basic_list_read/c/private-fss_basic_list_read.c
level_3/fss_basic_list_write/c/fss_basic_list_write.c
level_3/fss_basic_list_write/c/private-fss_basic_list_write.c
level_3/fss_basic_read/c/fss_basic_read.c
level_3/fss_basic_read/c/private-fss_basic_read.c
level_3/fss_basic_write/c/fss_basic_write.c
level_3/fss_basic_write/c/private-fss_basic_write.c
level_3/fss_embedded_list_read/c/fss_embedded_list_read.c
level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c
level_3/fss_embedded_list_write/c/fss_embedded_list_write.c
level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c
level_3/fss_extended_list_read/c/fss_extended_list_read.c
level_3/fss_extended_list_read/c/private-fss_extended_list_read.c
level_3/fss_extended_list_write/c/fss_extended_list_write.c
level_3/fss_extended_list_write/c/private-fss_extended_list_write.c
level_3/fss_extended_read/c/fss_extended_read.c
level_3/fss_extended_read/c/private-fss_extended_read.c
level_3/fss_extended_write/c/fss_extended_write.c
level_3/fss_extended_write/c/private-fss_extended_write.c
level_3/iki_read/c/iki_read.c
level_3/iki_read/c/private-iki_read.c
level_3/iki_write/c/iki_write.c
level_3/iki_write/c/private-iki_write.c
level_3/init/c/init.c
level_3/init/c/private-init.c

index 15067182b8ea73f77893579bcd5187ebbeac4ff5..730ed90a5702dd9377da56f15ad48ab152911894 100644 (file)
@@ -20,9 +20,9 @@ build_indexer ar
 build_language c
 build_libraries -lc
 build_libraries-level -lfll_0
-build_sources_library color.c console.c conversion.c directory.c private-directory.c environment.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c iki.c print.c private-print.c status.c string.c private-string.c type.c utf.c private-utf.c utf_file.c private-utf_file.c
+build_sources_library color.c console.c conversion.c directory.c private-directory.c environment.c private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c iki.c print.c private-print.c status.c string.c private-string.c type.c private-type.c utf.c private-utf.c utf_file.c private-utf_file.c
 build_sources_program
-build_sources_headers color.h console.h conversion.h directory.h environment.h fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h iki.h print.h status.h string.h type.h utf.h utf_file.h
+build_sources_headers color.h console.h conversion.h directory.h environment.h fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_status.h iki.h print.h status.h string.h type.h utf.h utf_file.h
 build_sources_script
 build_sources_setting
 build_script yes
index 590ee7b9a892eacc28fb67ac7edb8743964f2e1f..95f8c489d8a8b06b3775cf583dd327827fefd395 100644 (file)
@@ -20,9 +20,9 @@ build_indexer ar
 build_language c
 build_libraries -lc
 build_libraries-monolithic
-build_sources_library level_0/account.c level_0/console.c level_0/conversion.c level_0/directory.c level_0/private-directory.c level_0/environment.c level_0/private-environment.c level_0/file.c level_0/private-file.c level_0/fss.c level_0/iki.c level_0/private-iki.c level_0/memory.c level_0/path.c level_0/private-path.c level_0/pipe.c level_0/print.c level_0/private-print.c level_0/process.c level_0/serialize.c level_0/private-serialize.c level_0/signal.c level_0/socket.c level_0/utf.c level_0/private-utf.c level_1/color.c level_1/console.c level_1/conversion.c level_1/directory.c level_1/private-directory.c level_1/environment.c level_1/private-fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_embedded_list.c level_1/fss_extended.c level_1/fss_extended_list.c level_1/iki.c level_1/print.c level_1/private-print.c level_1/status.c level_1/string.c level_1/private-string.c level_1/type.c level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c level_2/error.c level_2/private-error.c level_2/execute.c level_2/private-execute.c level_2/file.c level_2/private-file.c level_2/fss.c level_2/private-fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_embedded_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_status.c level_2/iki.c level_2/private-iki.c level_2/path.c level_2/program.c level_2/status.c
+build_sources_library level_0/account.c level_0/console.c level_0/conversion.c level_0/directory.c level_0/private-directory.c level_0/environment.c level_0/private-environment.c level_0/file.c level_0/private-file.c level_0/fss.c level_0/iki.c level_0/private-iki.c level_0/memory.c level_0/path.c level_0/private-path.c level_0/pipe.c level_0/print.c level_0/private-print.c level_0/process.c level_0/serialize.c level_0/private-serialize.c level_0/signal.c level_0/socket.c level_0/utf.c level_0/private-utf.c level_1/color.c level_1/console.c level_1/conversion.c level_1/directory.c level_1/private-directory.c level_1/environment.c level_1/private-fss.c level_1/fss_basic.c level_1/fss_basic_list.c level_1/fss_embedded_list.c level_1/fss_extended.c level_1/fss_extended_list.c level_1/iki.c level_1/print.c level_1/private-print.c level_1/status.c level_1/string.c level_1/private-string.c level_1/type.c level_1/private-type.c level_1/utf.c level_1/private-utf.c level_1/utf_file.c level_1/private-utf_file.c level_2/error.c level_2/private-error.c level_2/execute.c level_2/private-execute.c level_2/file.c level_2/private-file.c level_2/fss.c level_2/private-fss.c level_2/fss_basic.c level_2/fss_basic_list.c level_2/fss_embedded_list.c level_2/fss_extended.c level_2/fss_extended_list.c level_2/fss_status.c level_2/iki.c level_2/private-iki.c level_2/path.c level_2/program.c level_2/status.c
 build_sources_program
-build_sources_headers level_0/account.h level_0/account-common.h level_0/color.h level_0/console.h level_0/console-common.h level_0/conversion.h level_0/conversion-common.h level_0/directory.h level_0/directory_type.h level_0/directory-common.h level_0/environment.h level_0/environment-common.h level_0/execute.h level_0/execute-common.h level_0/file.h level_0/file-common.h level_0/fss.h level_0/fss-common.h level_0/fss_comment.h level_0/fss_delimit.h level_0/fss_named.h level_0/fss_nest.h level_0/fss_quote.h level_0/fss_set.h level_0/iki.h level_0/iki-common.h level_0/memory.h level_0/memory_structure.h level_0/path.h level_0/path-common.h level_0/pipe.h level_0/print.h level_0/process.h level_0/process-common.h level_0/serialize.h level_0/serialize-common.h level_0/signal.h level_0/signal-common.h level_0/socket.h level_0/socket-common.h level_0/status.h level_0/status_array.h level_0/string.h level_0/string-common.h level_0/string_dynamic.h level_0/string_map.h level_0/string_quantity.h level_0/string_range.h level_0/string_triple.h level_0/type.h level_0/type_array.h level_0/utf.h level_0/utf-common.h level_1/color.h level_1/console.h level_1/conversion.h level_1/directory.h level_1/environment.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_embedded_list.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/fss_macro.h level_1/fss_status.h level_1/iki.h level_1/print.h level_1/status.h level_1/string.h level_1/type.h level_1/utf.h level_1/utf_file.h level_2/error.h level_2/error-common.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_embedded_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_status.h level_2/iki.h level_2/path.h level_2/program.h level_2/status.h
+build_sources_headers level_0/account.h level_0/account-common.h level_0/color.h level_0/console.h level_0/console-common.h level_0/conversion.h level_0/conversion-common.h level_0/directory.h level_0/directory_type.h level_0/directory-common.h level_0/environment.h level_0/environment-common.h level_0/execute.h level_0/execute-common.h level_0/file.h level_0/file-common.h level_0/fss.h level_0/fss-common.h level_0/fss_comment.h level_0/fss_delimit.h level_0/fss_named.h level_0/fss_nest.h level_0/fss_quote.h level_0/fss_set.h level_0/iki.h level_0/iki-common.h level_0/memory.h level_0/memory_structure.h level_0/path.h level_0/path-common.h level_0/pipe.h level_0/print.h level_0/process.h level_0/process-common.h level_0/serialize.h level_0/serialize-common.h level_0/signal.h level_0/signal-common.h level_0/socket.h level_0/socket-common.h level_0/status.h level_0/status_array.h level_0/string.h level_0/string-common.h level_0/string_dynamic.h level_0/string_map.h level_0/string_quantity.h level_0/string_range.h level_0/string_triple.h level_0/type.h level_0/type_array.h level_0/utf.h level_0/utf-common.h level_1/color.h level_1/console.h level_1/conversion.h level_1/directory.h level_1/environment.h level_1/fss.h level_1/fss_basic.h level_1/fss_basic_list.h level_1/fss_embedded_list.h level_1/fss_extended.h level_1/fss_extended_list.h level_1/fss_status.h level_1/iki.h level_1/print.h level_1/status.h level_1/string.h level_1/type.h level_1/utf.h level_1/utf_file.h level_2/error.h level_2/error-common.h level_2/execute.h level_2/file.h level_2/fss.h level_2/fss_basic.h level_2/fss_basic_list.h level_2/fss_embedded_list.h level_2/fss_extended.h level_2/fss_extended_list.h level_2/fss_status.h level_2/iki.h level_2/path.h level_2/program.h level_2/status.h
 build_sources_script
 build_sources_setting
 build_script yes
index 9fec7241d8bf8a625c2073ec256ab425eb228685..8b178bafefa72d0e3ccf46b6ec6c1d13fcf61cec 100644 (file)
@@ -99,18 +99,18 @@ extern "C" {
 
   #define f_cells_t_initialize {0, 0, 0}
 
-  #define f_macro_cells_t_clear(ranges) f_macro_memory_structure_t_clear(ranges)
+  #define f_macro_cells_t_clear(cells) f_macro_memory_structure_t_clear(cells)
 
-  #define f_macro_cells_t_new(status, ranges, length) f_macro_memory_structure_t_new(status, ranges, f_cell_t, length)
+  #define f_macro_cells_t_new(status, cells, length) f_macro_memory_structure_t_new(status, cells, f_cell_t, length)
 
-  #define f_macro_cells_t_delete(status, ranges)  f_macro_memory_structure_t_delete(status, ranges, f_cell_t)
-  #define f_macro_cells_t_destroy(status, ranges) f_macro_memory_structure_t_destroy(status, ranges, f_cell_t)
+  #define f_macro_cells_t_delete(status, cells)  f_macro_memory_structure_t_delete(status, cells, f_cell_t)
+  #define f_macro_cells_t_destroy(status, cells) f_macro_memory_structure_t_destroy(status, cells, f_cell_t)
 
-  #define f_macro_cells_t_delete_simple(ranges)  f_macro_memory_structure_t_delete_simple(ranges, f_cell_t)
-  #define f_macro_cells_t_destroy_simple(ranges) f_macro_memory_structure_t_destroy_simple(ranges, f_cell_t)
+  #define f_macro_cells_t_delete_simple(cells)  f_macro_memory_structure_t_delete_simple(cells, f_cell_t)
+  #define f_macro_cells_t_destroy_simple(cells) f_macro_memory_structure_t_destroy_simple(cells, f_cell_t)
 
-  #define f_macro_cells_t_resize(status, ranges, new_length) f_macro_memory_structure_t_resize(status, ranges, f_cell_t, new_length)
-  #define f_macro_cells_t_adjust(status, ranges, new_length) f_macro_memory_structure_t_adjust(status, ranges, f_cell_t, new_length)
+  #define f_macro_cells_t_resize(status, cells, new_length) f_macro_memory_structure_t_resize(status, cells, f_cell_t, new_length)
+  #define f_macro_cells_t_adjust(status, cells, new_length) f_macro_memory_structure_t_adjust(status, cells, f_cell_t, new_length)
 #endif // _di_f_cells_t_
 
 /**
index 18a867c5729232f6cec66c6de04078da4b3f4c45..25c795222e0ac471929bfeb997f2e8a8eb914a69 100644 (file)
@@ -23,7 +23,6 @@
 
 // fll-1 includes
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
index 28f73f270ada6659b92bcdb631fabc0329012a37..b6718ca3e675e67fd4afb6a068c4e3865bce755a 100644 (file)
@@ -1,5 +1,6 @@
 #include "fss_basic.h"
 #include "private-fss.h"
+#include "private-fss_macro.h"
 
 #ifdef __cplusplus
 extern "C" {
index d3fedfa9efdf6b45d2a3de3d027ed462c6c5bbd1..10f16199ff9ce25f0fa4ac802bce8f75cf726b6c 100644 (file)
@@ -25,7 +25,6 @@
 // fll-1 includes
 #include <level_1/fss.h>
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
index 93cd65218bb79d334f9f477956624b17e1d29663..a091800a737ecff4712a55f39a7a7f94aba6fc79 100644 (file)
@@ -1,5 +1,6 @@
 #include "fss_basic.h"
 #include "private-fss.h"
+#include "private-fss_macro.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -82,7 +83,7 @@ extern "C" {
           slash_count++;
         } // for
 
-        fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+        private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
         if (buffer.string[range->start] == f_fss_basic_list_open) {
           graph_first = F_false;
@@ -104,7 +105,7 @@ extern "C" {
             if (F_status_is_error(status)) break;
           } // while
 
-          fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+          private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
           if (buffer.string[range->start] == f_fss_eol) {
             start = range->start;
@@ -180,7 +181,7 @@ extern "C" {
           if (F_status_is_error(status)) break;
         } // while
 
-        fl_macro_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
+        private_fl_macro_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
 
         if (buffer.string[range->start] == f_fss_eol) {
           found->stop = stop;
@@ -244,7 +245,7 @@ extern "C" {
     f_status_t status = f_fss_skip_past_delimit(buffer, range);
     if (F_status_is_error(status)) return status;
 
-    fl_macro_fss_content_with_comments_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, F_none_eos, F_none_stop);
+    private_fl_macro_fss_content_with_comments_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, F_none_eos, F_none_stop);
 
     status = private_fl_fss_ranges_increase(found);
     if (F_status_is_error(status)) return status;
@@ -455,7 +456,7 @@ extern "C" {
 
     found->array[found->used++].stop = range->start - 1;
 
-    fl_macro_fss_content_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
+    private_fl_macro_fss_content_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
 
     return FL_fss_found_content;
   }
index dfe409f7b0b69c03e043ade356c223c572b81e3c..0f8ff160f175c9925eb2e3eb6458ef5981612a51 100644 (file)
@@ -26,7 +26,6 @@
 #include <level_1/fss.h>
 #include <level_1/fss_basic.h>
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
index 67aa7a1657d02818243cc30c96532e007bca2411..8bcc22a4bc1b7593f8d90d2475f38c26c77b80fc 100644 (file)
@@ -1,5 +1,6 @@
 #include "fss_embedded_list.h"
 #include "private-fss.h"
+#include "private-fss_macro.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -96,7 +97,7 @@ extern "C" {
 
         if (F_status_is_error(status)) break;
 
-        fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+        private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
         if (buffer.string[range->start] == f_fss_embedded_list_open) {
           graph_first = F_false;
@@ -116,7 +117,7 @@ extern "C" {
             if (F_status_is_error(status)) break;
           } // while
 
-          fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+          private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
           if (buffer.string[range->start] == f_fss_eol) {
             start = range->start;
@@ -192,7 +193,7 @@ extern "C" {
 
         if (F_status_is_error(status)) break;
 
-        fl_macro_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
+        private_fl_macro_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
 
         if (buffer.string[range->start] == f_fss_eol) {
           found->stop = stop;
@@ -234,7 +235,7 @@ extern "C" {
       }
     } // while
 
-    fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+    private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
     status = f_utf_buffer_increment(buffer, range, 1);
 
@@ -278,7 +279,7 @@ extern "C" {
     f_macro_fss_objects_t_new(status, objects, f_fss_default_allocation_step);
 
     if (F_status_is_error(status)) {
-      f_macro_string_lengths_t_delete_simple(positions_start);
+      private_fl_fss_string_lengths_delete(&positions_start);
 
       return status;
     }
@@ -324,10 +325,10 @@ extern "C" {
         graph_first = 0x1;
 
         if (depth > 0) {
-          fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
         }
         else {
-          fl_macro_fss_nest_return_on_overflow_delimited((buffer), (*range), (*found), positions_start, objects, F_none_eos, F_none_stop);
+          private_fl_macro_fss_nest_return_on_overflow_delimited((buffer), (*range), (*found), positions_start, objects, F_none_eos, F_none_stop);
         }
 
         line_start = range->start;
@@ -358,10 +359,10 @@ extern "C" {
         if (F_status_is_error(status)) break;
 
         if (depth > 0) {
-          fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
         }
         else {
-          fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
         }
 
         // All slashes for an open are delimited (because it could represent a slash in the object name).
@@ -425,10 +426,10 @@ extern "C" {
           if (F_status_is_error(status)) break;
 
           if (depth > 0) {
-            fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
           }
           else {
-            fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
           }
 
           // this is a valid object open/close that has been delimited, save the slash delimit positions.
@@ -531,10 +532,10 @@ extern "C" {
         if (F_status_is_error(status)) break;
 
         if (depth > 0) {
-          fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
         }
         else {
-          fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
         }
 
         if (buffer.string[range->start] == f_fss_eol) {
@@ -602,10 +603,10 @@ extern "C" {
           if (F_status_is_error(status)) break;
 
           if (depth > 0) {
-            fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
           }
           else {
-            fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
           }
         }
       }
@@ -636,10 +637,10 @@ extern "C" {
         if (F_status_is_error(status)) break;
 
         if (depth > 0) {
-          fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
+          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop);
         }
         else {
-          fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
+          private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop);
         }
 
         if (buffer.string[range->start] == f_fss_eol) {
@@ -693,10 +694,10 @@ extern "C" {
             status = f_utf_buffer_increment(buffer, range, 1);
             if (F_status_is_error(status)) break;
 
-            fl_macro_fss_nest_return_on_overflow_delimited((buffer), (*range), (*found), positions_start, objects, F_none_eos, F_none_stop)
+            private_fl_macro_fss_nest_return_on_overflow_delimited((buffer), (*range), (*found), positions_start, objects, F_none_eos, F_none_stop)
 
-            f_macro_string_lengths_t_delete_simple(positions_start);
-            f_macro_fss_objects_t_delete_simple(objects);
+            private_fl_fss_string_lengths_delete(&positions_start);
+            private_fl_fss_objects_delete(&objects);
 
             return FL_fss_found_content;
           }
@@ -731,10 +732,10 @@ extern "C" {
           if (F_status_is_error(status)) break;
 
           if (depth > 0) {
-            fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop)
+            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_terminated_not_nest_eos, F_terminated_not_nest_stop)
           }
           else {
-            fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop)
+            private_fl_macro_fss_nest_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, positions_start, objects, F_data_not_eos, F_data_not_stop)
           }
         }
       }
@@ -794,8 +795,8 @@ extern "C" {
       if (F_status_is_error(status)) break;
     } // while
 
-    f_macro_string_lengths_t_delete_simple(positions_start);
-    f_macro_fss_objects_t_delete_simple(objects);
+    private_fl_fss_string_lengths_delete(&positions_start);
+    private_fl_fss_objects_delete(&objects);
 
     delimits->used = delimits_used;
     comments->used = comments_used;
index d17889269e67c698cc0da1bc02244cb9d5d83294..09416a9dc9ed9d51d83c5a4a92a953039a927ddd 100644 (file)
@@ -26,7 +26,6 @@
 #include <level_1/fss.h>
 #include <level_1/fss_basic.h>
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
index 8d8bee6f9a8b0975c0305d88c43087a92192e23e..5809d99c0ecf1bcf9585f0586544e65714d52f89 100644 (file)
@@ -1,5 +1,6 @@
 #include "fss_extended.h"
 #include "private-fss.h"
+#include "private-fss_macro.h"
 
 #ifdef __cplusplus
 extern "C" {
index 1b9d02aa7a87c78bedb26fc17080c6aa9bd424b6..947106610c6b7745a1d0bbbc4bc317c0943d2244 100644 (file)
@@ -25,7 +25,6 @@
 // fll-1 includes
 #include <level_1/fss.h>
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
index 6cec9fdea014326c4b1f64bad85838f782b2ccfb..3373dbb09b678f72306e0e2467e25056623b5af6 100644 (file)
@@ -1,5 +1,6 @@
 #include "fss_extended_list.h"
 #include "private-fss.h"
+#include "private-fss_macro.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -96,7 +97,7 @@ extern "C" {
 
         if (F_status_is_error(status)) break;
 
-        fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+        private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
         if (buffer.string[range->start] == f_fss_extended_list_open) {
           graph_first = F_false;
@@ -116,7 +117,7 @@ extern "C" {
             if (F_status_is_error(status)) break;
           } // while
 
-          fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+          private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
           if (buffer.string[range->start] == f_fss_eol) {
             start = range->start;
@@ -192,7 +193,7 @@ extern "C" {
 
         if (F_status_is_error(status)) break;
 
-        fl_macro_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
+        private_fl_macro_fss_object_return_on_overflow_delimited((buffer), (*range), (*found), F_none_eos, F_none_stop);
 
         if (buffer.string[range->start] == f_fss_eol) {
           found->stop = stop;
@@ -234,7 +235,7 @@ extern "C" {
       }
     } // while
 
-    fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
+    private_fl_macro_fss_object_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, F_data_not_eos, F_data_not_stop);
 
     status = f_utf_buffer_increment(buffer, range, 1);
 
@@ -262,7 +263,7 @@ extern "C" {
     f_status_t status = f_fss_skip_past_delimit(buffer, range);
     if (F_status_is_error(status)) return status;
 
-    fl_macro_fss_content_with_comments_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, F_none_eos, F_none_stop);
+    private_fl_macro_fss_content_with_comments_return_on_overflow((buffer), (*range), (*found), (*delimits), delimits_used, (*comments), comments_used, F_none_eos, F_none_stop);
 
     status = private_fl_fss_ranges_increase(found);
     if (F_status_is_error(status)) return status;
index 86e2dd2bb21e092d27e4c2e0fa78885682672b9a..72bbe84500c7965c30c3a47f6c368466d4020e8e 100644 (file)
@@ -26,7 +26,6 @@
 #include <level_1/fss.h>
 #include <level_1/fss_basic.h>
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
index 6edb68662bae03147ff662714e5be2f093edfd79..abc5573ec9f5871892e3834937fe512f6180ea32 100644 (file)
@@ -1,5 +1,6 @@
 #include "fss.h"
 #include "private-fss.h"
+#include "private-fss_macro.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -1137,6 +1138,12 @@ extern "C" {
   }
 #endif // !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_)
 
+#if !defined(_di_fl_fss_embedded_list_content_read_)
+  void private_fl_fss_objects_delete(f_fss_objects_t *objects) {
+    f_macro_fss_objects_t_delete_simple((*objects));
+  }
+#endif // !defined(_di_fl_fss_embedded_list_content_read_)
+
 #if !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_basic_content_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) || !defined(_di_fl_fss_basic_list_object_read_) || !defined(_di_fl_fss_basic_list_content_read_) || !defined(_di_fl_fss_extended_list_object_read_) || !defined(_di_fl_fss_extended_list_content_read_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_)
   f_return_status private_fl_fss_ranges_increase(f_string_ranges_t *ranges) {
 
@@ -1162,6 +1169,12 @@ extern "C" {
   }
 #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_basic_content_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) || !defined(_di_fl_fss_basic_list_object_read_) || !defined(_di_fl_fss_basic_list_content_read_) || !defined(_di_fl_fss_extended_list_object_read_) || !defined(_di_fl_fss_extended_list_content_read_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_)
 
+#if !defined(_di_fl_fss_embedded_list_content_read_)
+  void private_fl_fss_string_lengths_delete(f_string_lengths_t *lengths) {
+    f_macro_string_lengths_t_delete_simple((*lengths));
+  }
+#endif // !defined(_di_fl_fss_embedded_list_content_read_)
+
 #ifdef __cplusplus
 } // extern "C"
 #endif
index a32e070a34393b42780fdb4e5ece492abe056721..df193fa2ea3e8e41cac5a45004f83baa8edfe84c 100644 (file)
@@ -337,6 +337,21 @@ extern "C" {
 #endif // !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_)
 
 /**
+ * Private implementation for deleting fss objects.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param objects
+ *   The objects to delete.
+ *
+ * @see f_macro_fss_objects_t_delete_simple()
+ * @see fl_fss_embedded_list_content_read()
+ */
+#if !defined(_di_fl_fss_embedded_list_content_read_)
+  extern void private_fl_fss_objects_delete(f_fss_objects_t *objects) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_fss_embedded_list_content_read_)
+
+/**
  * Increase the size of a given range buffer, but only if necessary.
  *
  * @param ranges
@@ -362,6 +377,21 @@ extern "C" {
   extern f_return_status private_fl_fss_ranges_increase(f_string_ranges_t *ranges) f_gcc_attribute_visibility_internal;
 #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_basic_content_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) || !defined(_di_fl_fss_basic_list_object_read_) || !defined(_di_fl_fss_basic_list_content_read_) || !defined(_di_fl_fss_extended_list_object_read_) || !defined(_di_fl_fss_extended_list_content_read_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_)
 
+/**
+ * Private implementation for deleting string lengths.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param lengths
+ *   The string lengths to delete.
+ *
+ * @see f_macro_string_lengths_t_delete_simple()
+ * @see fl_fss_embedded_list_content_read()
+ */
+#if !defined(_di_fl_fss_embedded_list_content_read_)
+  extern void private_fl_fss_string_lengths_delete(f_string_lengths_t *lengths) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_fss_embedded_list_content_read_)
+
 #ifdef __cplusplus
 } // extern "C"
 #endif
similarity index 67%
rename from level_1/fl_fss/c/fss_macro.h
rename to level_1/fl_fss/c/private-fss_macro.h
index b4a37d51d875c9ceb6f8cbd5bfd7315446c70727..ec4977ca54125d7554d66c0f8e6ad3e869944fb5 100644 (file)
@@ -7,15 +7,15 @@
  *
  * Provides generic functionality shared between and used by different fss processing functions.
  */
-#ifndef _FL_fss_macro_h
-#define _FL_fss_macro_h
+#ifndef _PRIVATE_FL_fss_macro_h
+#define _PRIVATE_FL_fss_macro_h
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifndef _di_fl_macro_fss_object_return_on_overflow_
-  #define fl_macro_fss_object_return_on_overflow(buffer, range, found, delimits, delimits_used, eos_status, stop_status) \
+  #define private_fl_macro_fss_object_return_on_overflow(buffer, range, found, delimits, delimits_used, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       delimits.used = delimits_used; \
       found.stop = buffer.used - 1; \
@@ -29,7 +29,7 @@ extern "C" {
 #endif // _di_fl_macro_fss_object_return_on_overflow_
 
 #ifndef _di_fl_macro_fss_object_return_on_overflow_delimited_
-  #define fl_macro_fss_object_return_on_overflow_delimited(buffer, range, found, eos_status, stop_status) \
+  #define private_fl_macro_fss_object_return_on_overflow_delimited(buffer, range, found, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       found.stop = buffer.used - 1; \
       return eos_status; \
@@ -41,7 +41,7 @@ extern "C" {
 #endif // _di_fl_macro_fss_object_return_on_overflow_delimited_
 
 #ifndef _di_fl_macro_fss_content_return_on_overflow_
-  #define fl_macro_fss_content_return_on_overflow(buffer, range, found, delimits, delimits_used, eos_status, stop_status) \
+  #define private_fl_macro_fss_content_return_on_overflow(buffer, range, found, delimits, delimits_used, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       delimits.used = delimits_used; \
       found.array[found.used].stop = buffer.used - 1; \
@@ -55,7 +55,7 @@ extern "C" {
 #endif // _di_fl_macro_fss_content_return_on_overflow_
 
 #ifndef _di_fl_macro_fss_content_with_comments_return_on_overflow_
-  #define fl_macro_fss_content_with_comments_return_on_overflow(buffer, range, found, delimits, delimits_used, comments, comments_used, eos_status, stop_status) \
+  #define private_fl_macro_fss_content_with_comments_return_on_overflow(buffer, range, found, delimits, delimits_used, comments, comments_used, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       delimits.used = delimits_used; \
       comments.used = comments_used; \
@@ -71,7 +71,7 @@ extern "C" {
 #endif // _di_fl_macro_fss_content_with_comments_return_on_overflow_
 
 #ifndef _di_fl_macro_fss_content_return_on_overflow_delimited_
-  #define fl_macro_fss_content_return_on_overflow_delimited(buffer, range, found, eos_status, stop_status) \
+  #define private_fl_macro_fss_content_return_on_overflow_delimited(buffer, range, found, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       found.array[found.used].stop = buffer.used - 1; \
       return eos_status; \
@@ -83,33 +83,33 @@ extern "C" {
 #endif // _di_fl_macro_fss_content_return_on_overflow_delimited_
 
 #ifndef _di_fl_macro_fss_nest_return_on_overflow_
-  #define fl_macro_fss_nest_return_on_overflow(buffer, range, found, delimits, delimits_used, comments, comments_used, positions, objects, eos_status, stop_status) \
+  #define private_fl_macro_fss_nest_return_on_overflow(buffer, range, found, delimits, delimits_used, comments, comments_used, positions, objects, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
       delimits.used = delimits_used; \
       comments.used = comments_used; \
-      f_macro_string_lengths_t_delete_simple(positions); \
-      f_macro_fss_objects_t_delete_simple(objects); \
+      private_fl_fss_string_lengths_delete(&positions); \
+      private_fl_fss_objects_delete(&objects); \
       return eos_status; \
     } \
     else if (range.start > range.stop) { \
       delimits.used = delimits_used; \
       comments.used = comments_used; \
-      f_macro_string_lengths_t_delete_simple(positions); \
-      f_macro_fss_objects_t_delete_simple(objects); \
+      private_fl_fss_string_lengths_delete(&positions); \
+      private_fl_fss_objects_delete(&objects); \
       return stop_status; \
     }
 #endif // _di_fl_macro_fss_nest_return_on_overflow_
 
 #ifndef _di_fl_macro_fss_nest_return_on_overflow_delimited_
-  #define fl_macro_fss_nest_return_on_overflow_delimited(buffer, range, found, positions, objects, eos_status, stop_status) \
+  #define private_fl_macro_fss_nest_return_on_overflow_delimited(buffer, range, found, positions, objects, eos_status, stop_status) \
     if (range.start >= buffer.used) { \
-      f_macro_string_lengths_t_delete_simple(positions); \
-      f_macro_fss_objects_t_delete_simple(objects); \
+      private_fl_fss_string_lengths_delete(&positions); \
+      private_fl_fss_objects_delete(&objects); \
       return eos_status; \
     } \
     else if (range.start > range.stop) { \
-      f_macro_string_lengths_t_delete_simple(positions); \
-      f_macro_fss_objects_t_delete_simple(objects); \
+      private_fl_fss_string_lengths_delete(&positions); \
+      private_fl_fss_objects_delete(&objects); \
       return stop_status; \
     }
 #endif // _di_fl_macro_fss_nest_return_on_overflow_delimited_
@@ -118,4 +118,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _FL_fss_macro_h
+#endif // _PRIVATE_FL_fss_macro_h
index 1bcef408c7687836c687851ac602fadaa3ff8f72..b77984900efc526c724deb95b6c7107a56c56632 100644 (file)
@@ -22,7 +22,7 @@ build_libraries -lc
 build_libraries-individual -lf_file -lf_fss -lf_memory -lf_utf
 build_sources_library private-fss.c fss_basic.c fss_basic_list.c fss_embedded_list.c fss_extended.c fss_extended_list.c
 build_sources_program
-build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_macro.h fss_status.h
+build_sources_headers fss.h fss_basic.h fss_basic_list.h fss_embedded_list.h fss_extended.h fss_extended_list.h fss_status.h
 build_sources_script
 build_sources_setting
 build_script yes
index 3db9a722985871f8d6b0ba8413943cd3c80507ce..21682eeb99143fada0c38109212fb7462573596e 100644 (file)
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#if !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_append_mash_) || !defined(_di_fl_string_dynamic_mash_)
+#if !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_dynamic_mash_) || !defined(_di_fl_string_mash_)
   f_return_status private_fl_string_append(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) {
     f_status_t status = F_none;
 
@@ -19,12 +19,14 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_append_mash_) || !defined(_di_fl_string_dynamic_mash_)
+#endif // !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_dynamic_mash_) || !defined(_di_fl_string_mash_)
 
-#if !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_mash_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_)
+#if !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_) || !defined(_di_fl_string_mash_nulless_)
   f_return_status private_fl_string_append_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) {
 
-    if (destination->used + length > f_string_length_t_size) return F_status_set_error(F_string_too_large);
+    if (destination->used + length > f_string_length_t_size) {
+      return F_status_set_error(F_string_too_large);
+    }
 
     f_status_t status = F_none;
 
@@ -69,7 +71,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_mash_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_)
+#endif // !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_) || !defined(_di_fl_string_mash_nulless_)
 
 #if !defined(_di_fl_string_compare_) || !defined(_di_fl_string_dynamic_compare_) || !defined(_di_fl_string_dynamic_partial_compare_)
   f_return_status private_fl_string_compare(const f_string_t string1, const f_string_t string2, const f_string_length_t offset1, const f_string_length_t offset2, const f_string_length_t stop1, const f_string_length_t stop2) {
@@ -173,6 +175,7 @@ extern "C" {
 
     uint8_t width = 0;
     uint8_t width_max = 0;
+
     f_status_t status = F_none;
 
     // skip past leading whitespace in string1.
@@ -522,6 +525,12 @@ extern "C" {
   }
 #endif // !defined(_di_fl_string_compare_trim_) || !defined(_di_fl_string_dynamic_compare_trim_) || !defined(_di_fl_string_dynamic_partial_compare_trim_)
 
+#if !defined(_di_fl_string_dynamic_decrease_) || !defined(_di_fl_string_dynamic_decrease_by_) || !defined(_di_fl_string_dynamic_delete_)
+  void private_fl_string_dynamic_delete(f_string_dynamic_t *string) {
+    f_macro_string_dynamic_t_delete_simple((*string));
+  }
+#endif // !defined(_di_fl_string_dynamic_decrease_) || !defined(_di_fl_string_dynamic_decrease_by_) || !defined(_di_fl_string_dynamic_delete_)
+
 #if !defined(_di_fl_string_dynamic_increase_by_) || !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_append_mash_) || !defined(_di_fl_string_dynamic_mash_) || !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_mash_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_) || !defined(_di_fl_string_prepend_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_)
   f_return_status private_fl_string_dynamic_increase_by(const f_string_length_t amount, f_string_dynamic_t *string) {
 
@@ -530,28 +539,80 @@ extern "C" {
         return F_status_set_error(F_string_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_string_dynamic_t_resize(status, (*string), string->used + amount);
-
-      return status;
+      return private_fl_string_dynamic_resize(string->used + amount, string);
     }
 
     return F_none;
   }
 #endif // !defined(_di_fl_string_dynamic_increase_by_) || !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_append_mash_) || !defined(_di_fl_string_dynamic_mash_) || !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_mash_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_) || !defined(_di_fl_string_prepend_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_)
 
-#if !defined(_di_fl_string_prepend_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_append_mish_) || !defined(_di_fl_string_dynamic_mish_)
+#if !defined(_di_fl_string_dynamic_decrease_) || !defined(_di_fl_string_dynamic_decrease_by_) || !defined(_di_fl_string_dynamic_increase_) || !defined(_di_fl_string_dynamic_increase_by_) || !defined(_di_fl_string_dynamic_terminate_) || !defined(_di_fl_string_dynamic_terminate_after_)
+  f_return_status private_fl_string_dynamic_resize(const f_string_length_t length, f_string_dynamic_t *string) {
+    f_status_t status = F_none;
+
+    f_macro_string_dynamic_t_resize(status, (*string), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_string_dynamic_decrease_) || !defined(_di_fl_string_dynamic_decrease_by_) || !defined(_di_fl_string_dynamic_increase_) || !defined(_di_fl_string_dynamic_increase_by_) || !defined(_di_fl_string_dynamic_terminate_) || !defined(_di_fl_string_dynamic_terminate_after_)
+
+#if !defined(_di_fl_string_dynamics_decrease_) || !defined(_di_fl_string_dynamics_decrease_by_) || !defined(_di_fl_string_dynamics_delete_)
+  void private_fl_string_dynamics_delete(f_string_dynamics_t *string) {
+    f_macro_string_dynamics_t_delete_simple((*string));
+  }
+#endif // !defined(_di_fl_string_dynamics_decrease_) || !defined(_di_fl_string_dynamics_decrease_by_) || !defined(_di_fl_string_dynamics_delete_)
+
+#if !defined(_di_fl_string_dynamics_decrease_) || !defined(_di_fl_string_dynamics_decrease_by_) || !defined(_di_fl_string_dynamics_increase_) || !defined(_di_fl_string_dynamics_increase_by_) || !defined(_di_fl_string_dynamics_terminate_) || !defined(_di_fl_string_dynamics_terminate_after_)
+  f_return_status private_fl_string_dynamics_resize(const f_string_length_t length, f_string_dynamics_t *strings) {
+    f_status_t status = F_none;
+
+    f_macro_string_dynamics_t_resize(status, (*strings), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_string_dynamics_decrease_) || !defined(_di_fl_string_dynamics_decrease_by_) || !defined(_di_fl_string_dynamics_increase_) || !defined(_di_fl_string_dynamics_increase_by_) || !defined(_di_fl_string_dynamics_terminate_) || !defined(_di_fl_string_dynamics_terminate_after_)
+
+#if !defined(_di_fl_string_lengths_decrease_) || !defined(_di_fl_string_lengths_decrease_by_) || !defined(_di_fl_string_lengths_delete_)
+  void private_fl_string_lengths_delete(f_string_lengths_t *lengths) {
+    f_macro_string_lengths_t_delete_simple((*lengths));
+  }
+#endif // !defined(_di_fl_string_lengths_decrease_) || !defined(_di_fl_string_lengths_decrease_by_) || !defined(_di_fl_string_lengths_delete_)
+
+#if !defined(_di_fl_string_lengths_decrease_) || !defined(_di_fl_string_lengths_decrease_by_) || !defined(_di_fl_string_lengths_increase_) || !defined(_di_fl_string_lengths_increase_by_) || !defined(_di_fl_string_lengths_terminate_) || !defined(_di_fl_string_lengths_terminate_after_)
+  f_return_status private_fl_string_lengths_resize(const f_string_length_t length, f_string_lengths_t *lengths) {
+    f_status_t status = F_none;
+
+    f_macro_string_lengths_t_resize(status, (*lengths), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_string_lengths_decrease_) || !defined(_di_fl_string_lengths_decrease_by_) || !defined(_di_fl_string_lengths_increase_) || !defined(_di_fl_string_lengths_increase_by_) || !defined(_di_fl_string_lengths_terminate_) || !defined(_di_fl_string_lengths_terminate_after_)
+
+#if !defined(fl_string_maps_decrease) || !defined(fl_string_maps_decrease_by) || !defined(_di_fl_string_maps_delete_)
+  void private_fl_string_maps_delete(f_string_maps_t *maps) {
+    f_macro_string_maps_t_delete_simple((*maps));
+  }
+#endif // !defined(fl_string_maps_decrease) || !defined(fl_string_maps_decrease_by) || !defined(_di_fl_string_maps_delete_)
+
+#if !defined(_di_fl_string_maps_decrease_) || !defined(_di_fl_string_maps_decrease_by_) || !defined(_di_fl_string_maps_increase_) || !defined(_di_fl_string_maps_increase_by_) || !defined(_di_fl_string_maps_terminate_) || !defined(_di_fl_string_maps_terminate_after_)
+  f_return_status private_fl_string_maps_resize(const f_string_length_t length, f_string_maps_t *maps) {
+    f_status_t status = F_none;
+
+    f_macro_string_maps_t_resize(status, (*maps), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_string_maps_decrease_) || !defined(_di_fl_string_maps_decrease_by_) || !defined(_di_fl_string_maps_increase_) || !defined(_di_fl_string_maps_increase_by_) || !defined(_di_fl_string_maps_terminate_) || !defined(_di_fl_string_maps_terminate_after_)
+
+#if !defined(_di_fl_string_dynamic_mish_) || !defined(_di_fl_string_dynamic_partial_mish_) || !defined(_di_fl_string_dynamic_partial_prepend_assure_) || !defined(_di_fl_string_dynamic_partial_prepend_) || !defined(_di_fl_string_dynamic_prepend_assure_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_mish_) || !defined(_di_fl_string_prepend_assure_) || !defined(_di_fl_string_prepend_)
   f_return_status private_fl_string_prepend(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) {
 
     if (destination->used + length > f_string_length_t_size) {
       return F_status_set_error(F_string_too_large);
     }
 
-    f_status_t status = F_none;
-
     if (destination->used + length > destination->size) {
-      status = private_fl_string_dynamic_increase_by(length, destination);
+      const f_status_t status = private_fl_string_dynamic_increase_by(length, destination);
       if (F_status_is_error(status)) return status;
     }
 
@@ -566,9 +627,9 @@ extern "C" {
     destination->used = destination->used + length;
     return F_none;
   }
-#endif // !defined(_di_fl_string_prepend_) || !defined(_di_fl_string_dynamic_prepend_)
+#endif // !defined(_di_fl_string_dynamic_mish_) || !defined(_di_fl_string_dynamic_partial_mish_) || !defined(_di_fl_string_dynamic_partial_prepend_assure_) || !defined(_di_fl_string_dynamic_partial_prepend_) || !defined(_di_fl_string_dynamic_prepend_assure_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_mish_) || !defined(_di_fl_string_prepend_assure_) || !defined(_di_fl_string_prepend_)
 
-#if !defined(_di_fl_string_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_)
+#if !defined(_di_fl_string_dynamic_mish_nulless_) || !defined(_di_fl_string_dynamic_partial_mish_nulless_) || !defined(_di_fl_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_fl_string_dynamic_partial_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_assure_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_) || !defined(_di_fl_string_mish_nulless_) || !defined(_di_fl_string_prepend_assure_nulless_) || !defined(_di_fl_string_prepend_nulless_)
   f_return_status private_fl_string_prepend_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) {
 
     if (destination->used + length > f_string_length_t_size) {
@@ -632,7 +693,7 @@ extern "C" {
 
     return F_none;
   }
-#endif // !defined(_di_fl_string_prepend_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_append_mish_) || !defined(_di_fl_string_dynamic_mish_)
+#endif // !defined(_di_fl_string_dynamic_mish_nulless_) || !defined(_di_fl_string_dynamic_partial_mish_nulless_) || !defined(_di_fl_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_fl_string_dynamic_partial_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_assure_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_) || !defined(_di_fl_string_mish_nulless_) || !defined(_di_fl_string_prepend_assure_nulless_) || !defined(_di_fl_string_prepend_nulless_)
 
 #if !defined(_di_fl_string_rip_) || !defined(_di_fl_string_dynamic_rip_) || !defined(_di_fl_string_rip_nulless_) || !defined(_di_fl_string_dynamic_rip_nulless_)
   f_return_status private_fl_string_rip_find_range(const f_string_t source, f_string_length_t *start, f_string_length_t *stop) {
index cbe08d709fdee4f2205847bcbc27b0afaa013b93..c40697da8688e976ae1f022b3dcd863b30460f4f 100644 (file)
@@ -35,14 +35,22 @@ extern "C" {
  *   F_parameter (with error bit) if a parameter is invalid.
  *   F_string_too_large (with error bit) if the combined string is too large.
  *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *
+ * @see memcpy()
+ *
+ * @see f_macro_string_dynamic_t_resize()
  * @see fl_string_append()
- * @see fl_string_mash()
  * @see fl_string_dynamic_append()
  * @see fl_string_dynamic_mash()
+ * @see fl_string_mash()
  */
-#if !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_append_mash_) || !defined(_di_fl_string_dynamic_mash_)
+#if !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_dynamic_mash_) || !defined(_di_fl_string_mash_)
   extern f_return_status private_fl_string_append(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal;
-#endif // !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_append_mash_) || !defined(_di_fl_string_dynamic_mash_)
+#endif // !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_dynamic_mash_) || !defined(_di_fl_string_mash_)
 
 /**
  * Private implementation of fl_string_append_nulless().
@@ -58,20 +66,20 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_data_not if source length is 0.
- *   F_memory_allocation (with error bit) on memory allocation error.
- *   F_memory_reallocation (with error bit) on memory reallocation error.
- *   F_parameter (with error bit) if a parameter is invalid.
- *   F_string_too_large (with error bit) if the combined string is too large.
  *
+ *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *
+ * @see memcpy()
+ *
+ * @see f_macro_string_dynamic_t_resize()
  * @see fl_string_append_nulless()
- * @see fl_string_mash_nulless()
  * @see fl_string_dynamic_append_nulless()
  * @see fl_string_dynamic_mash_nulless()
+ * @see fl_string_mash_nulless()
  */
-#if !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_mash_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_)
+#if !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_) || !defined(_di_fl_string_mash_nulless_)
   extern f_return_status private_fl_string_append_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal;
-#endif // !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_mash_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_)
+#endif // !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_) || !defined(_di_fl_string_mash_nulless_)
 
 /**
  * Private implementation of fl_string_compare().
@@ -94,7 +102,6 @@ extern "C" {
  * @return
  *   F_equal_to when both strings equal.
  *   F_equal_to_not when both strings do not equal.
- *   F_parameter (with error bit) if a parameter is invalid.
  *
  * @see fl_string_compare()
  * @see fl_string_dynamic_compare()
@@ -131,7 +138,6 @@ extern "C" {
  * @return
  *   F_equal_to when both strings equal.
  *   F_equal_to_not when both strings do not equal.
- *   F_parameter (with error bit) if a parameter is invalid.
  *
  * @see fl_string_compare_except()
  * @see fl_string_dynamic_compare_except()
@@ -168,10 +174,11 @@ extern "C" {
  * @return
  *   F_equal_to when both strings equal.
  *   F_equal_to_not when both strings do not equal.
- *   F_parameter (with error bit) if a parameter is invalid.
+ *   F_utf (with error bit) if a character is not valid UTF-8.
  *
  *   Errors (with error bit) from: f_utf_is_whitespace().
  *
+ * @see f_utf_is_whitespace()
  * @see fl_string_compare_except_trim()
  * @see fl_string_dynamic_compare_except_trim()
  * @see fl_string_dynamic_partial_compare_except_trim()
@@ -201,10 +208,11 @@ extern "C" {
  * @return
  *   F_equal_to when both strings equal.
  *   F_equal_to_not when both strings do not equal.
- *   F_parameter (with error bit) if a parameter is invalid.
+ *   F_utf (with error bit) if a character is not valid UTF-8.
  *
  *   Errors (with error bit) from: f_utf_is_whitespace().
  *
+ * @see f_utf_is_whitespace()
  * @see fl_string_compare_trim()
  * @see fl_string_dynamic_compare_trim()
  * @see fl_string_dynamic_partial_compare_trim()
@@ -214,6 +222,22 @@ extern "C" {
 #endif // !defined(_di_fl_string_compare_trim_) || !defined(_di_fl_string_dynamic_compare_trim_) || !defined(_di_fl_string_dynamic_partial_compare_trim_)
 
 /**
+ * Private implementation of fl_string_dynamic_delete().
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param string
+ *   The string to delete.
+ *
+ * @see fl_string_dynamic_decrease()
+ * @see fl_string_dynamic_decrease_by()
+ * @see fl_string_dynamic_delete()
+ */
+#if !defined(_di_fl_string_dynamic_decrease_) || !defined(_di_fl_string_dynamic_decrease_by_) || !defined(_di_fl_string_dynamic_delete_)
+  extern void private_fl_string_dynamic_delete(f_string_dynamic_t *string) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_string_dynamic_decrease_) || !defined(_di_fl_string_dynamic_decrease_by_) || !defined(_di_fl_string_dynamic_delete_)
+
+/**
  * Private implementation of fl_string_dynamic_increase_by().
  *
  * Intended to be shared to each of the different implementation variations.
@@ -225,17 +249,187 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_string_too_large on success, but requested size is too small (resize is smaller than requested length).
- *   F_memory_allocation (with error bit) on memory allocation error.
- *   F_memory_reallocation (with error bit) on memory reallocation error.
- *   F_parameter (with error bit) if a parameter is invalid.
  *   F_string_too_large (with error bit) if the combined string is too large.
+ *
+ *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *
+ * @see memcpy()
+ *
+ * @see fl_string_append()
+ * @see fl_string_append_mash()
+ * @see fl_string_append_nulless()
+ * @see fl_string_dynamic_append()
+ * @see fl_string_dynamic_append_nulless()
+ * @see fl_string_dynamic_increase_by()
+ * @see fl_string_dynamic_mash()
+ * @see fl_string_dynamic_mash_nulless()
+ * @see fl_string_dynamic_prepend()
+ * @see fl_string_dynamic_prepend_nulless()
+ * @see fl_string_mash_nulless()
+ * @see fl_string_prepend()
+ * @see fl_string_prepend_nulless()
  */
 #if !defined(_di_fl_string_dynamic_increase_by_) || !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_append_mash_) || !defined(_di_fl_string_dynamic_mash_) || !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_mash_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_) || !defined(_di_fl_string_prepend_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_)
   extern f_return_status private_fl_string_dynamic_increase_by(const f_string_length_t amount, f_string_dynamic_t *string) f_gcc_attribute_visibility_internal;
 #endif // !defined(_di_fl_string_dynamic_increase_by_) || !defined(_di_fl_string_append_) || !defined(_di_fl_string_dynamic_append_) || !defined(_di_fl_string_append_mash_) || !defined(_di_fl_string_dynamic_mash_) || !defined(_di_fl_string_append_nulless_) || !defined(_di_fl_string_dynamic_append_nulless_) || !defined(_di_fl_string_mash_nulless_) || !defined(_di_fl_string_dynamic_mash_nulless_) || !defined(_di_fl_string_prepend_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_)
 
 /**
+ * Private implementation for resizing.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The new size to use.
+ * @param string
+ *   The string to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *
+ * @see f_macro_string_dynamic_t_resize()
+ * @see fl_string_dynamic_decrease()
+ * @see fl_string_dynamic_decrease_by()
+ * @see fl_string_dynamic_increase()
+ * @see fl_string_dynamic_increase_by()
+ * @see fl_string_dynamic_terminate()
+ * @see fl_string_dynamic_terminate_after()
+ */
+#if !defined(_di_fl_string_dynamic_decrease_) || !defined(_di_fl_string_dynamic_decrease_by_) || !defined(_di_fl_string_dynamic_increase_) || !defined(_di_fl_string_dynamic_increase_by_) || !defined(_di_fl_string_dynamic_terminate_) || !defined(_di_fl_string_dynamic_terminate_after_)
+  extern f_return_status private_fl_string_dynamic_resize(const f_string_length_t length, f_string_dynamic_t *string) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_string_dynamic_decrease_) || !defined(_di_fl_string_dynamic_decrease_by_) || !defined(_di_fl_string_dynamic_increase_) || !defined(_di_fl_string_dynamic_increase_by_) || !defined(_di_fl_string_dynamic_terminate_) || !defined(_di_fl_string_dynamic_terminate_after_)
+
+/**
+ * Private implementation of fl_string_dynamics_delete().
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param strings
+ *   The strings to delete.
+ *
+ * @see fl_string_dynamics_decrease()
+ * @see fl_string_dynamics_decrease_by()
+ * @see fl_string_dynamics_delete()
+ */
+#if !defined(_di_fl_string_dynamics_decrease_) || !defined(_di_fl_string_dynamics_decrease_by_) || !defined(_di_fl_string_dynamics_delete_)
+  extern void private_fl_string_dynamics_delete(f_string_dynamics_t *strings) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_string_dynamics_decrease_) || !defined(_di_fl_string_dynamics_decrease_by_) || !defined(_di_fl_string_dynamics_delete_)
+
+/**
+ * Private implementation for resizing.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The new size to use.
+ * @param strings
+ *   The strings to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
+ *
+ * @see f_macro_string_dynamics_t_resize()
+ * @see fl_string_dynamics_decrease()
+ * @see fl_string_dynamics_decrease_by()
+ * @see fl_string_dynamics_increase()
+ * @see fl_string_dynamics_increase_by()
+ * @see fl_string_dynamics_terminate()
+ * @see fl_string_dynamics_terminate_after()
+ */
+#if !defined(_di_fl_string_dynamics_decrease_) || !defined(_di_fl_string_dynamics_decrease_by_) || !defined(_di_fl_string_dynamics_increase_) || !defined(_di_fl_string_dynamics_increase_by_) || !defined(_di_fl_string_dynamics_terminate_) || !defined(_di_fl_string_dynamics_terminate_after_)
+  extern f_return_status private_fl_string_dynamics_resize(const f_string_length_t length, f_string_dynamics_t *strings) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_string_dynamics_decrease_) || !defined(_di_fl_string_dynamics_decrease_by_) || !defined(_di_fl_string_dynamics_increase_) || !defined(_di_fl_string_dynamics_increase_by_) || !defined(_di_fl_string_dynamics_terminate_) || !defined(_di_fl_string_dynamics_terminate_after_)
+
+/**
+ * Private implementation of fl_string_lengths_delete().
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param lengths
+ *   The lengths to delete.
+ *
+ * @see fl_string_lengths_decrease()
+ * @see fl_string_lengths_decrease_by()
+ * @see fl_string_lengths_delete()
+ */
+#if !defined(_di_fl_string_lengths_decrease_) || !defined(_di_fl_string_lengths_decrease_by_) || !defined(_di_fl_string_lengths_delete_)
+  extern void private_fl_string_lengths_delete(f_string_lengths_t *lengths) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_string_lengths_decrease_) || !defined(_di_fl_string_lengths_decrease_by_) || !defined(_di_fl_string_lengths_delete_)
+
+/**
+ * Private implementation for resizing.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The new size to use.
+ * @param lengths
+ *   The lengths to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_string_lengths_t_resize().
+ *
+ * @see f_macro_string_lengths_t_resize()
+ * @see fl_string_lengths_decrease()
+ * @see fl_string_lengths_decrease_by()
+ * @see fl_string_lengths_increase()
+ * @see fl_string_lengths_increase_by()
+ * @see fl_string_lengths_terminate()
+ * @see fl_string_lengths_terminate_after()
+ */
+#if !defined(_di_fl_string_lengths_decrease_) || !defined(_di_fl_string_lengths_decrease_by_) || !defined(_di_fl_string_lengths_increase_) || !defined(_di_fl_string_lengths_increase_by_) || !defined(_di_fl_string_lengths_terminate_) || !defined(_di_fl_string_lengths_terminate_after_)
+  extern f_return_status private_fl_string_lengths_resize(const f_string_length_t length, f_string_lengths_t *lengths) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_string_lengths_decrease_) || !defined(_di_fl_string_lengths_decrease_by_) || !defined(_di_fl_string_lengths_increase_) || !defined(_di_fl_string_lengths_increase_by_) || !defined(_di_fl_string_lengths_terminate_) || !defined(_di_fl_string_lengths_terminate_after_)
+
+/**
+ * Private implementation of fl_string_maps_delete().
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param maps
+ *   The maps to delete.
+ *
+ * @see fl_string_maps_decrease()
+ * @see fl_string_maps_decrease_by()
+ * @see fl_string_maps_delete()
+ */
+#if !defined(fl_string_maps_decrease) || !defined(fl_string_maps_decrease_by) || !defined(_di_fl_string_maps_delete_)
+  extern void private_fl_string_maps_delete(f_string_maps_t *maps) f_gcc_attribute_visibility_internal;
+#endif // !defined(fl_string_maps_decrease) || !defined(fl_string_maps_decrease_by) || !defined(_di_fl_string_maps_delete_)
+
+/**
+ * Private implementation for resizing.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The new size to use.
+ * @param maps
+ *   The maps to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_string_maps_t_resize().
+ *
+ * @see f_macro_string_dynamic_t_resize()
+ * @see fl_string_maps_decrease()
+ * @see fl_string_maps_decrease_by()
+ * @see fl_string_maps_increase()
+ * @see fl_string_maps_increase_by()
+ * @see fl_string_maps_terminate()
+ * @see fl_string_maps_terminate_after()
+ */
+#if !defined(_di_fl_string_maps_decrease_) || !defined(_di_fl_string_maps_decrease_by_) || !defined(_di_fl_string_maps_increase_) || !defined(_di_fl_string_maps_increase_by_) || !defined(_di_fl_string_maps_terminate_) || !defined(_di_fl_string_maps_terminate_after_)
+  extern f_return_status private_fl_string_maps_resize(const f_string_length_t length, f_string_maps_t *maps) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_string_maps_decrease_) || !defined(_di_fl_string_maps_decrease_by_) || !defined(_di_fl_string_maps_increase_) || !defined(_di_fl_string_maps_increase_by_) || !defined(_di_fl_string_maps_terminate_) || !defined(_di_fl_string_maps_terminate_after_)
+
+/**
  * Private implementation of fl_string_prepend().
  *
  * Intended to be shared to each of the different implementation variations.
@@ -249,17 +443,26 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_allocation (with error bit) on memory allocation error.
- *   F_memory_reallocation (with error bit) on memory reallocation error.
- *   F_parameter (with error bit) if a parameter is invalid.
  *   F_string_too_large (with error bit) if the combined string is too large.
  *
- * @see fl_string_prepend()
+ *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *
+ * @see memcopy()
+ * @see memmove()
+ *
+ * @see fl_string_dynamic_mish()
+ * @see fl_string_dynamic_partial_mish()
+ * @see fl_string_dynamic_partial_prepend_assure()
+ * @see fl_string_dynamic_partial_prepend()
+ * @see fl_string_dynamic_prepend_assure()
  * @see fl_string_dynamic_prepend()
+ * @see fl_string_mish()
+ * @see fl_string_prepend_assure()
+ * @see fl_string_prepend()
  */
-#if !defined(_di_fl_string_prepend_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_append_mish_) || !defined(_di_fl_string_dynamic_mish_)
+#if !defined(_di_fl_string_dynamic_mish_) || !defined(_di_fl_string_dynamic_partial_mish_) || !defined(_di_fl_string_dynamic_partial_prepend_assure_) || !defined(_di_fl_string_dynamic_partial_prepend_) || !defined(_di_fl_string_dynamic_prepend_assure_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_mish_) || !defined(_di_fl_string_prepend_assure_) || !defined(_di_fl_string_prepend_)
   extern f_return_status private_fl_string_prepend(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal;
-#endif // !defined(_di_fl_string_prepend_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_append_mish_) || !defined(_di_fl_string_dynamic_mish_)
+#endif // !defined(_di_fl_string_dynamic_mish_) || !defined(_di_fl_string_dynamic_partial_mish_) || !defined(_di_fl_string_dynamic_partial_prepend_assure_) || !defined(_di_fl_string_dynamic_partial_prepend_) || !defined(_di_fl_string_dynamic_prepend_assure_) || !defined(_di_fl_string_dynamic_prepend_) || !defined(_di_fl_string_mish_) || !defined(_di_fl_string_prepend_assure_) || !defined(_di_fl_string_prepend_)
 
 /**
  * Private implementation of fl_string_prepend_nulless().
@@ -275,17 +478,26 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_allocation (with error bit) on memory allocation error.
- *   F_memory_reallocation (with error bit) on memory reallocation error.
- *   F_parameter (with error bit) if a parameter is invalid.
  *   F_string_too_large (with error bit) if the combined string is too large.
  *
- * @see fl_string_prepend_nulless()
+ *   Errors (with error bit) from: f_macro_string_dynamic_t_resize().
+ *
+ * @see memcopy()
+ * @see memmove()
+ *
+ * @see fl_string_dynamic_mish_nulless()
+ * @see fl_string_dynamic_partial_mish_nulless()
+ * @see fl_string_dynamic_partial_prepend_assure_nulless()
+ * @see fl_string_dynamic_partial_prepend_nulless()
+ * @see fl_string_dynamic_prepend_assure_nulless()
  * @see fl_string_dynamic_prepend_nulless()
+ * @see fl_string_mish_nulless()
+ * @see fl_string_prepend_assure_nulless()
+ * @see fl_string_prepend_nulless()
  */
-#if !defined(_di_fl_string_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_) || !defined(_di_fl_string_append_mish_) || !defined(_di_fl_string_dynamic_mish_)
+#if !defined(_di_fl_string_dynamic_mish_nulless_) || !defined(_di_fl_string_dynamic_partial_mish_nulless_) || !defined(_di_fl_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_fl_string_dynamic_partial_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_assure_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_) || !defined(_di_fl_string_mish_nulless_) || !defined(_di_fl_string_prepend_assure_nulless_) || !defined(_di_fl_string_prepend_nulless_)
   extern f_return_status private_fl_string_prepend_nulless(const f_string_t source, f_string_length_t length, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal;
-#endif // !defined(_di_fl_string_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_) || !defined(_di_fl_string_append_mish_) || !defined(_di_fl_string_dynamic_mish_)
+#endif // !defined(_di_fl_string_dynamic_mish_nulless_) || !defined(_di_fl_string_dynamic_partial_mish_nulless_) || !defined(_di_fl_string_dynamic_partial_prepend_assure_nulless_) || !defined(_di_fl_string_dynamic_partial_prepend_nulless_) || !defined(_di_fl_string_dynamic_prepend_assure_nulless_) || !defined(_di_fl_string_dynamic_prepend_nulless_) || !defined(_di_fl_string_mish_nulless_) || !defined(_di_fl_string_prepend_assure_nulless_) || !defined(_di_fl_string_prepend_nulless_)
 
 /**
  * Private implementation of fl_string_rip(), but only the part for finding the start/stop range.
@@ -304,12 +516,15 @@ extern "C" {
  * @return
  *   F_none on success.
  *   F_data_not on success but only whitespace found.
- *   F_memory_allocation (with error bit) on memory allocation error.
- *   F_memory_reallocation (with error bit) on memory reallocation error.
- *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ *   F_utf (with error bit) if a character is not valid UTF-8.
+ *
+ *   Errors (with error bit) from: f_utf_is_whitespace().
  *
  * @see fl_string_dynamic_rip()
  * @see fl_string_rip()
+ * @see fl_string_rip_nulless()
+ * @see fl_string_dynamic_rip_nulless()
  */
 #if !defined(_di_fl_string_rip_) || !defined(_di_fl_string_dynamic_rip_) || !defined(_di_fl_string_rip_nulless_) || !defined(_di_fl_string_dynamic_rip_nulless_)
   extern f_return_status private_fl_string_rip_find_range(const f_string_t source, f_string_length_t *start, f_string_length_t *stop) f_gcc_attribute_visibility_internal;
index e712495f8655ed858c623174714b0a9fcf1b029f..0a9fcf0b33fc86f49125cb00fba0c410e9ab1e26 100644 (file)
@@ -274,6 +274,51 @@ extern "C" {
   }
 #endif // _di_fl_string_dynamic_compare_trim_string_
 
+#ifndef _di_fl_string_dynamic_decrease_
+  f_return_status fl_string_dynamic_decrease(f_string_dynamic_t *string) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!string) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    if (string->size > 1) {
+      return private_fl_string_dynamic_resize(string->size - 1, string);
+    }
+
+    private_fl_string_dynamic_delete(string);
+
+    return F_none;
+  }
+#endif // _di_fl_string_dynamic_decrease_
+
+#ifndef _di_fl_string_dynamic_decrease_by_
+  f_return_status fl_string_dynamic_decrease_by(const f_string_length_t amount, f_string_dynamic_t *string) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!amount) return F_status_set_error(F_parameter);
+      if (!string) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    if (string->size - amount > 0) {
+      return private_fl_string_dynamic_resize(string->size - amount, string);
+    }
+
+    private_fl_string_dynamic_delete(string);
+
+    return F_none;
+  }
+#endif // _di_fl_string_dynamic_decrease_by_
+
+#ifndef _di_fl_string_dynamic_delete_
+  f_return_status fl_string_dynamic_delete(f_string_dynamic_t *string) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!string) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_string_dynamic_delete(string);
+
+    return F_none;
+  }
+#endif // _di_fl_string_dynamic_delete_
+
 #ifndef _di_fl_string_dynamic_mash_
   f_return_status fl_string_dynamic_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination) {
     #ifndef _di_level_1_parameter_checking_
@@ -914,45 +959,6 @@ extern "C" {
   }
 #endif // _di_fl_string_dynamic_rip_nulless_
 
-#ifndef _di_fl_string_dynamic_decrease_
-  f_return_status fl_string_dynamic_decrease(f_string_dynamic_t *string) {
-    #ifndef _di_level_1_parameter_checking_
-      if (!string) return F_status_set_error(F_parameter);
-    #endif // _di_level_1_parameter_checking_
-
-    f_status_t status = F_none;
-
-    if (string->size - 1 > 0) {
-      f_macro_string_dynamic_t_resize(status, (*string), string->size - 1);
-    }
-    else {
-      f_macro_string_dynamic_t_delete(status, (*string));
-    }
-
-    return status;
-  }
-#endif // _di_fl_string_dynamic_decrease_
-
-#ifndef _di_fl_string_dynamic_decrease_by_
-  f_return_status fl_string_dynamic_decrease_by(const f_string_length_t amount, f_string_dynamic_t *string) {
-    #ifndef _di_level_1_parameter_checking_
-      if (!amount) return F_status_set_error(F_parameter);
-      if (!string) return F_status_set_error(F_parameter);
-    #endif // _di_level_1_parameter_checking_
-
-    f_status_t status = F_none;
-
-    if (string->size - amount > 0) {
-      f_macro_string_dynamic_t_resize(status, (*string), string->size - amount);
-    }
-    else {
-      f_macro_string_dynamic_t_delete(status, (*string));
-    }
-
-    return status;
-  }
-#endif // _di_fl_string_dynamic_decrease_by_
-
 #ifndef _di_fl_string_dynamic_increase_
   f_return_status fl_string_dynamic_increase(f_string_dynamic_t *string) {
     #ifndef _di_level_1_parameter_checking_
@@ -970,11 +976,7 @@ extern "C" {
         size = f_string_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_string_dynamic_t_resize(status, (*string), size);
-
-      return status;
+      return private_fl_string_dynamic_resize(size, string);
     }
 
     return F_none;
@@ -1267,9 +1269,7 @@ extern "C" {
     const f_string_length_t total = destination->used + 1;
 
     if (total > destination->size) {
-      f_status_t status = F_none;
-
-      f_macro_string_dynamic_t_resize(status, (*destination), total);
+      const f_status_t status = private_fl_string_dynamic_resize(total, destination);
       if (F_status_is_error(status)) return status;
     }
 
@@ -1301,9 +1301,7 @@ extern "C" {
     const f_string_length_t total = destination->used + 1;
 
     if (total > destination->size) {
-      f_status_t status = F_none;
-
-      f_macro_string_dynamic_t_resize(status, (*destination), total);
+      const f_status_t status = private_fl_string_dynamic_resize(total, destination);
       if (F_status_is_error(status)) return status;
     }
 
@@ -1320,16 +1318,13 @@ extern "C" {
       if (!strings) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
-    f_status_t status = F_none;
-
-    if (strings->size - 1 > 0) {
-      f_macro_string_dynamics_t_resize(status, (*strings), strings->size - 1);
-    }
-    else {
-      f_macro_string_dynamics_t_delete(status, (*strings));
+    if (strings->size > 1) {
+      return private_fl_string_dynamics_resize(strings->size - 1, strings);
     }
 
-    return status;
+    private_fl_string_dynamics_delete(strings);
+
+    return F_none;
   }
 #endif // _di_fl_string_dynamics_decrease_
 
@@ -1340,19 +1335,28 @@ extern "C" {
       if (!strings) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
-    f_status_t status = F_none;
-
     if (strings->size - amount > 0) {
-      f_macro_string_dynamics_t_resize(status, (*strings), strings->size - amount);
-    }
-    else {
-      f_macro_string_dynamics_t_delete(status, (*strings));
+      return private_fl_string_dynamics_resize(strings->size - amount, strings);
     }
 
-    return status;
+    private_fl_string_dynamics_delete(strings);
+
+    return F_none;
   }
 #endif // _di_fl_string_dynamics_decrease_by_
 
+#ifndef _di_fl_string_dynamics_delete_
+  f_return_status fl_string_dynamics_delete(f_string_dynamics_t *strings) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!strings) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_string_dynamics_delete(strings);
+
+    return F_none;
+  }
+#endif // _di_fl_string_dynamics_delete_
+
 #ifndef _di_fl_string_dynamics_increase_
   f_return_status fl_string_dynamics_increase(f_string_dynamics_t *strings) {
     #ifndef _di_level_1_parameter_checking_
@@ -1370,11 +1374,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_string_dynamics_t_resize(status, (*strings), size);
-
-      return status;
+      return private_fl_string_dynamics_resize(size, strings);
     }
 
     return F_none;
@@ -1392,11 +1392,7 @@ extern "C" {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_string_dynamics_t_resize(status, (*strings), strings->used + amount);
-
-      return status;
+      return private_fl_string_dynamics_resize(strings->used + amount, strings);
     }
 
     return F_none;
@@ -1409,16 +1405,13 @@ extern "C" {
       if (!lengths) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
-    f_status_t status = F_none;
-
-    if (lengths->size - 1 > 0) {
-      f_macro_string_lengths_t_resize(status, (*lengths), lengths->size - 1);
-    }
-    else {
-      f_macro_string_lengths_t_delete(status, (*lengths));
+    if (lengths->size > 1) {
+      return private_fl_string_lengths_resize(lengths->size - 1, lengths);
     }
 
-    return status;
+    private_fl_string_lengths_delete(lengths);
+
+    return F_none;
   }
 #endif // _di_fl_string_lengths_decrease_
 
@@ -1429,19 +1422,28 @@ extern "C" {
       if (!lengths) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
-    f_status_t status = F_none;
-
     if (lengths->size - amount > 0) {
-      f_macro_string_lengths_t_resize(status, (*lengths), lengths->size - amount);
-    }
-    else {
-      f_macro_string_lengths_t_delete(status, (*lengths));
+      return private_fl_string_lengths_resize(lengths->size - amount, lengths);
     }
 
-    return status;
+    private_fl_string_lengths_delete(lengths);
+
+    return F_none;
   }
 #endif // _di_fl_string_lengths_decrease_by_
 
+#ifndef _di_fl_string_lengths_delete_
+  f_return_status fl_string_lengths_delete(f_string_lengths_t *lengths) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!lengths) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_string_lengths_delete(lengths);
+
+    return F_none;
+  }
+#endif // _di_fl_string_lengths_delete_
+
 #ifndef _di_fl_string_lengths_increase_
   f_return_status fl_string_lengths_increase(f_string_lengths_t *lengths) {
     #ifndef _di_level_1_parameter_checking_
@@ -1459,16 +1461,31 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
+      return private_fl_string_lengths_resize(size, lengths);
+    }
+
+    return F_none;
+  }
+#endif // _di_fl_string_lengths_increase_
+
+#ifndef _di_fl_string_lengths_increase_by_
+  f_return_status fl_string_lengths_increase_by(const f_array_length_t amount, f_string_lengths_t *lengths) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!amount) return F_status_set_error(F_parameter);
+      if (!lengths) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
-      f_macro_string_lengths_t_resize(status, (*lengths), size);
+    if (lengths->used + amount > lengths->size) {
+      if (lengths->used + amount > f_array_length_t_size) {
+        return F_status_set_error(F_array_too_large);
+      }
 
-      return status;
+      return private_fl_string_lengths_resize(lengths->used + amount, lengths);
     }
 
     return F_none;
   }
-#endif // _di_fl_string_lengths_increase_
+#endif // _di_fl_string_lengths_increase_by_
 
 #ifndef _di_fl_string_maps_decrease_
   f_return_status fl_string_maps_decrease(f_string_maps_t *maps) {
@@ -1476,16 +1493,13 @@ extern "C" {
       if (!maps) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
-    f_status_t status = F_none;
-
-    if (maps->size - 1 > 0) {
-      f_macro_string_maps_t_resize(status, (*maps), maps->size - 1);
-    }
-    else {
-      f_macro_string_maps_t_delete(status, (*maps));
+    if (maps->size > 1) {
+      return private_fl_string_maps_resize(maps->size - 1, maps);
     }
 
-    return status;
+    private_fl_string_maps_delete(maps);
+
+    return F_none;
   }
 #endif // _di_fl_string_maps_decrease_
 
@@ -1496,41 +1510,27 @@ extern "C" {
       if (!maps) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
-    f_status_t status = F_none;
-
     if (maps->size - amount > 0) {
-      f_macro_string_maps_t_resize(status, (*maps), maps->size - amount);
-    }
-    else {
-      f_macro_string_maps_t_delete(status, (*maps));
+      return private_fl_string_maps_resize(maps->size - amount, maps);
     }
 
-    return status;
+    private_fl_string_maps_delete(maps);
+
+    return F_none;
   }
 #endif // _di_fl_string_maps_decrease_by_
 
-#ifndef _di_fl_string_lengths_increase_by_
-  f_return_status fl_string_lengths_increase_by(const f_array_length_t amount, f_string_lengths_t *lengths) {
+#ifndef _di_fl_string_maps_delete_
+  f_return_status fl_string_maps_delete(f_string_maps_t *maps) {
     #ifndef _di_level_1_parameter_checking_
-      if (!amount) return F_status_set_error(F_parameter);
-      if (!lengths) return F_status_set_error(F_parameter);
+      if (!maps) return F_status_set_error(F_parameter);
     #endif // _di_level_1_parameter_checking_
 
-    if (lengths->used + amount > lengths->size) {
-      if (lengths->used + amount > f_array_length_t_size) {
-        return F_status_set_error(F_array_too_large);
-      }
-
-      f_status_t status = F_none;
-
-      f_macro_string_lengths_t_resize(status, (*lengths), lengths->used + amount);
-
-      return status;
-    }
+    private_fl_string_maps_delete(maps);
 
     return F_none;
   }
-#endif // _di_fl_string_lengths_increase_by_
+#endif // _di_fl_string_maps_delete_
 
 #ifndef _di_fl_string_maps_increase_
   f_return_status fl_string_maps_increase(f_string_maps_t *maps) {
@@ -1549,11 +1549,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_string_maps_t_resize(status, (*maps), size);
-
-      return status;
+      return private_fl_string_maps_resize(size, maps);
     }
 
     return F_none;
@@ -1572,11 +1568,7 @@ extern "C" {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_string_maps_t_resize(status, (*maps), maps->used + amount);
-
-      return status;
+      return private_fl_string_maps_resize(maps->used + amount, maps);
     }
 
     return F_none;
index d7c9b8569efd1dd26d99179f01f5c5c4b89c25a1..c1ffe5e68676f0d03e663f5731fae50887cbe853 100644 (file)
@@ -568,6 +568,61 @@ extern "C" {
 #endif // _di_fl_string_dynamic_compare_trim_string_
 
 /**
+ * Resize the dynamic string to a smaller size, by 1.
+ *
+ * This will shrink the size by size - 1.
+ * This will not shrink the size to less than 0.
+ *
+ * @param string
+ *   The string to resize.
+ *
+ * @return
+ *   F_none on success.
+ *   F_memory_allocation (with error bit) on memory allocation error.
+ *   F_memory_reallocation (with error bit) on memory reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ */
+#ifndef _di_fl_string_dynamic_decrease_
+  extern f_return_status fl_string_dynamic_decrease(f_string_dynamic_t *string);
+#endif // _di_fl_string_dynamic_decrease_
+
+/**
+ * Resize the dynamic string to a smaller size.
+ *
+ * This will resize making the string smaller based on (size - given length).
+ * If the given length is too small, then the resize will fail.
+ * This will not shrink the size to less than 0.
+ *
+ * @param amount
+ *   A positive number representing how much to decrease the size by.
+ * @param string
+ *   The string to resize.
+ *
+ * @return
+ *   F_none on success.
+ *   F_memory_allocation (with error bit) on memory allocation error.
+ *   F_memory_reallocation (with error bit) on memory reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ */
+#ifndef _di_fl_string_dynamic_decrease_by_
+  extern f_return_status fl_string_dynamic_decrease_by(const f_string_length_t amount, f_string_dynamic_t *string);
+#endif // _di_fl_string_dynamic_decrease_by_
+
+/**
+ * Delete the dynamic string.
+ *
+ * @param string
+ *   The string to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ */
+#ifndef _di_fl_string_dynamic_delete_
+  extern f_return_status fl_string_dynamic_delete(f_string_dynamic_t *string);
+#endif // _di_fl_string_dynamic_delete_
+
+/**
  * Append the source string onto the destination with the glue in between.
  *
  * If the destination string is empty, then no glue is appended.
@@ -1511,47 +1566,6 @@ extern "C" {
 #endif // _di_fl_string_dynamic_rip_nulless_
 
 /**
- * Resize the dynamic string to a smaller size, by 1.
- *
- * This will shrink the size by size - 1.
- * This will not shrink the size to less than 0.
- *
- * @param string
- *   The string to resize.
- *
- * @return
- *   F_none on success.
- *   F_memory_allocation (with error bit) on memory allocation error.
- *   F_memory_reallocation (with error bit) on memory reallocation error.
- *   F_parameter (with error bit) if a parameter is invalid.
- */
-#ifndef _di_fl_string_dynamic_decrease_
-  extern f_return_status fl_string_dynamic_decrease(f_string_dynamic_t *string);
-#endif // _di_fl_string_dynamic_decrease_
-
-/**
- * Resize the dynamic string to a smaller size.
- *
- * This will resize making the string smaller based on (size - given length).
- * If the given length is too small, then the resize will fail.
- * This will not shrink the size to less than 0.
- *
- * @param amount
- *   A positive number representing how much to decrease the size by.
- * @param string
- *   The string to resize.
- *
- * @return
- *   F_none on success.
- *   F_memory_allocation (with error bit) on memory allocation error.
- *   F_memory_reallocation (with error bit) on memory reallocation error.
- *   F_parameter (with error bit) if a parameter is invalid.
- */
-#ifndef _di_fl_string_dynamic_decrease_by_
-  extern f_return_status fl_string_dynamic_decrease_by(const f_string_length_t amount, f_string_dynamic_t *string);
-#endif // _di_fl_string_dynamic_decrease_by_
-
-/**
  * Resize the dynamic string to a larger size.
  *
  * This will resize making the string larger based on the given length.
@@ -1869,6 +1883,20 @@ extern "C" {
 #endif // _di_fl_string_dynamics_decrease_by_
 
 /**
+ * Delete the array of dynamic strings.
+ *
+ * @param string
+ *   The string to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ */
+#ifndef _di_fl_string_dynamics_delete_
+  extern f_return_status fl_string_dynamics_delete(f_string_dynamics_t *strings);
+#endif // _di_fl_string_dynamics_delete_
+
+/**
  * Increase the size of the dynamic string array, but only if necessary.
  *
  * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size).
@@ -1953,6 +1981,20 @@ extern "C" {
 #endif // _di_fl_string_lengths_decrease_by_
 
 /**
+ * Delete the array of string lengths.
+ *
+ * @param lengths
+ *   The string to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ */
+#ifndef _di_fl_string_lengths_delete_
+  extern f_return_status fl_string_lengths_delete(f_string_lengths_t *lengths);
+#endif // _di_fl_string_lengths_delete_
+
+/**
  * Increase the size of the string lengths array, but only if necessary.
  *
  * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size).
@@ -2037,6 +2079,20 @@ extern "C" {
 #endif // _di_fl_string_maps_decrease_by_
 
 /**
+ * Delete the array of string maps.
+ *
+ * @param maps
+ *   The maps to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ */
+#ifndef _di_fl_string_maps_delete_
+  extern f_return_status fl_string_maps_delete(f_string_maps_t *maps);
+#endif // _di_fl_string_maps_delete_
+
+/**
  * Increase the size of the string maps array, but only if necessary.
  *
  * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size).
@@ -2047,10 +2103,10 @@ extern "C" {
  *
  * @return
  *   F_none on success.
+ *   F_array_too_large (with error bit) if the new array length is too large.
  *   F_memory_allocation (with error bit) on memory allocation error.
  *   F_memory_reallocation (with error bit) on memory reallocation error.
  *   F_parameter (with error bit) if a parameter is invalid.
- *   F_array_too_large (with error bit) if the new array length is too large.
  */
 #ifndef _di_fl_string_maps_increase_
   extern f_return_status fl_string_maps_increase(f_string_maps_t *maps);
diff --git a/level_1/fl_type/c/private-type.c b/level_1/fl_type/c/private-type.c
new file mode 100644 (file)
index 0000000..64c2a3b
--- /dev/null
@@ -0,0 +1,394 @@
+#include "type.h"
+#include "private-type.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(_di_fl_type_cells_delete_)
+  void private_fl_type_cells_delete(f_cells_t *cells) {
+    f_macro_cells_t_delete_simple((*cells));
+  }
+#endif // !defined(_di_fl_type_cells_delete_)
+
+#if !defined(_di_fl_type_cells_increase_) || !defined(_di_fl_type_cells_increase_by_)
+  f_return_status private_fl_type_cells_resize(const f_array_length_t length, f_cells_t *cells) {
+    f_status_t status = F_none;
+
+    f_macro_cells_t_resize(status, (*cells), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_cells_increase_) || !defined(_di_fl_type_cells_increase_by_)
+
+#if !defined(_di_fl_type_cellss_delete_)
+  void private_fl_type_cellss_delete(f_cellss_t *cellss) {
+    f_macro_cellss_t_delete_simple((*cellss));
+  }
+#endif // !defined(_di_fl_type_cellss_delete_)
+
+#if !defined(_di_fl_type_cellss_increase_) || !defined(_di_fl_type_cellss_increase_by_)
+  f_return_status private_fl_type_cellss_resize(const f_array_length_t length, f_cellss_t *cellss) {
+    f_status_t status = F_none;
+
+    f_macro_cellss_t_resize(status, (*cellss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_cellss_increase_) || !defined(_di_fl_type_cellss_increase_by_)
+
+#if !defined(_di_fl_type_array_lengths_delete_)
+  void private_fl_type_array_lengths_delete(f_array_lengths_t *lengths) {
+    f_macro_array_lengths_t_delete_simple((*lengths));
+  }
+#endif // !defined(_di_fl_type_array_lengths_delete_)
+
+#if !defined(_di_fl_type_array_lengths_increase_) || !defined(_di_fl_type_array_lengths_increase_by_)
+  f_return_status private_fl_type_array_lengths_resize(const f_array_length_t length, f_array_lengths_t *array_lengths) {
+    f_status_t status = F_none;
+
+    f_macro_array_lengths_t_resize(status, (*array_lengths), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_array_lengths_increase_) || !defined(_di_fl_type_array_lengths_increase_by_)
+
+#if !defined(_di_fl_type_array_lengthss_delete_)
+  void private_fl_type_array_lengthss_delete(f_array_lengthss_t *lengthss) {
+    f_macro_array_lengthss_t_delete_simple((*lengthss));
+  }
+#endif // !defined(_di_fl_type_array_lengthss_delete_)
+
+#if !defined(_di_fl_type_array_lengthss_increase_) || !defined(_di_fl_type_array_lengthss_increase_by_)
+  f_return_status private_fl_type_array_lengthss_resize(const f_array_length_t length, f_array_lengthss_t *array_lengthss) {
+    f_status_t status = F_none;
+
+    f_macro_array_lengthss_t_resize(status, (*array_lengthss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_array_lengthss_increase_) || !defined(_di_fl_type_array_lengthss_increase_by_)
+
+#if !defined(_di_fl_type_int8s_delete_)
+  void private_fl_type_int8s_delete(f_int8s_t *int8s) {
+    f_macro_int8s_t_delete_simple((*int8s));
+  }
+#endif // !defined(_di_fl_type_int8s_delete_)
+
+#if !defined(_di_fl_type_int8s_increase_) || !defined(_di_fl_type_int8s_increase_by_)
+  f_return_status private_fl_type_int8s_resize(const f_array_length_t length, f_int8s_t *int8s) {
+    f_status_t status = F_none;
+
+    f_macro_int8s_t_resize(status, (*int8s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int8s_increase_) || !defined(_di_fl_type_int8s_increase_by_)
+
+#if !defined(_di_fl_type_int8ss_delete_)
+  void private_fl_type_int8ss_delete(f_int8ss_t *int8ss) {
+    f_macro_int8ss_t_delete_simple((*int8ss));
+  }
+#endif // !defined(_di_fl_type_int8ss_delete_)
+
+#if !defined(_di_fl_type_int8ss_increase_) || !defined(_di_fl_type_int8ss_increase_by_)
+  f_return_status private_fl_type_int8ss_resize(const f_array_length_t length, f_int8ss_t *int8ss) {
+    f_status_t status = F_none;
+
+    f_macro_int8ss_t_resize(status, (*int8ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int8ss_increase_) || !defined(_di_fl_type_int8ss_increase_by_)
+
+#if !defined(_di_fl_type_uint8s_delete_)
+  void private_fl_type_uint8s_delete(f_uint8s_t *uint8s) {
+    f_macro_uint8s_t_delete_simple((*uint8s));
+  }
+#endif // !defined(_di_fl_type_uint8s_delete_)
+
+#if !defined(_di_fl_type_uint8s_increase_) || !defined(_di_fl_type_uint8s_increase_by_)
+  f_return_status private_fl_type_uint8s_resize(const f_array_length_t length, f_uint8s_t *uint8s) {
+    f_status_t status = F_none;
+
+    f_macro_uint8s_t_resize(status, (*uint8s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint8s_increase_) || !defined(_di_fl_type_uint8s_increase_by_)
+
+#if !defined(_di_fl_type_uint8ss_delete_)
+  void private_fl_type_uint8ss_delete(f_uint8ss_t *uint8ss) {
+    f_macro_uint8ss_t_delete_simple((*uint8ss));
+  }
+#endif // !defined(_di_fl_type_uint8ss_delete_)
+
+#if !defined(_di_fl_type_uint8ss_increase_) || !defined(_di_fl_type_uint8ss_increase_by_)
+  f_return_status private_fl_type_uint8ss_resize(const f_array_length_t length, f_uint8ss_t *uint8ss) {
+    f_status_t status = F_none;
+
+    f_macro_uint8ss_t_resize(status, (*uint8ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint8ss_increase_) || !defined(_di_fl_type_uint8ss_increase_by_)
+
+#if !defined(_di_fl_type_int16s_delete_)
+  void private_fl_type_int16s_delete(f_int16s_t *int16s) {
+    f_macro_int16s_t_delete_simple((*int16s));
+  }
+#endif // !defined(_di_fl_type_int16s_delete_)
+
+#if !defined(_di_fl_type_int16s_increase_) || !defined(_di_fl_type_int16s_increase_by_)
+  f_return_status private_fl_type_int16s_resize(const f_array_length_t length, f_int16s_t *int16s) {
+    f_status_t status = F_none;
+
+    f_macro_int16s_t_resize(status, (*int16s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int16s_increase_) || !defined(_di_fl_type_int16s_increase_by_)
+
+#if !defined(_di_fl_type_int16ss_delete_)
+  void private_fl_type_int16ss_delete(f_int16ss_t *int16ss) {
+    f_macro_int16ss_t_delete_simple((*int16ss));
+  }
+#endif // !defined(_di_fl_type_int16ss_delete_)
+
+#if !defined(_di_fl_type_int16ss_increase_) || !defined(_di_fl_type_int16ss_increase_by_)
+  f_return_status private_fl_type_int16ss_resize(const f_array_length_t length, f_int16ss_t *int16ss) {
+    f_status_t status = F_none;
+
+    f_macro_int16ss_t_resize(status, (*int16ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int16ss_increase_) || !defined(_di_fl_type_int16ss_increase_by_)
+
+#if !defined(_di_fl_type_uint16s_delete_)
+  void private_fl_type_uint16s_delete(f_uint16s_t *uint16s) {
+    f_macro_uint16s_t_delete_simple((*uint16s));
+  }
+#endif // !defined(_di_fl_type_uint16s_delete_)
+
+#if !defined(_di_fl_type_uint16s_increase_) || !defined(_di_fl_type_uint16s_increase_by_)
+  f_return_status private_fl_type_uint16s_resize(const f_array_length_t length, f_uint16s_t *uint16s) {
+    f_status_t status = F_none;
+
+    f_macro_uint16s_t_resize(status, (*uint16s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint16s_increase_) || !defined(_di_fl_type_uint16s_increase_by_)
+
+#if !defined(_di_fl_type_uint16ss_delete_)
+  void private_fl_type_uint16ss_delete(f_uint16ss_t *uint16ss) {
+    f_macro_uint16ss_t_delete_simple((*uint16ss));
+  }
+#endif // !defined(_di_fl_type_uint16ss_delete_)
+
+#if !defined(_di_fl_type_uint16ss_increase_) || !defined(_di_fl_type_uint16ss_increase_by_)
+  f_return_status private_fl_type_uint16ss_resize(const f_array_length_t length, f_uint16ss_t *uint16ss) {
+    f_status_t status = F_none;
+
+    f_macro_uint16ss_t_resize(status, (*uint16ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint16ss_increase_) || !defined(_di_fl_type_uint16ss_increase_by_)
+
+#if !defined(_di_fl_type_int32s_delete_)
+  void private_fl_type_int32s_delete(f_int32s_t *int32s) {
+    f_macro_int32s_t_delete_simple((*int32s));
+  }
+#endif // !defined(_di_fl_type_int32s_delete_)
+
+#if !defined(_di_fl_type_int32s_increase_) || !defined(_di_fl_type_int32s_increase_by_)
+  f_return_status private_fl_type_int32s_resize(const f_array_length_t length, f_int32s_t *int32s) {
+    f_status_t status = F_none;
+
+    f_macro_int32s_t_resize(status, (*int32s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int32s_increase_) || !defined(_di_fl_type_int32s_increase_by_)
+
+#if !defined(_di_fl_type_int32ss_delete_)
+  void private_fl_type_int32ss_delete(f_int32ss_t *int32ss) {
+    f_macro_int32ss_t_delete_simple((*int32ss));
+  }
+#endif // !defined(_di_fl_type_int32ss_delete_)
+
+#if !defined(_di_fl_type_int32ss_increase_) || !defined(_di_fl_type_int32ss_increase_by_)
+  f_return_status private_fl_type_int32ss_resize(const f_array_length_t length, f_int32ss_t *int32ss) {
+    f_status_t status = F_none;
+
+    f_macro_int32ss_t_resize(status, (*int32ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int32ss_increase_) || !defined(_di_fl_type_int32ss_increase_by_)
+
+#if !defined(_di_fl_type_uint32s_delete_)
+  void private_fl_type_uint32s_delete(f_uint32s_t *uint32s) {
+    f_macro_uint32s_t_delete_simple((*uint32s));
+  }
+#endif // !defined(_di_fl_type_uint32s_delete_)
+
+#if !defined(_di_fl_type_uint32s_increase_) || !defined(_di_fl_type_uint32s_increase_by_)
+  f_return_status private_fl_type_uint32s_resize(const f_array_length_t length, f_uint32s_t *uint32s) {
+    f_status_t status = F_none;
+
+    f_macro_uint32s_t_resize(status, (*uint32s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint32s_increase_) || !defined(_di_fl_type_uint32s_increase_by_)
+
+#if !defined(_di_fl_type_uint32ss_delete_)
+  void private_fl_type_uint32ss_delete(f_uint32ss_t *uint32ss) {
+    f_macro_uint32ss_t_delete_simple((*uint32ss));
+  }
+#endif // !defined(_di_fl_type_uint32ss_delete_)
+
+#if !defined(_di_fl_type_uint32ss_increase_) || !defined(_di_fl_type_uint32ss_increase_by_)
+  f_return_status private_fl_type_uint32ss_resize(const f_array_length_t length, f_uint32ss_t *uint32ss) {
+    f_status_t status = F_none;
+
+    f_macro_uint32ss_t_resize(status, (*uint32ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint32ss_increase_) || !defined(_di_fl_type_uint32ss_increase_by_)
+
+#if !defined(_di_fl_type_int64s_delete_)
+  void private_fl_type_int64s_delete(f_int64s_t *int64s) {
+    f_macro_int64s_t_delete_simple((*int64s));
+  }
+#endif // !defined(_di_fl_type_int64s_delete_)
+
+#if !defined(_di_fl_type_int64s_increase_) || !defined(_di_fl_type_int64s_increase_by_)
+  f_return_status private_fl_type_int64s_resize(const f_array_length_t length, f_int64s_t *int64s) {
+    f_status_t status = F_none;
+
+    f_macro_int64s_t_resize(status, (*int64s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int64s_increase_) || !defined(_di_fl_type_int64s_increase_by_)
+
+#if !defined(_di_fl_type_int64ss_delete_)
+  void private_fl_type_int64ss_delete(f_int64ss_t *int64ss) {
+    f_macro_int64ss_t_delete_simple((*int64ss));
+  }
+#endif // !defined(_di_fl_type_int64ss_delete_)
+
+#if !defined(_di_fl_type_int64ss_increase_) || !defined(_di_fl_type_int64ss_increase_by_)
+  f_return_status private_fl_type_int64ss_resize(const f_array_length_t length, f_int64ss_t *int64ss) {
+    f_status_t status = F_none;
+
+    f_macro_int64ss_t_resize(status, (*int64ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int64ss_increase_) || !defined(_di_fl_type_int64ss_increase_by_)
+
+#if !defined(_di_fl_type_uint64s_delete_)
+  void private_fl_type_uint64s_delete(f_uint64s_t *uint64s) {
+    f_macro_uint64s_t_delete_simple((*uint64s));
+  }
+#endif // !defined(_di_fl_type_uint64s_delete_)
+
+#if !defined(_di_fl_type_uint64s_increase_) || !defined(_di_fl_type_uint64s_increase_by_)
+  f_return_status private_fl_type_uint64s_resize(const f_array_length_t length, f_uint64s_t *uint64s) {
+    f_status_t status = F_none;
+
+    f_macro_uint64s_t_resize(status, (*uint64s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint64s_increase_) || !defined(_di_fl_type_uint64s_increase_by_)
+
+#if !defined(_di_fl_type_uint64ss_delete_)
+  void private_fl_type_uint64ss_delete(f_uint64ss_t *uint64ss) {
+    f_macro_uint64ss_t_delete_simple((*uint64ss));
+  }
+#endif // !defined(_di_fl_type_uint64ss_delete_)
+
+#if !defined(_di_fl_type_uint64ss_increase_) || !defined(_di_fl_type_uint64ss_increase_by_)
+  f_return_status private_fl_type_uint64ss_resize(const f_array_length_t length, f_uint64ss_t *uint64ss) {
+    f_status_t status = F_none;
+
+    f_macro_uint64ss_t_resize(status, (*uint64ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint64ss_increase_) || !defined(_di_fl_type_uint64ss_increase_by_)
+
+#if !defined(_di_fl_type_int128s_delete_)
+  void private_fl_type_int128s_delete(f_int128s_t *int128s) {
+    f_macro_int128s_t_delete_simple((*int128s));
+  }
+#endif // !defined(_di_fl_type_int128s_delete_)
+
+#if !defined(_di_fl_type_int128s_increase_) || !defined(_di_fl_type_int128s_increase_by_)
+  f_return_status private_fl_type_int128s_resize(const f_array_length_t length, f_int128s_t *int128s) {
+    f_status_t status = F_none;
+
+    f_macro_int128s_t_resize(status, (*int128s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int128s_increase_) || !defined(_di_fl_type_int128s_increase_by_)
+
+#if !defined(_di_fl_type_int128ss_delete_)
+  void private_fl_type_int128ss_delete(f_int128ss_t *int128ss) {
+    f_macro_int128ss_t_delete_simple((*int128ss));
+  }
+#endif // !defined(_di_fl_type_int128ss_delete_)
+
+#if !defined(_di_fl_type_int128ss_increase_) || !defined(_di_fl_type_int128ss_increase_by_)
+  f_return_status private_fl_type_int128ss_resize(const f_array_length_t length, f_int128ss_t *int128ss) {
+    f_status_t status = F_none;
+
+    f_macro_int128ss_t_resize(status, (*int128ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_int128ss_increase_) || !defined(_di_fl_type_int128ss_increase_by_)
+
+#if !defined(_di_fl_type_uint128s_delete_)
+  void private_fl_type_uint128s_delete(f_uint128s_t *uint128s) {
+    f_macro_uint128s_t_delete_simple((*uint128s));
+  }
+#endif // !defined(_di_fl_type_uint128s_delete_)
+
+#if !defined(_di_fl_type_uint128s_increase_) || !defined(_di_fl_type_uint128s_increase_by_)
+  f_return_status private_fl_type_uint128s_resize(const f_array_length_t length, f_uint128s_t *uint128s) {
+    f_status_t status = F_none;
+
+    f_macro_uint128s_t_resize(status, (*uint128s), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint128s_increase_) || !defined(_di_fl_type_uint128s_increase_by_)
+
+#if !defined(_di_fl_type_uint128ss_delete_)
+  void private_fl_type_uint128ss_delete(f_uint128ss_t *uint128ss) {
+    f_macro_uint128ss_t_delete_simple((*uint128ss));
+  }
+#endif // !defined(_di_fl_type_uint128ss_delete_)
+
+#if !defined(_di_fl_type_uint128ss_increase_) || !defined(_di_fl_type_uint128ss_increase_by_)
+  f_return_status private_fl_type_uint128ss_resize(const f_array_length_t length, f_uint128ss_t *uint128ss) {
+    f_status_t status = F_none;
+
+    f_macro_uint128ss_t_resize(status, (*uint128ss), length);
+
+    return status;
+  }
+#endif // !defined(_di_fl_type_uint128ss_increase_) || !defined(_di_fl_type_uint128ss_increase_by_)
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/level_1/fl_type/c/private-type.h b/level_1/fl_type/c/private-type.h
new file mode 100644 (file)
index 0000000..016ee1a
--- /dev/null
@@ -0,0 +1,814 @@
+/**
+ * FLL - Level 1
+ *
+ * Project: Type
+ * API Version: 0.5
+ * Licenses: lgplv2.1
+ *
+ * These are provided for internal reduction in redundant code.
+ * These should not be exposed/used outside of this project.
+ */
+#ifndef _PRIVATE_FL_type_h
+#define _PRIVATE_FL_type_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Private implementation for deleting the cells array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param cells
+ *   The cells array to delete.
+ */
+#if !defined(_di_fl_type_cells_delete_)
+  extern void private_fl_type_cells_delete(f_cells_t *cells) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_cells_delete_)
+
+/**
+ * Private implementation for resizing the cells array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param cells
+ *   The cells array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_cells_t_resize().
+ *
+ * @see f_macro_cells_t_resize()
+ */
+#if !defined(_di_fl_type_cells_increase_) || !defined(_di_fl_type_cells_increase_by_)
+  extern f_return_status private_fl_type_cells_resize(const f_array_length_t length, f_cells_t *cells) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_cells_increase_) || !defined(_di_fl_type_cells_increase_by_)
+
+/**
+ * Private implementation for deleting the cellss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param cellss
+ *   The cellss array to delete.
+ */
+#if !defined(_di_fl_type_cellss_delete_)
+  extern void private_fl_type_cellss_delete(f_cellss_t *cellss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_cellss_delete_)
+
+/**
+ * Private implementation for resizing the cellss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param cellss
+ *   The cellss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_cellss_t_resize().
+ *
+ * @see f_macro_cellss_t_resize()
+ */
+#if !defined(_di_fl_type_cellss_increase_) || !defined(_di_fl_type_cellss_increase_by_)
+  extern f_return_status private_fl_type_cellss_resize(const f_array_length_t length, f_cellss_t *cellss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_cellss_increase_) || !defined(_di_fl_type_cellss_increase_by_)
+
+/**
+ * Private implementation for deleting the lengths array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param lengths
+ *   The lengths array to delete.
+ */
+#if !defined(_di_fl_type_array_lengths_delete_)
+  extern void private_fl_type_array_lengths_delete(f_array_lengths_t *lengths) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_array_lengths_delete_)
+
+/**
+ * Private implementation for resizing the lengths array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param lengths
+ *   The lengths array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_array_lengths_t_resize().
+ *
+ * @see f_macro_array_lengths_t_resize()
+ */
+#if !defined(_di_fl_type_array_lengths_increase_) || !defined(_di_fl_type_array_lengths_increase_by_)
+  extern f_return_status private_fl_type_array_lengths_resize(const f_array_length_t length, f_array_lengths_t *lengths) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_array_lengths_increase_) || !defined(_di_fl_type_array_lengths_increase_by_)
+
+/**
+ * Private implementation for deleting the lengthss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param lengthss
+ *   The lengthss array to delete.
+ */
+#if !defined(_di_fl_type_array_lengthss_delete_)
+  extern void private_fl_type_array_lengthss_delete(f_array_lengthss_t *lengthss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_array_lengthss_delete_)
+
+/**
+ * Private implementation for resizing the lengthss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param lengthss
+ *   The lengthss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_array_lengthss_t_resize().
+ *
+ * @see f_macro_array_lengthss_t_resize()
+ */
+#if !defined(_di_fl_type_array_lengthss_increase_) || !defined(_di_fl_type_array_lengthss_increase_by_)
+  extern f_return_status private_fl_type_array_lengthss_resize(const f_array_length_t length, f_array_lengthss_t *lengthss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_array_lengthss_increase_) || !defined(_di_fl_type_array_lengthss_increase_by_)
+
+/**
+ * Private implementation for deleting the int8s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int8s
+ *   The int8s array to delete.
+ */
+#if !defined(_di_fl_type_int8s_delete_)
+  extern void private_fl_type_int8s_delete(f_int8s_t *int8s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int8s_delete_)
+
+/**
+ * Private implementation for resizing the int8s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int8s
+ *   The int8s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int8s_t_resize().
+ *
+ * @see f_macro_int8s_t_resize()
+ */
+#if !defined(_di_fl_type_int8s_increase_) || !defined(_di_fl_type_int8s_increase_by_)
+  extern f_return_status private_fl_type_int8s_resize(const f_array_length_t length, f_int8s_t *int8s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int8s_increase_) || !defined(_di_fl_type_int8s_increase_by_)
+
+/**
+ * Private implementation for deleting the int8ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int8ss
+ *   The int8ss array to delete.
+ */
+#if !defined(_di_fl_type_int8ss_delete_)
+  extern void private_fl_type_int8ss_delete(f_int8ss_t *int8ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int8ss_delete_)
+
+/**
+ * Private implementation for resizing the int8ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int8ss
+ *   The int8ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int8ss_t_resize().
+ *
+ * @see f_macro_int8ss_t_resize()
+ */
+#if !defined(_di_fl_type_int8ss_increase_) || !defined(_di_fl_type_int8ss_increase_by_)
+  extern f_return_status private_fl_type_int8ss_resize(const f_array_length_t length, f_int8ss_t *int8ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int8ss_increase_) || !defined(_di_fl_type_int8ss_increase_by_)
+
+/**
+ * Private implementation for deleting the uint8s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint8s
+ *   The uint8s array to delete.
+ */
+#if !defined(_di_fl_type_uint8s_delete_)
+  extern void private_fl_type_uint8s_delete(f_uint8s_t *uint8s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint8s_delete_)
+
+/**
+ * Private implementation for resizing the uint8s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint8s
+ *   The uint8s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint8s_t_resize().
+ *
+ * @see f_macro_uint8s_t_resize()
+ */
+#if !defined(_di_fl_type_uint8s_increase_) || !defined(_di_fl_type_uint8s_increase_by_)
+  extern f_return_status private_fl_type_uint8s_resize(const f_array_length_t length, f_uint8s_t *uint8s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint8s_increase_) || !defined(_di_fl_type_uint8s_increase_by_)
+
+/**
+ * Private implementation for deleting the uint8ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint8ss
+ *   The uint8ss array to delete.
+ */
+#if !defined(_di_fl_type_uint8ss_delete_)
+  extern void private_fl_type_uint8ss_delete(f_uint8ss_t *uint8ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint8ss_delete_)
+
+/**
+ * Private implementation for resizing the uint8ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint8ss
+ *   The uint8ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint8ss_t_resize().
+ *
+ * @see f_macro_uint8ss_t_resize()
+ */
+#if !defined(_di_fl_type_uint8ss_increase_) || !defined(_di_fl_type_uint8ss_increase_by_)
+  extern f_return_status private_fl_type_uint8ss_resize(const f_array_length_t length, f_uint8ss_t *uint8ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint8ss_increase_) || !defined(_di_fl_type_uint8ss_increase_by_)
+
+/**
+ * Private implementation for deleting the int16s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int16s
+ *   The int16s array to delete.
+ */
+#if !defined(_di_fl_type_int16s_delete_)
+  extern void private_fl_type_int16s_delete(f_int16s_t *int16s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int16s_delete_)
+
+/**
+ * Private implementation for resizing the int16s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int16s
+ *   The int16s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int16s_t_resize().
+ *
+ * @see f_macro_int16s_t_resize()
+ */
+#if !defined(_di_fl_type_int16s_increase_) || !defined(_di_fl_type_int16s_increase_by_)
+  extern f_return_status private_fl_type_int16s_resize(const f_array_length_t length, f_int16s_t *int16s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int16s_increase_) || !defined(_di_fl_type_int16s_increase_by_)
+
+/**
+ * Private implementation for deleting the int16ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int16ss
+ *   The int16ss array to delete.
+ */
+#if !defined(_di_fl_type_int16ss_delete_)
+  extern void private_fl_type_int16ss_delete(f_int16ss_t *int16ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int16ss_delete_)
+
+/**
+ * Private implementation for resizing the int16ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int16ss
+ *   The int16ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int16ss_t_resize().
+ *
+ * @see f_macro_int16ss_t_resize()
+ */
+#if !defined(_di_fl_type_int16ss_increase_) || !defined(_di_fl_type_int16ss_increase_by_)
+  extern f_return_status private_fl_type_int16ss_resize(const f_array_length_t length, f_int16ss_t *int16ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int16ss_increase_) || !defined(_di_fl_type_int16ss_increase_by_)
+
+/**
+ * Private implementation for deleting the uint16s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint16s
+ *   The uint16s array to delete.
+ */
+#if !defined(_di_fl_type_uint16s_delete_)
+  extern void private_fl_type_uint16s_delete(f_uint16s_t *uint16s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint16s_delete_)
+
+/**
+ * Private implementation for resizing the uint16s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint16s
+ *   The uint16s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint16s_t_resize().
+ *
+ * @see f_macro_uint16s_t_resize()
+ */
+#if !defined(_di_fl_type_uint16s_increase_) || !defined(_di_fl_type_uint16s_increase_by_)
+  extern f_return_status private_fl_type_uint16s_resize(const f_array_length_t length, f_uint16s_t *uint16s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint16s_increase_) || !defined(_di_fl_type_uint16s_increase_by_)
+
+/**
+ * Private implementation for deleting the uint16ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint16ss
+ *   The uint16ss array to delete.
+ */
+#if !defined(_di_fl_type_uint16ss_delete_)
+  extern void private_fl_type_uint16ss_delete(f_uint16ss_t *uint16ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint16ss_delete_)
+
+/**
+ * Private implementation for resizing the uint16ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint16ss
+ *   The uint16ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint16ss_t_resize().
+ *
+ * @see f_macro_uint16ss_t_resize()
+ */
+#if !defined(_di_fl_type_uint16ss_increase_) || !defined(_di_fl_type_uint16ss_increase_by_)
+  extern f_return_status private_fl_type_uint16ss_resize(const f_array_length_t length, f_uint16ss_t *uint16ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint16ss_increase_) || !defined(_di_fl_type_uint16ss_increase_by_)
+
+/**
+ * Private implementation for deleting the int32s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int32s
+ *   The int32s array to delete.
+ */
+#if !defined(_di_fl_type_int32s_delete_)
+  extern void private_fl_type_int32s_delete(f_int32s_t *int32s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int32s_delete_)
+
+/**
+ * Private implementation for resizing the int32s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int32s
+ *   The int32s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int32s_t_resize().
+ *
+ * @see f_macro_int32s_t_resize()
+ */
+#if !defined(_di_fl_type_int32s_increase_) || !defined(_di_fl_type_int32s_increase_by_)
+  extern f_return_status private_fl_type_int32s_resize(const f_array_length_t length, f_int32s_t *int32s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int32s_increase_) || !defined(_di_fl_type_int32s_increase_by_)
+
+/**
+ * Private implementation for deleting the int32ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int32ss
+ *   The int32ss array to delete.
+ */
+#if !defined(_di_fl_type_int32ss_delete_)
+  extern void private_fl_type_int32ss_delete(f_int32ss_t *int32ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int32ss_delete_)
+
+/**
+ * Private implementation for resizing the int32ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int32ss
+ *   The int32ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int32ss_t_resize().
+ *
+ * @see f_macro_int32ss_t_resize()
+ */
+#if !defined(_di_fl_type_int32ss_increase_) || !defined(_di_fl_type_int32ss_increase_by_)
+  extern f_return_status private_fl_type_int32ss_resize(const f_array_length_t length, f_int32ss_t *int32ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int32ss_increase_) || !defined(_di_fl_type_int32ss_increase_by_)
+
+/**
+ * Private implementation for deleting the uint32s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint32s
+ *   The uint32s array to delete.
+ */
+#if !defined(_di_fl_type_uint32s_delete_)
+  extern void private_fl_type_uint32s_delete(f_uint32s_t *uint32s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint32s_delete_)
+
+/**
+ * Private implementation for resizing the uint32s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint32s
+ *   The uint32s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint32s_t_resize().
+ *
+ * @see f_macro_uint32s_t_resize()
+ */
+#if !defined(_di_fl_type_uint32s_increase_) || !defined(_di_fl_type_uint32s_increase_by_)
+  extern f_return_status private_fl_type_uint32s_resize(const f_array_length_t length, f_uint32s_t *uint32s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint32s_increase_) || !defined(_di_fl_type_uint32s_increase_by_)
+
+/**
+ * Private implementation for deleting the uint32ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint32ss
+ *   The uint32ss array to delete.
+ */
+#if !defined(_di_fl_type_uint32ss_delete_)
+  extern void private_fl_type_uint32ss_delete(f_uint32ss_t *uint32ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint32ss_delete_)
+
+/**
+ * Private implementation for resizing the uint32ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint32ss
+ *   The uint32ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint32ss_t_resize().
+ *
+ * @see f_macro_uint32ss_t_resize()
+ */
+#if !defined(_di_fl_type_uint32ss_increase_) || !defined(_di_fl_type_uint32ss_increase_by_)
+  extern f_return_status private_fl_type_uint32ss_resize(const f_array_length_t length, f_uint32ss_t *uint32ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint32ss_increase_) || !defined(_di_fl_type_uint32ss_increase_by_)
+
+/**
+ * Private implementation for deleting the int64s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int64s
+ *   The int64s array to delete.
+ */
+#if !defined(_di_fl_type_int64s_delete_)
+  extern void private_fl_type_int64s_delete(f_int64s_t *int64s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int64s_delete_)
+
+/**
+ * Private implementation for resizing the int64s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int64s
+ *   The int64s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int64s_t_resize().
+ *
+ * @see f_macro_int64s_t_resize()
+ */
+#if !defined(_di_fl_type_int64s_increase_) || !defined(_di_fl_type_int64s_increase_by_)
+  extern f_return_status private_fl_type_int64s_resize(const f_array_length_t length, f_int64s_t *int64s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int64s_increase_) || !defined(_di_fl_type_int64s_increase_by_)
+
+/**
+ * Private implementation for deleting the int64ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int64ss
+ *   The int64ss array to delete.
+ */
+#if !defined(_di_fl_type_int64ss_delete_)
+  extern void private_fl_type_int64ss_delete(f_int64ss_t *int64ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int64ss_delete_)
+
+/**
+ * Private implementation for resizing the int64ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int64ss
+ *   The int64ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int64ss_t_resize().
+ *
+ * @see f_macro_int64ss_t_resize()
+ */
+#if !defined(_di_fl_type_int64ss_increase_) || !defined(_di_fl_type_int64ss_increase_by_)
+  extern f_return_status private_fl_type_int64ss_resize(const f_array_length_t length, f_int64ss_t *int64ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int64ss_increase_) || !defined(_di_fl_type_int64ss_increase_by_)
+
+/**
+ * Private implementation for deleting the uint64s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint64s
+ *   The uint64s array to delete.
+ */
+#if !defined(_di_fl_type_uint64s_delete_)
+  extern void private_fl_type_uint64s_delete(f_uint64s_t *uint64s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint64s_delete_)
+
+/**
+ * Private implementation for resizing the uint64s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint64s
+ *   The uint64s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint64s_t_resize().
+ *
+ * @see f_macro_uint64s_t_resize()
+ */
+#if !defined(_di_fl_type_uint64s_increase_) || !defined(_di_fl_type_uint64s_increase_by_)
+  extern f_return_status private_fl_type_uint64s_resize(const f_array_length_t length, f_uint64s_t *uint64s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint64s_increase_) || !defined(_di_fl_type_uint64s_increase_by_)
+
+/**
+ * Private implementation for deleting the uint64ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint64ss
+ *   The uint64ss array to delete.
+ */
+#if !defined(_di_fl_type_uint64ss_delete_)
+  extern void private_fl_type_uint64ss_delete(f_uint64ss_t *uint64ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint64ss_delete_)
+
+/**
+ * Private implementation for resizing the uint64ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint64ss
+ *   The uint64ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint64ss_t_resize().
+ *
+ * @see f_macro_uint64ss_t_resize()
+ */
+#if !defined(_di_fl_type_uint64ss_increase_) || !defined(_di_fl_type_uint64ss_increase_by_)
+  extern f_return_status private_fl_type_uint64ss_resize(const f_array_length_t length, f_uint64ss_t *uint64ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint64ss_increase_) || !defined(_di_fl_type_uint64ss_increase_by_)
+
+/**
+ * Private implementation for deleting the int128s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int128s
+ *   The int128s array to delete.
+ */
+#if !defined(_di_fl_type_int128s_delete_)
+  extern void private_fl_type_int128s_delete(f_int128s_t *int128s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int128s_delete_)
+
+/**
+ * Private implementation for resizing the int128s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int128s
+ *   The int128s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int128s_t_resize().
+ *
+ * @see f_macro_int128s_t_resize()
+ */
+#if !defined(_di_fl_type_int128s_increase_) || !defined(_di_fl_type_int128s_increase_by_)
+  extern f_return_status private_fl_type_int128s_resize(const f_array_length_t length, f_int128s_t *int128s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int128s_increase_) || !defined(_di_fl_type_int128s_increase_by_)
+
+/**
+ * Private implementation for deleting the int128ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param int128ss
+ *   The int128ss array to delete.
+ */
+#if !defined(_di_fl_type_int128ss_delete_)
+  extern void private_fl_type_int128ss_delete(f_int128ss_t *int128ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int128ss_delete_)
+
+/**
+ * Private implementation for resizing the int128ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param int128ss
+ *   The int128ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_int128ss_t_resize().
+ *
+ * @see f_macro_int128ss_t_resize()
+ */
+#if !defined(_di_fl_type_int128ss_increase_) || !defined(_di_fl_type_int128ss_increase_by_)
+  extern f_return_status private_fl_type_int128ss_resize(const f_array_length_t length, f_int128ss_t *int128ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_int128ss_increase_) || !defined(_di_fl_type_int128ss_increase_by_)
+
+/**
+ * Private implementation for deleting the uint128s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint128s
+ *   The uint128s array to delete.
+ */
+#if !defined(_di_fl_type_uint128s_delete_)
+  extern void private_fl_type_uint128s_delete(f_uint128s_t *uint128s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint128s_delete_)
+
+/**
+ * Private implementation for resizing the uint128s array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint128s
+ *   The uint128s array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint128s_t_resize().
+ *
+ * @see f_macro_uint128s_t_resize()
+ */
+#if !defined(_di_fl_type_uint128s_increase_) || !defined(_di_fl_type_uint128s_increase_by_)
+  extern f_return_status private_fl_type_uint128s_resize(const f_array_length_t length, f_uint128s_t *uint128s) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint128s_increase_) || !defined(_di_fl_type_uint128s_increase_by_)
+
+/**
+ * Private implementation for deleting the uint128ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param uint128ss
+ *   The uint128ss array to delete.
+ */
+#if !defined(_di_fl_type_uint128ss_delete_)
+  extern void private_fl_type_uint128ss_delete(f_uint128ss_t *uint128ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint128ss_delete_)
+
+/**
+ * Private implementation for resizing the uint128ss array.
+ *
+ * Intended to be shared to each of the different implementation variations.
+ *
+ * @param length
+ *   The length to resize to.
+ * @param uint128ss
+ *   The uint128ss array to resize.
+ *
+ * @return
+ *   F_none on success.
+ *
+ *   Errors (with error bit) from: f_macro_uint128ss_t_resize().
+ *
+ * @see f_macro_uint128ss_t_resize()
+ */
+#if !defined(_di_fl_type_uint128ss_increase_) || !defined(_di_fl_type_uint128ss_increase_by_)
+  extern f_return_status private_fl_type_uint128ss_resize(const f_array_length_t length, f_uint128ss_t *uint128ss) f_gcc_attribute_visibility_internal;
+#endif // !defined(_di_fl_type_uint128ss_increase_) || !defined(_di_fl_type_uint128ss_increase_by_)
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // _PRIVATE_FL_type_h
index a04b61f15bbaed9c693253ebc8db68cdf08b6b95..e30014f506613895fc926ad46299a5c1e26d62d4 100644 (file)
@@ -1,11 +1,27 @@
 #include "type.h"
+#include "private-type.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifndef _di_fl_type_cells_delete_
+  f_return_status fl_type_cells_delete(f_cells_t *cells) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!cells) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_cells_delete(cells);
+
+    return F_none;
+  }
+#endif // _di_fl_type_cells_delete_
+
 #ifndef _di_fl_type_cells_increase_
   f_return_status fl_type_cells_increase(f_cells_t *cells) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!cells) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (cells->used + 1 > cells->size) {
       f_array_length_t size = cells->used + f_memory_default_allocation_step;
@@ -18,11 +34,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_cells_t_resize(status, (*cells), size);
-
-      return status;
+      private_fl_type_cells_resize(size, cells);
     }
 
     return F_none;
@@ -31,25 +43,39 @@ extern "C" {
 
 #ifndef _di_fl_type_cells_increase_by_
   f_return_status fl_type_cells_increase_by(const f_array_length_t amount, f_cells_t *cells) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!cells) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (cells->used + amount > cells->size) {
       if (cells->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_cells_t_resize(status, (*cells), cells->used + amount);
-
-      return status;
+      private_fl_type_cells_resize(cells->used + amount, cells);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_cells_increase_by_
 
+#ifndef _di_fl_type_cellss_delete_
+  f_return_status fl_type_cellss_delete(f_cellss_t *cellss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!cellss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_cellss_delete(cellss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_cellss_delete_
+
 #ifndef _di_fl_type_cellss_increase_
   f_return_status fl_type_cellss_increase(f_cellss_t *cellss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!cellss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (cellss->used + 1 > cellss->size) {
       f_array_length_t size = cellss->used + f_memory_default_allocation_step;
@@ -62,11 +88,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_cellss_t_resize(status, (*cellss), size);
-
-      return status;
+      private_fl_type_cellss_resize(size, cellss);
     }
 
     return F_none;
@@ -75,25 +97,39 @@ extern "C" {
 
 #ifndef _di_fl_type_cellss_increase_by_
   f_return_status fl_type_cellss_increase_by(const f_array_length_t amount, f_cellss_t *cellss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!cellss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (cellss->used + amount > cellss->size) {
       if (cellss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_cellss_t_resize(status, (*cellss), cellss->used + amount);
-
-      return status;
+      private_fl_type_cellss_resize(cellss->used + amount, cellss);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_cellss_increase_by_
 
+#ifndef _di_fl_type_array_lengths_delete_
+  f_return_status fl_type_array_lengths_delete(f_array_lengths_t *lengths) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!lengths) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_array_lengths_delete(lengths);
+
+    return F_none;
+  }
+#endif // _di_fl_type_array_lengths_delete_
+
 #ifndef _di_fl_type_array_lengths_increase_
   f_return_status fl_type_array_lengths_increase(f_array_lengths_t *lengths) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!lengths) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (lengths->used + 1 > lengths->size) {
       f_array_length_t size = lengths->used + f_memory_default_allocation_step;
@@ -106,11 +142,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_array_lengths_t_resize(status, (*lengths), size);
-
-      return status;
+      private_fl_type_array_lengths_resize(size, lengths);
     }
 
     return F_none;
@@ -119,25 +151,39 @@ extern "C" {
 
 #ifndef _di_fl_type_array_lengths_increase_by_
   f_return_status fl_type_array_lengths_increase_by(const f_array_length_t amount, f_array_lengths_t *lengths) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!lengths) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (lengths->used + amount > lengths->size) {
       if (lengths->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_array_lengths_t_resize(status, (*lengths), lengths->used + amount);
-
-      return status;
+      private_fl_type_array_lengths_resize(lengths->used + amount, lengths);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_array_lengths_increase_by_
 
+#ifndef _di_fl_type_array_lengthss_delete_
+  f_return_status fl_type_array_lengthss_delete(f_array_lengthss_t *lengthss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!lengthss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_array_lengthss_delete(lengthss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_array_lengthss_delete_
+
 #ifndef _di_fl_type_array_lengthss_increase_
   f_return_status fl_type_array_lengthss_increase(f_array_lengthss_t *lengthss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!lengthss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (lengthss->used + 1 > lengthss->size) {
       f_array_length_t size = lengthss->used + f_memory_default_allocation_step;
@@ -150,11 +196,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_array_lengthss_t_resize(status, (*lengthss), size);
-
-      return status;
+      private_fl_type_array_lengthss_resize(size, lengthss);
     }
 
     return F_none;
@@ -163,25 +205,39 @@ extern "C" {
 
 #ifndef _di_fl_type_array_lengthss_increase_by_
   f_return_status fl_type_array_lengthss_increase_by(const f_array_length_t amount, f_array_lengthss_t *lengthss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!lengthss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (lengthss->used + amount > lengthss->size) {
       if (lengthss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_array_lengthss_t_resize(status, (*lengthss), lengthss->used + amount);
-
-      return status;
+      private_fl_type_array_lengthss_resize(lengthss->used + amount, lengthss);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_array_lengthss_increase_by_
 
+#ifndef _di_fl_type_int8s_delete_
+  f_return_status fl_type_int8s_delete(f_int8s_t *int8s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int8s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int8s_delete(int8s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int8s_delete_
+
 #ifndef _di_fl_type_int8s_increase_
   f_return_status fl_type_int8s_increase(f_int8s_t *int8s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int8s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int8s->used + 1 > int8s->size) {
       f_array_length_t size = int8s->used + f_memory_default_allocation_step;
@@ -194,11 +250,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int8s_t_resize(status, (*int8s), size);
-
-      return status;
+      private_fl_type_int8s_resize(size, int8s);
     }
 
     return F_none;
@@ -207,25 +259,39 @@ extern "C" {
 
 #ifndef _di_fl_type_int8s_increase_by_
   f_return_status fl_type_int8s_increase_by(const f_array_length_t amount, f_int8s_t *int8s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int8s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int8s->used + amount > int8s->size) {
       if (int8s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int8s_t_resize(status, (*int8s), int8s->used + amount);
-
-      return status;
+      private_fl_type_int8s_resize(int8s->used + amount, int8s);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_int8s_increase_by_
 
+#ifndef _di_fl_type_int8ss_delete_
+  f_return_status fl_type_int8ss_delete(f_int8ss_t *int8ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int8ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int8ss_delete(int8ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int8ss_delete_
+
 #ifndef _di_fl_type_int8ss_increase_
   f_return_status fl_type_int8ss_increase(f_int8ss_t *int8ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int8ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int8ss->used + 1 > int8ss->size) {
       f_array_length_t size = int8ss->used + f_memory_default_allocation_step;
@@ -238,11 +304,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int8ss_t_resize(status, (*int8ss), size);
-
-      return status;
+      private_fl_type_int8ss_resize(size, int8ss);
     }
 
     return F_none;
@@ -251,25 +313,39 @@ extern "C" {
 
 #ifndef _di_fl_type_int8ss_increase_by_
   f_return_status fl_type_int8ss_increase_by(const f_array_length_t amount, f_int8ss_t *int8ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int8ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int8ss->used + amount > int8ss->size) {
       if (int8ss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int8ss_t_resize(status, (*int8ss), int8ss->used + amount);
-
-      return status;
+      private_fl_type_int8ss_resize(int8ss->used + amount, int8ss);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_int8ss_increase_by_
 
+#ifndef _di_fl_type_uint8s_delete_
+  f_return_status fl_type_uint8s_delete(f_uint8s_t *uint8s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint8s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint8s_delete(uint8s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint8s_delete_
+
 #ifndef _di_fl_type_uint8s_increase_
   f_return_status fl_type_uint8s_increase(f_uint8s_t *uint8s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint8s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint8s->used + 1 > uint8s->size) {
       f_array_length_t size = uint8s->used + f_memory_default_allocation_step;
@@ -282,11 +358,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint8s_t_resize(status, (*uint8s), size);
-
-      return status;
+      private_fl_type_uint8s_resize(size, uint8s);
     }
 
     return F_none;
@@ -295,25 +367,39 @@ extern "C" {
 
 #ifndef _di_fl_type_uint8s_increase_by_
   f_return_status fl_type_uint8s_increase_by(const f_array_length_t amount, f_uint8s_t *uint8s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint8s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint8s->used + amount > uint8s->size) {
       if (uint8s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint8s_t_resize(status, (*uint8s), uint8s->used + amount);
-
-      return status;
+      private_fl_type_uint8s_resize(uint8s->used + amount, uint8s);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_uint8s_increase_by_
 
+#ifndef _di_fl_type_uint8ss_delete_
+  f_return_status fl_type_uint8ss_delete(f_uint8ss_t *uint8ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint8ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint8ss_delete(uint8ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint8ss_delete_
+
 #ifndef _di_fl_type_uint8ss_increase_
   f_return_status fl_type_uint8ss_increase(f_uint8ss_t *uint8ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint8ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint8ss->used + 1 > uint8ss->size) {
       f_array_length_t size = uint8ss->used + f_memory_default_allocation_step;
@@ -326,11 +412,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint8ss_t_resize(status, (*uint8ss), size);
-
-      return status;
+      private_fl_type_uint8ss_resize(size, uint8ss);
     }
 
     return F_none;
@@ -339,25 +421,39 @@ extern "C" {
 
 #ifndef _di_fl_type_uint8ss_increase_by_
   f_return_status fl_type_uint8ss_increase_by(const f_array_length_t amount, f_uint8ss_t *uint8ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint8ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint8ss->used + amount > uint8ss->size) {
       if (uint8ss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint8ss_t_resize(status, (*uint8ss), uint8ss->used + amount);
-
-      return status;
+      private_fl_type_uint8ss_resize(uint8ss->used + amount, uint8ss);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_uint8ss_increase_by_
 
+#ifndef _di_fl_type_int16s_delete_
+  f_return_status fl_type_int16s_delete(f_int16s_t *int16s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int16s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int16s_delete(int16s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int16s_delete_
+
 #ifndef _di_fl_type_int16s_increase_
   f_return_status fl_type_int16s_increase(f_int16s_t *int16s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int16s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int16s->used + 1 > int16s->size) {
       f_array_length_t size = int16s->used + f_memory_default_allocation_step;
@@ -370,11 +466,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int16s_t_resize(status, (*int16s), size);
-
-      return status;
+      private_fl_type_int16s_resize(size, int16s);
     }
 
     return F_none;
@@ -383,25 +475,39 @@ extern "C" {
 
 #ifndef _di_fl_type_int16s_increase_by_
   f_return_status fl_type_int16s_increase_by(const f_array_length_t amount, f_int16s_t *int16s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int16s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int16s->used + amount > int16s->size) {
       if (int16s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int16s_t_resize(status, (*int16s), int16s->used + amount);
-
-      return status;
+      private_fl_type_int16s_resize(int16s->used + amount, int16s);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_int16s_increase_by_
 
+#ifndef _di_fl_type_int16ss_delete_
+  f_return_status fl_type_int16ss_delete(f_int16ss_t *int16ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int16ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int16ss_delete(int16ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int16ss_delete_
+
 #ifndef _di_fl_type_int16ss_increase_
   f_return_status fl_type_int16ss_increase(f_int16ss_t *int16ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int16ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int16ss->used + 1 > int16ss->size) {
       f_array_length_t size = int16ss->used + f_memory_default_allocation_step;
@@ -414,11 +520,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int16ss_t_resize(status, (*int16ss), size);
-
-      return status;
+      private_fl_type_int16ss_resize(size, int16ss);
     }
 
     return F_none;
@@ -427,25 +529,39 @@ extern "C" {
 
 #ifndef _di_fl_type_int16ss_increase_by_
   f_return_status fl_type_int16ss_increase_by(const f_array_length_t amount, f_int16ss_t *int16ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int16ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int16ss->used + amount > int16ss->size) {
       if (int16ss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int16ss_t_resize(status, (*int16ss), int16ss->used + amount);
-
-      return status;
+      private_fl_type_int16ss_resize(int16ss->used + amount, int16ss);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_int16ss_increase_by_
 
+#ifndef _di_fl_type_uint16s_delete_
+  f_return_status fl_type_uint16s_delete(f_uint16s_t *uint16s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint16s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint16s_delete(uint16s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint16s_delete_
+
 #ifndef _di_fl_type_uint16s_increase_
   f_return_status fl_type_uint16s_increase(f_uint16s_t *uint16s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint16s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint16s->used + 1 > uint16s->size) {
       f_array_length_t size = uint16s->used + f_memory_default_allocation_step;
@@ -458,11 +574,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint16s_t_resize(status, (*uint16s), size);
-
-      return status;
+      private_fl_type_uint16s_resize(size, uint16s);
     }
 
     return F_none;
@@ -471,25 +583,39 @@ extern "C" {
 
 #ifndef _di_fl_type_uint16s_increase_by_
   f_return_status fl_type_uint16s_increase_by(const f_array_length_t amount, f_uint16s_t *uint16s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint16s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint16s->used + amount > uint16s->size) {
       if (uint16s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint16s_t_resize(status, (*uint16s), uint16s->used + amount);
-
-      return status;
+      private_fl_type_uint16s_resize(uint16s->used + amount, uint16s);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_uint16s_increase_by_
 
+#ifndef _di_fl_type_uint16ss_delete_
+  f_return_status fl_type_uint16ss_delete(f_uint16ss_t *uint16ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint16ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint16ss_delete(uint16ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint16ss_delete_
+
 #ifndef _di_fl_type_uint16ss_increase_
   f_return_status fl_type_uint16ss_increase(f_uint16ss_t *uint16ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint16ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint16ss->used + 1 > uint16ss->size) {
       f_array_length_t size = uint16ss->used + f_memory_default_allocation_step;
@@ -502,11 +628,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint16ss_t_resize(status, (*uint16ss), size);
-
-      return status;
+      private_fl_type_uint16ss_resize(size, uint16ss);
     }
 
     return F_none;
@@ -515,25 +637,39 @@ extern "C" {
 
 #ifndef _di_fl_type_uint16ss_increase_by_
   f_return_status fl_type_uint16ss_increase_by(const f_array_length_t amount, f_uint16ss_t *uint16ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint16ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint16ss->used + amount > uint16ss->size) {
       if (uint16ss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint16ss_t_resize(status, (*uint16ss), uint16ss->used + amount);
-
-      return status;
+      private_fl_type_uint16ss_resize(uint16ss->used + amount, uint16ss);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_uint16ss_increase_by_
 
+#ifndef _di_fl_type_int32s_delete_
+  f_return_status fl_type_int32s_delete(f_int32s_t *int32s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int32s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int32s_delete(int32s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int32s_delete_
+
 #ifndef _di_fl_type_int32s_increase_
   f_return_status fl_type_int32s_increase(f_int32s_t *int32s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int32s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int32s->used + 1 > int32s->size) {
       f_array_length_t size = int32s->used + f_memory_default_allocation_step;
@@ -546,11 +682,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int32s_t_resize(status, (*int32s), size);
-
-      return status;
+      private_fl_type_int32s_resize(size, int32s);
     }
 
     return F_none;
@@ -559,25 +691,39 @@ extern "C" {
 
 #ifndef _di_fl_type_int32s_increase_by_
   f_return_status fl_type_int32s_increase_by(const f_array_length_t amount, f_int32s_t *int32s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int32s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int32s->used + amount > int32s->size) {
       if (int32s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int32s_t_resize(status, (*int32s), int32s->used + amount);
-
-      return status;
+      private_fl_type_int32s_resize(int32s->used + amount, int32s);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_int32s_increase_by_
 
+#ifndef _di_fl_type_int32ss_delete_
+  f_return_status fl_type_int32ss_delete(f_int32ss_t *int32ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int32ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int32ss_delete(int32ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int32ss_delete_
+
 #ifndef _di_fl_type_int32ss_increase_
   f_return_status fl_type_int32ss_increase(f_int32ss_t *int32ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int32ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int32ss->used + 1 > int32ss->size) {
       f_array_length_t size = int32ss->used + f_memory_default_allocation_step;
@@ -590,11 +736,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int32ss_t_resize(status, (*int32ss), size);
-
-      return status;
+      private_fl_type_int32ss_resize(size, int32ss);
     }
 
     return F_none;
@@ -603,25 +745,39 @@ extern "C" {
 
 #ifndef _di_fl_type_int32ss_increase_by_
   f_return_status fl_type_int32ss_increase_by(const f_array_length_t amount, f_int32ss_t *int32ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int32ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int32ss->used + amount > int32ss->size) {
       if (int32ss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int32ss_t_resize(status, (*int32ss), int32ss->used + amount);
-
-      return status;
+      private_fl_type_int32ss_resize(int32ss->used + amount, int32ss);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_int32ss_increase_by_
 
+#ifndef _di_fl_type_uint32s_delete_
+  f_return_status fl_type_uint32s_delete(f_uint32s_t *uint32s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint32s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint32s_delete(uint32s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint32s_delete_
+
 #ifndef _di_fl_type_uint32s_increase_
   f_return_status fl_type_uint32s_increase(f_uint32s_t *uint32s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint32s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint32s->used + 1 > uint32s->size) {
       f_array_length_t size = uint32s->used + f_memory_default_allocation_step;
@@ -634,11 +790,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint32s_t_resize(status, (*uint32s), size);
-
-      return status;
+      private_fl_type_uint32s_resize(size, uint32s);
     }
 
     return F_none;
@@ -647,25 +799,39 @@ extern "C" {
 
 #ifndef _di_fl_type_uint32s_increase_by_
   f_return_status fl_type_uint32s_increase_by(const f_array_length_t amount, f_uint32s_t *uint32s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint32s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint32s->used + amount > uint32s->size) {
       if (uint32s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint32s_t_resize(status, (*uint32s), uint32s->used + amount);
-
-      return status;
+      private_fl_type_uint32s_resize(uint32s->used + amount, uint32s);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_uint32s_increase_by_
 
+#ifndef _di_fl_type_uint32ss_delete_
+  f_return_status fl_type_uint32ss_delete(f_uint32ss_t *uint32ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint32ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint32ss_delete(uint32ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint32ss_delete_
+
 #ifndef _di_fl_type_uint32ss_increase_
   f_return_status fl_type_uint32ss_increase(f_uint32ss_t *uint32ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint32ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint32ss->used + 1 > uint32ss->size) {
       f_array_length_t size = uint32ss->used + f_memory_default_allocation_step;
@@ -678,11 +844,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint32ss_t_resize(status, (*uint32ss), size);
-
-      return status;
+      private_fl_type_uint32ss_resize(size, uint32ss);
     }
 
     return F_none;
@@ -691,25 +853,39 @@ extern "C" {
 
 #ifndef _di_fl_type_uint32ss_increase_by_
   f_return_status fl_type_uint32ss_increase_by(const f_array_length_t amount, f_uint32ss_t *uint32ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint32ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint32ss->used + amount > uint32ss->size) {
       if (uint32ss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint32ss_t_resize(status, (*uint32ss), uint32ss->used + amount);
-
-      return status;
+      private_fl_type_uint32ss_resize(uint32ss->used + amount, uint32ss);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_uint32ss_increase_by_
 
+#ifndef _di_fl_type_int64s_delete_
+  f_return_status fl_type_int64s_delete(f_int64s_t *int64s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int64s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int64s_delete(int64s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int64s_delete_
+
 #ifndef _di_fl_int64s_increase_
   f_return_status fl_int64s_increase(f_int64s_t *int64s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int64s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int64s->used + 1 > int64s->size) {
       f_array_length_t size = int64s->used + f_memory_default_allocation_step;
@@ -722,11 +898,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int64s_t_resize(status, (*int64s), size);
-
-      return status;
+      private_fl_type_int64s_resize(size, int64s);
     }
 
     return F_none;
@@ -735,25 +907,39 @@ extern "C" {
 
 #ifndef _di_fl_int64s_increase_by_
   f_return_status fl_int64s_increase_by(const f_array_length_t amount, f_int64s_t *int64s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int64s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int64s->used + amount > int64s->size) {
       if (int64s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int64s_t_resize(status, (*int64s), int64s->used + amount);
-
-      return status;
+      private_fl_type_int64s_resize(int64s->used + amount, int64s);
     }
 
     return F_none;
   }
 #endif // _di_fl_int64s_increase_by_
 
+#ifndef _di_fl_type_int64ss_delete_
+  f_return_status fl_type_int64ss_delete(f_int64ss_t *int64ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int64ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int64ss_delete(int64ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int64ss_delete_
+
 #ifndef _di_fl_int64ss_increase_
   f_return_status fl_int64ss_increase(f_int64ss_t *int64ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int64ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int64ss->used + 1 > int64ss->size) {
       f_array_length_t size = int64ss->used + f_memory_default_allocation_step;
@@ -766,11 +952,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int64ss_t_resize(status, (*int64ss), size);
-
-      return status;
+      private_fl_type_int64ss_resize(size, int64ss);
     }
 
     return F_none;
@@ -779,25 +961,39 @@ extern "C" {
 
 #ifndef _di_fl_int64ss_increase_by_
   f_return_status fl_int64ss_increase_by(const f_array_length_t amount, f_int64ss_t *int64ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int64ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int64ss->used + amount > int64ss->size) {
       if (int64ss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int64ss_t_resize(status, (*int64ss), int64ss->used + amount);
-
-      return status;
+      private_fl_type_int64ss_resize(int64ss->used + amount, int64ss);
     }
 
     return F_none;
   }
 #endif // _di_fl_int64ss_increase_by_
 
+#ifndef _di_fl_type_uint64s_delete_
+  f_return_status fl_type_uint64s_delete(f_uint64s_t *uint64s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint64s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint64s_delete(uint64s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint64s_delete_
+
 #ifndef _di_fl_uint64s_increase_
   f_return_status fl_uint64s_increase(f_uint64s_t *uint64s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint64s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint64s->used + 1 > uint64s->size) {
       f_array_length_t size = uint64s->used + f_memory_default_allocation_step;
@@ -810,11 +1006,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint64s_t_resize(status, (*uint64s), size);
-
-      return status;
+      private_fl_type_uint64s_resize(size, uint64s);
     }
 
     return F_none;
@@ -823,25 +1015,39 @@ extern "C" {
 
 #ifndef _di_fl_uint64s_increase_by_
   f_return_status fl_uint64s_increase_by(const f_array_length_t amount, f_uint64s_t *uint64s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint64s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint64s->used + amount > uint64s->size) {
       if (uint64s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint64s_t_resize(status, (*uint64s), uint64s->used + amount);
-
-      return status;
+      private_fl_type_uint64s_resize(uint64s->used + amount, uint64s);
     }
 
     return F_none;
   }
 #endif // _di_fl_uint64s_increase_by_
 
+#ifndef _di_fl_type_uint64ss_delete_
+  f_return_status fl_type_uint64ss_delete(f_uint64ss_t *uint64ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint64ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint64ss_delete(uint64ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint64ss_delete_
+
 #ifndef _di_fl_uint64ss_increase_
   f_return_status fl_uint64ss_increase(f_uint64ss_t *uint64ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint64ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint64ss->used + 1 > uint64ss->size) {
       f_array_length_t size = uint64ss->used + f_memory_default_allocation_step;
@@ -854,11 +1060,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint64ss_t_resize(status, (*uint64ss), size);
-
-      return status;
+      private_fl_type_uint64ss_resize(size, uint64ss);
     }
 
     return F_none;
@@ -867,25 +1069,39 @@ extern "C" {
 
 #ifndef _di_fl_uint64ss_increase_by_
   f_return_status fl_uint64ss_increase_by(const f_array_length_t amount, f_uint64ss_t *uint64ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint64ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint64ss->used + amount > uint64ss->size) {
       if (uint64ss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint64ss_t_resize(status, (*uint64ss), uint64ss->used + amount);
-
-      return status;
+      private_fl_type_uint64ss_resize(uint64ss->used + amount, uint64ss);
     }
 
     return F_none;
   }
 #endif // _di_fl_uint64ss_increase_by_
 
+#ifndef _di_fl_type_int128s_delete_
+  f_return_status fl_type_int128s_delete(f_int128s_t *int128s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int128s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int128s_delete(int128s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int128s_delete_
+
 #ifndef _di_fl_type_int128s_increase_
   f_return_status fl_type_int128s_increase(f_int128s_t *int128s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int128s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int128s->used + 1 > int128s->size) {
       f_array_length_t size = int128s->used + f_memory_default_allocation_step;
@@ -898,11 +1114,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int128s_t_resize(status, (*int128s), size);
-
-      return status;
+      private_fl_type_int128s_resize(size, int128s);
     }
 
     return F_none;
@@ -911,25 +1123,39 @@ extern "C" {
 
 #ifndef _di_fl_type_int128s_increase_by_
   f_return_status fl_type_int128s_increase_by(const f_array_length_t amount, f_int128s_t *int128s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int128s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int128s->used + amount > int128s->size) {
       if (int128s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int128s_t_resize(status, (*int128s), int128s->used + amount);
-
-      return status;
+      private_fl_type_int128s_resize(int128s->used + amount, int128s);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_int128s_increase_by_
 
+#ifndef _di_fl_type_int128ss_delete_
+  f_return_status fl_type_int128ss_delete(f_int128ss_t *int128ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int128ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_int128ss_delete(int128ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_int128ss_delete_
+
 #ifndef _di_fl_type_int128ss_increase_
   f_return_status fl_type_int128ss_increase(f_int128ss_t *int128ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int128ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int128ss->used + 1 > int128ss->size) {
       f_array_length_t size = int128ss->used + f_memory_default_allocation_step;
@@ -942,11 +1168,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_int128ss_t_resize(status, (*int128ss), size);
-
-      return status;
+      private_fl_type_int128ss_resize(size, int128ss);
     }
 
     return F_none;
@@ -955,6 +1177,9 @@ extern "C" {
 
 #ifndef _di_fl_type_int128ss_increase_by_
   f_return_status fl_type_int128ss_increase_by(const f_array_length_t amount, f_int128ss_t *int128ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!int128ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (int128ss->used + amount > int128ss->size) {
       if (int128ss->used + amount > f_array_length_t_size) {
@@ -963,17 +1188,30 @@ extern "C" {
 
       f_status_t status = F_none;
 
-      f_macro_int128ss_t_resize(status, (*int128ss), int128ss->used + amount);
-
-      return status;
+      private_fl_type_int128ss_resize(int128ss->used + amount, int128ss);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_int128ss_increase_by_
 
+#ifndef _di_fl_type_uint128s_delete_
+  f_return_status fl_type_uint128s_delete(f_uint128s_t *uint128s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint128s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint128s_delete(uint128s);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint128s_delete_
+
 #ifndef _di_fl_type_uint128s_increase_
   f_return_status fl_type_uint128s_increase(f_uint128s_t *uint128s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint128s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint128s->used + 1 > uint128s->size) {
       f_array_length_t size = uint128s->used + f_memory_default_allocation_step;
@@ -986,11 +1224,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint128s_t_resize(status, (*uint128s), size);
-
-      return status;
+      private_fl_type_uint128s_resize(size, uint128s);
     }
 
     return F_none;
@@ -999,25 +1233,39 @@ extern "C" {
 
 #ifndef _di_fl_type_uint128s_increase_by_
   f_return_status fl_type_uint128s_increase_by(const f_array_length_t amount, f_uint128s_t *uint128s) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint128s) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint128s->used + amount > uint128s->size) {
       if (uint128s->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint128s_t_resize(status, (*uint128s), uint128s->used + amount);
-
-      return status;
+      private_fl_type_uint128s_resize(uint128s->used + amount, uint128s);
     }
 
     return F_none;
   }
 #endif // _di_fl_type_uint128s_increase_by_
 
+#ifndef _di_fl_type_uint128ss_delete_
+  f_return_status fl_type_uint128ss_delete(f_uint128ss_t *uint128ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint128ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
+
+    private_fl_type_uint128ss_delete(uint128ss);
+
+    return F_none;
+  }
+#endif // _di_fl_type_uint128ss_delete_
+
 #ifndef _di_fl_type_uint128ss_increase_
   f_return_status fl_type_uint128ss_increase(f_uint128ss_t *uint128ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint128ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint128ss->used + 1 > uint128ss->size) {
       f_array_length_t size = uint128ss->used + f_memory_default_allocation_step;
@@ -1030,11 +1278,7 @@ extern "C" {
         size = f_array_length_t_size;
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint128ss_t_resize(status, (*uint128ss), size);
-
-      return status;
+      private_fl_type_uint128ss_resize(size, uint128ss);
     }
 
     return F_none;
@@ -1043,17 +1287,16 @@ extern "C" {
 
 #ifndef _di_fl_type_uint128ss_increase_by_
   f_return_status fl_type_uint128ss_increase_by(const f_array_length_t amount, f_uint128ss_t *uint128ss) {
+    #ifndef _di_level_1_parameter_checking_
+      if (!uint128ss) return F_status_set_error(F_parameter);
+    #endif // _di_level_1_parameter_checking_
 
     if (uint128ss->used + amount > uint128ss->size) {
       if (uint128ss->used + amount > f_array_length_t_size) {
         return F_status_set_error(F_array_too_large);
       }
 
-      f_status_t status = F_none;
-
-      f_macro_uint128ss_t_resize(status, (*uint128ss), uint128ss->used + amount);
-
-      return status;
+      private_fl_type_uint128ss_resize(uint128ss->used + amount, uint128ss);
     }
 
     return F_none;
index bee7903003887f97abf783cb8b993165c7490a52..085906f3081c02abf6c10a8525b67217dd890551 100644 (file)
@@ -23,6 +23,22 @@ extern "C" {
 #endif
 
 /**
+ * Delete the cells array.
+ *
+ * @param cells
+ *   The cells array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_cells_t_delete_simple()
+ */
+#ifndef _di_fl_type_cells_delete_
+  extern f_return_status fl_type_cells_delete(f_cells_t *cells);
+#endif // _di_fl_type_cells_delete_
+
+/**
  * Increase the size of cells array, but only if necessary.
  *
  * @param cells
@@ -30,8 +46,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_cells_increase_
   extern f_return_status fl_type_cells_increase(f_cells_t *cells);
@@ -47,14 +64,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_cells_increase_by_
   extern f_return_status fl_type_cells_increase_by(const f_array_length_t amount, f_cells_t *cells);
 #endif // _di_fl_type_cells_increase_by_
 
 /**
+ * Delete the cellss array.
+ *
+ * @param cellss
+ *   The cellss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_cellss_t_delete_simple()
+ */
+#ifndef _di_fl_type_cellss_delete_
+  extern f_return_status fl_type_cellss_delete(f_cellss_t *cellss);
+#endif // _di_fl_type_cellss_delete_
+
+/**
  * Increase the size of cells array, but only if necessary.
  *
  * @param cells
@@ -62,8 +96,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_cellss_increase_
   extern f_return_status fl_type_cellss_increase(f_cellss_t *cellss);
@@ -79,14 +114,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_cellss_increase_by_
   extern f_return_status fl_type_cellss_increase_by(const f_array_length_t amount, f_cellss_t *cellss);
 #endif // _di_fl_type_cellss_increase_by_
 
 /**
+ * Delete the array_lengths array.
+ *
+ * @param array_lengths
+ *   The array_lengths array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_array_lengths_t_delete_simple()
+ */
+#ifndef _di_fl_type_array_lengths_delete_
+  extern f_return_status fl_type_array_lengths_delete(f_array_lengths_t *array_lengths);
+#endif // _di_fl_type_array_lengths_delete_
+
+/**
  * Increase the size of array_lengths array, but only if necessary.
  *
  * @param array_lengths
@@ -94,8 +146,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_array_lengths_increase_
   extern f_return_status fl_type_array_lengths_increase(f_array_lengths_t *array_lengths);
@@ -111,14 +164,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_array_lengths_increase_by_
   extern f_return_status fl_type_array_lengths_increase_by(const f_array_length_t amount, f_array_lengths_t *array_lengths);
 #endif // _di_fl_type_array_lengths_increase_by_
 
 /**
+ * Delete the array_lengthss array.
+ *
+ * @param array_lengthss
+ *   The array_lengthss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_array_lengthss_t_delete_simple()
+ */
+#ifndef _di_fl_type_array_lengthss_delete_
+  extern f_return_status fl_type_array_lengthss_delete(f_array_lengthss_t *array_lengthss);
+#endif // _di_fl_type_array_lengthss_delete_
+
+/**
  * Increase the size of array_lengths array, but only if necessary.
  *
  * @param array_lengths
@@ -126,8 +196,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_array_lengthss_increase_
   extern f_return_status fl_type_array_lengthss_increase(f_array_lengthss_t *array_lengthss);
@@ -143,14 +214,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_array_lengthss_increase_by_
   extern f_return_status fl_type_array_lengthss_increase_by(const f_array_length_t amount, f_array_lengthss_t *array_lengthss);
 #endif // _di_fl_type_array_lengthss_increase_by_
 
 /**
+ * Delete the int8s array.
+ *
+ * @param int8s
+ *   The int8s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int8s_t_delete_simple()
+ */
+#ifndef _di_fl_type_int8s_delete_
+  extern f_return_status fl_type_int8s_delete(f_int8s_t *int8s);
+#endif // _di_fl_type_int8s_delete_
+
+/**
  * Increase the size of int8s array, but only if necessary.
  *
  * @param int8s
@@ -158,8 +246,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int8s_increase_
   extern f_return_status fl_type_int8s_increase(f_int8s_t *int8s);
@@ -175,14 +264,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int8s_increase_by_
   extern f_return_status fl_type_int8s_increase_by(const f_array_length_t amount, f_int8s_t *int8s);
 #endif // _di_fl_type_int8s_increase_by_
 
 /**
+ * Delete the int8ss array.
+ *
+ * @param int8ss
+ *   The int8ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int8ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_int8ss_delete_
+  extern f_return_status fl_type_int8ss_delete(f_int8ss_t *int8ss);
+#endif // _di_fl_type_int8ss_delete_
+
+/**
  * Increase the size of int8s array, but only if necessary.
  *
  * @param int8s
@@ -190,8 +296,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int8ss_increase_
   extern f_return_status fl_type_int8ss_increase(f_int8ss_t *int8ss);
@@ -207,14 +314,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int8ss_increase_by_
   extern f_return_status fl_type_int8ss_increase_by(const f_array_length_t amount, f_int8ss_t *int8ss);
 #endif // _di_fl_type_int8ss_increase_by_
 
 /**
+ * Delete the uint8s array.
+ *
+ * @param uint8s
+ *   The uint8s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint8s_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint8s_delete_
+  extern f_return_status fl_type_uint8s_delete(f_uint8s_t *uint8s);
+#endif // _di_fl_type_uint8s_delete_
+
+/**
  * Increase the size of uint8s array, but only if necessary.
  *
  * @param uint8s
@@ -222,8 +346,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint8s_increase_
   extern f_return_status fl_type_uint8s_increase(f_uint8s_t *uint8s);
@@ -239,14 +364,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint8s_increase_by_
   extern f_return_status fl_type_uint8s_increase_by(const f_array_length_t amount, f_uint8s_t *uint8s);
 #endif // _di_fl_type_uint8s_increase_by_
 
 /**
+ * Delete the uint8ss array.
+ *
+ * @param uint8ss
+ *   The uint8ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint8ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint8ss_delete_
+  extern f_return_status fl_type_uint8ss_delete(f_uint8ss_t *uint8ss);
+#endif // _di_fl_type_uint8ss_delete_
+
+/**
  * Increase the size of uint8s array, but only if necessary.
  *
  * @param uint8s
@@ -254,8 +396,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint8ss_increase_
   extern f_return_status fl_type_uint8ss_increase(f_uint8ss_t *uint8ss);
@@ -271,14 +414,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint8ss_increase_by_
   extern f_return_status fl_type_uint8ss_increase_by(const f_array_length_t amount, f_uint8ss_t *uint8ss);
 #endif // _di_fl_type_uint8ss_increase_by_
 
 /**
+ * Delete the int16s array.
+ *
+ * @param int16s
+ *   The int16s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int16s_t_delete_simple()
+ */
+#ifndef _di_fl_type_int16s_delete_
+  extern f_return_status fl_type_int16s_delete(f_int16s_t *int16s);
+#endif // _di_fl_type_int16s_delete_
+
+/**
  * Increase the size of int16s array, but only if necessary.
  *
  * @param int16s
@@ -286,8 +446,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int16s_increase_
   extern f_return_status fl_type_int16s_increase(f_int16s_t *int16s);
@@ -303,14 +464,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int16s_increase_by_
   extern f_return_status fl_type_int16s_increase_by(const f_array_length_t amount, f_int16s_t *int16s);
 #endif // _di_fl_type_int16s_increase_by_
 
 /**
+ * Delete the int16ss array.
+ *
+ * @param int16ss
+ *   The int16ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int16ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_int16ss_delete_
+  extern f_return_status fl_type_int16ss_delete(f_int16ss_t *int16ss);
+#endif // _di_fl_type_int16ss_delete_
+
+/**
  * Increase the size of int16s array, but only if necessary.
  *
  * @param int16s
@@ -318,8 +496,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int16ss_increase_
   extern f_return_status fl_type_int16ss_increase(f_int16ss_t *int16ss);
@@ -335,14 +514,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int16ss_increase_by_
   extern f_return_status fl_type_int16ss_increase_by(const f_array_length_t amount, f_int16ss_t *int16ss);
 #endif // _di_fl_type_int16ss_increase_by_
 
 /**
+ * Delete the uint16s array.
+ *
+ * @param uint16s
+ *   The uint16s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint16s_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint16s_delete_
+  extern f_return_status fl_type_uint16s_delete(f_uint16s_t *uint16s);
+#endif // _di_fl_type_uint16s_delete_
+
+/**
  * Increase the size of uint16s array, but only if necessary.
  *
  * @param uint16s
@@ -350,8 +546,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint16s_increase_
   extern f_return_status fl_type_uint16s_increase(f_uint16s_t *uint16s);
@@ -367,14 +564,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint16s_increase_by_
   extern f_return_status fl_type_uint16s_increase_by(const f_array_length_t amount, f_uint16s_t *uint16s);
 #endif // _di_fl_type_uint16s_increase_by_
 
 /**
+ * Delete the uint16ss array.
+ *
+ * @param uint16ss
+ *   The uint16ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint16ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint16ss_delete_
+  extern f_return_status fl_type_uint16ss_delete(f_uint16ss_t *uint16ss);
+#endif // _di_fl_type_uint16ss_delete_
+
+/**
  * Increase the size of uint16s array, but only if necessary.
  *
  * @param uint16s
@@ -382,8 +596,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint16ss_increase_
   extern f_return_status fl_type_uint16ss_increase(f_uint16ss_t *uint16ss);
@@ -399,14 +614,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint16ss_increase_by_
   extern f_return_status fl_type_uint16ss_increase_by(const f_array_length_t amount, f_uint16ss_t *uint16ss);
 #endif // _di_fl_type_uint16ss_increase_by_
 
 /**
+ * Delete the int32s array.
+ *
+ * @param int32s
+ *   The int32s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int32s_t_delete_simple()
+ */
+#ifndef _di_fl_type_int32s_delete_
+  extern f_return_status fl_type_int32s_delete(f_int32s_t *int32s);
+#endif // _di_fl_type_int32s_delete_
+
+/**
  * Increase the size of int32s array, but only if necessary.
  *
  * @param int32s
@@ -414,8 +646,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int32s_increase_
   extern f_return_status fl_type_int32s_increase(f_int32s_t *int32s);
@@ -431,14 +664,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int32s_increase_by_
   extern f_return_status fl_type_int32s_increase_by(const f_array_length_t amount, f_int32s_t *int32s);
 #endif // _di_fl_type_int32s_increase_by_
 
 /**
+ * Delete the int32ss array.
+ *
+ * @param int32ss
+ *   The int32ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int32ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_int32ss_delete_
+  extern f_return_status fl_type_int32ss_delete(f_int32ss_t *int32ss);
+#endif // _di_fl_type_int32ss_delete_
+
+/**
  * Increase the size of int32s array, but only if necessary.
  *
  * @param int32s
@@ -446,8 +696,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int32ss_increase_
   extern f_return_status fl_type_int32ss_increase(f_int32ss_t *int32ss);
@@ -463,14 +714,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int32ss_increase_by_
   extern f_return_status fl_type_int32ss_increase_by(const f_array_length_t amount, f_int32ss_t *int32ss);
 #endif // _di_fl_type_int32ss_increase_by_
 
 /**
+ * Delete the uint32s array.
+ *
+ * @param uint32s
+ *   The uint32s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint32s_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint32s_delete_
+  extern f_return_status fl_type_uint32s_delete(f_uint32s_t *uint32s);
+#endif // _di_fl_type_uint32s_delete_
+
+/**
  * Increase the size of uint32s array, but only if necessary.
  *
  * @param uint32s
@@ -478,8 +746,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint32s_increase_
   extern f_return_status fl_type_uint32s_increase(f_uint32s_t *uint32s);
@@ -495,14 +764,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint32s_increase_by_
   extern f_return_status fl_type_uint32s_increase_by(const f_array_length_t amount, f_uint32s_t *uint32s);
 #endif // _di_fl_type_uint32s_increase_by_
 
 /**
+ * Delete the uint32ss array.
+ *
+ * @param uint32ss
+ *   The uint32ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint32ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint32ss_delete_
+  extern f_return_status fl_type_uint32ss_delete(f_uint32ss_t *uint32ss);
+#endif // _di_fl_type_uint32ss_delete_
+
+/**
  * Increase the size of uint32s array, but only if necessary.
  *
  * @param uint32s
@@ -510,8 +796,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint32ss_increase_
   extern f_return_status fl_type_uint32ss_increase(f_uint32ss_t *uint32ss);
@@ -527,14 +814,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint32ss_increase_by_
   extern f_return_status fl_type_uint32ss_increase_by(const f_array_length_t amount, f_uint32ss_t *uint32ss);
 #endif // _di_fl_type_uint32ss_increase_by_
 
 /**
+ * Delete the int64s array.
+ *
+ * @param int64s
+ *   The int64s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int64s_t_delete_simple()
+ */
+#ifndef _di_fl_type_int64s_delete_
+  extern f_return_status fl_type_int64s_delete(f_int64s_t *int64s);
+#endif // _di_fl_type_int64s_delete_
+
+/**
  * Increase the size of int64s array, but only if necessary.
  *
  * @param int64s
@@ -542,8 +846,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_int64s_increase_
   extern f_return_status fl_int64s_increase(f_int64s_t *int64s);
@@ -559,14 +864,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_int64s_increase_by_
   extern f_return_status fl_int64s_increase_by(const f_array_length_t amount, f_int64s_t *int64s);
 #endif // _di_fl_int64s_increase_by_
 
 /**
+ * Delete the int64ss array.
+ *
+ * @param int64ss
+ *   The int64ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int64ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_int64ss_delete_
+  extern f_return_status fl_type_int64ss_delete(f_int64ss_t *int64ss);
+#endif // _di_fl_type_int64ss_delete_
+
+/**
  * Increase the size of int64s array, but only if necessary.
  *
  * @param int64s
@@ -574,8 +896,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_int64ss_increase_
   extern f_return_status fl_int64ss_increase(f_int64ss_t *int64ss);
@@ -591,14 +914,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_int64ss_increase_by_
   extern f_return_status fl_int64ss_increase_by(const f_array_length_t amount, f_int64ss_t *int64ss);
 #endif // _di_fl_int64ss_increase_by_
 
 /**
+ * Delete the uint64s array.
+ *
+ * @param uint64s
+ *   The uint64s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint64s_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint64s_delete_
+  extern f_return_status fl_type_uint64s_delete(f_uint64s_t *uint64s);
+#endif // _di_fl_type_uint64s_delete_
+
+/**
  * Increase the size of uint64s array, but only if necessary.
  *
  * @param uint64s
@@ -606,8 +946,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_uint64s_increase_
   extern f_return_status fl_uint64s_increase(f_uint64s_t *uint64s);
@@ -623,14 +964,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_uint64s_increase_by_
   extern f_return_status fl_uint64s_increase_by(const f_array_length_t amount, f_uint64s_t *uint64s);
 #endif // _di_fl_uint64s_increase_by_
 
 /**
+ * Delete the uint64ss array.
+ *
+ * @param uint64ss
+ *   The uint64ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint64ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint64ss_delete_
+  extern f_return_status fl_type_uint64ss_delete(f_uint64ss_t *uint64ss);
+#endif // _di_fl_type_uint64ss_delete_
+
+/**
  * Increase the size of uint64s array, but only if necessary.
  *
  * @param uint64s
@@ -638,8 +996,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_uint64ss_increase_
   extern f_return_status fl_uint64ss_increase(f_uint64ss_t *uint64ss);
@@ -655,14 +1014,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_uint64ss_increase_by_
   extern f_return_status fl_uint64ss_increase_by(const f_array_length_t amount, f_uint64ss_t *uint64ss);
 #endif // _di_fl_uint64ss_increase_by_
 
 /**
+ * Delete the int128s array.
+ *
+ * @param int128s
+ *   The int128s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int128s_t_delete_simple()
+ */
+#ifndef _di_fl_type_int128s_delete_
+  extern f_return_status fl_type_int128s_delete(f_int128s_t *int128s);
+#endif // _di_fl_type_int128s_delete_
+
+/**
  * Increase the size of int128s array, but only if necessary.
  *
  * @param int128s
@@ -670,8 +1046,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int128s_increase_
   extern f_return_status fl_type_int128s_increase(f_int128s_t *int128s);
@@ -687,14 +1064,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int128s_increase_by_
   extern f_return_status fl_type_int128s_increase_by(const f_array_length_t amount, f_int128s_t *int128s);
 #endif // _di_fl_type_int128s_increase_by_
 
 /**
+ * Delete the int128ss array.
+ *
+ * @param int128ss
+ *   The int128ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_int128ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_int128ss_delete_
+  extern f_return_status fl_type_int128ss_delete(f_int128ss_t *int128ss);
+#endif // _di_fl_type_int128ss_delete_
+
+/**
  * Increase the size of int128s array, but only if necessary.
  *
  * @param int128s
@@ -702,8 +1096,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int128ss_increase_
   extern f_return_status fl_type_int128ss_increase(f_int128ss_t *int128ss);
@@ -719,14 +1114,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_int128ss_increase_by_
   extern f_return_status fl_type_int128ss_increase_by(const f_array_length_t amount, f_int128ss_t *int128ss);
 #endif // _di_fl_type_int128ss_increase_by_
 
 /**
+ * Delete the uint128s array.
+ *
+ * @param uint128s
+ *   The uint128s array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint128s_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint128s_delete_
+  extern f_return_status fl_type_uint128s_delete(f_uint128s_t *uint128s);
+#endif // _di_fl_type_uint128s_delete_
+
+/**
  * Increase the size of uint128s array, but only if necessary.
  *
  * @param uint128s
@@ -734,8 +1146,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint128s_increase_
   extern f_return_status fl_type_uint128s_increase(f_uint128s_t *uint128s);
@@ -751,14 +1164,31 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint128s_increase_by_
   extern f_return_status fl_type_uint128s_increase_by(const f_array_length_t amount, f_uint128s_t *uint128s);
 #endif // _di_fl_type_uint128s_increase_by_
 
 /**
+ * Delete the uint128ss array.
+ *
+ * @param uint128ss
+ *   The uint128ss array to delete.
+ *
+ * @return
+ *   F_none on success.
+ *   F_parameter (with error bit) if a parameter is invalid.
+ *
+ * @see f_macro_uint128ss_t_delete_simple()
+ */
+#ifndef _di_fl_type_uint128ss_delete_
+  extern f_return_status fl_type_uint128ss_delete(f_uint128ss_t *uint128ss);
+#endif // _di_fl_type_uint128ss_delete_
+
+/**
  * Increase the size of uint128s array, but only if necessary.
  *
  * @param uint128s
@@ -766,8 +1196,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint128ss_increase_
   extern f_return_status fl_type_uint128ss_increase(f_uint128ss_t *uint128ss);
@@ -783,8 +1214,9 @@ extern "C" {
  *
  * @return
  *   F_none on success.
- *   F_memory_reallocation (with error bit) on reallocation error.
  *   F_array_too_large (with error bit) if new length is larger than max array length.
+ *   F_memory_reallocation (with error bit) on reallocation error.
+ *   F_parameter (with error bit) if a parameter is invalid.
  */
 #ifndef _di_fl_type_uint128ss_increase_by_
   extern f_return_status fl_type_uint128ss_increase_by(const f_array_length_t amount, f_uint128ss_t *uint128ss);
index 7e2ead49e3586039b539baea494c84516c5a7680..e034f2858893ee10ec805e30ff7298ecfa54162b 100644 (file)
@@ -20,7 +20,7 @@ build_indexer ar
 build_language c
 build_libraries -lc
 build_libraries-individual -lf_memory
-build_sources_library type.c
+build_sources_library type.c private-type.c
 build_sources_program
 build_sources_headers type.h
 build_sources_script
index 90879b0b5f56fc25e005fb3ef965a76d5e20fc68..da9c2a6715d532d181091dc249d65e684bdca1dc 100644 (file)
@@ -250,8 +250,8 @@ extern "C" {
     }
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(path);
-      f_macro_string_dynamics_t_delete_simple(paths);
+      fl_string_dynamic_delete(&path);
+      fl_string_dynamics_delete(&paths);
       return status;
     }
 
@@ -298,13 +298,13 @@ extern "C" {
       }
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamics_t_delete_simple(paths);
+        fl_string_dynamics_delete(&paths);
         return status;
       }
     } // for
 
     if (!found) {
-      f_macro_string_dynamics_t_delete_simple(paths);
+      fl_string_dynamics_delete(&paths);
       return F_status_set_error(F_file_found_not);
     }
 
@@ -312,7 +312,7 @@ extern "C" {
 
     memcpy(&program_path, found->string, found->used);
 
-    f_macro_string_dynamics_t_delete(status, paths);
+    status = fl_string_dynamics_delete(&paths);
     if (F_status_is_error(status)) return status;
 
     return private_fll_execute_fork_environment(program_name, fixed_arguments, F_true, names, values, signals, pipe, result);
index fe720249a5f24b8f5808febe2906d3a27fa70701..8c5885220c085afa72ab625950a092fc2c742894 100644 (file)
@@ -54,15 +54,15 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
  *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
  * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  */
@@ -100,15 +100,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
- * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  */
@@ -148,15 +146,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
- * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  */
@@ -182,15 +178,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
- * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  */
@@ -212,15 +206,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
- * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  */
@@ -252,15 +244,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
- * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  */
@@ -294,15 +284,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
- * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  */
@@ -326,15 +314,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
- * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  */
@@ -376,8 +362,8 @@ extern "C" {
  *   F_none on success.
  *   F_child on success but this is the child thread.
  *   F_parent on success but this is the parent thread and pipe is non-zero (function is not blocking).
- *   F_failure (with error bit set) on execution failure.
- *   F_fork (with error bit set) on fork failure.
+ *   F_failure (with error bit) on execution failure.
+ *   F_fork (with error bit) on fork failure.
  *
  *   Errors (with error bit) from: f_file_exists().
  *   Errors (with error bit) from: f_signal_set_handle().
@@ -441,8 +427,8 @@ extern "C" {
  *   F_none on success.
  *   F_child on success but this is the child thread.
  *   F_parent on success but this is the parent thread and pipe is non-zero (function is not blocking).
- *   F_failure (with error bit set) on execution failure.
- *   F_fork (with error bit set) on fork failure.
+ *   F_failure (with error bit) on execution failure.
+ *   F_fork (with error bit) on fork failure.
  *
  *   Errors (with error bit) from: f_environment_set_dynamic().
  *   Errors (with error bit) from: f_file_exists().
@@ -498,8 +484,8 @@ extern "C" {
  *   F_none on success.
  *   F_child on success but this is the child thread.
  *   F_parent on success but this is the parent thread and pipe is non-zero (function is not blocking).
- *   F_failure (with error bit set) on execution failure.
- *   F_fork (with error bit set) on fork failure.
+ *   F_failure (with error bit) on execution failure.
+ *   F_fork (with error bit) on fork failure.
  *
  *   Errors (with error bit) from: f_file_exists().
  *   Errors (with error bit) from: f_signal_set_handle().
@@ -563,8 +549,8 @@ extern "C" {
  *   F_none on success.
  *   F_child on success but this is the child thread.
  *   F_parent on success but this is the parent thread and pipe is non-zero (function is not blocking).
- *   F_failure (with error bit set) on execution failure.
- *   F_fork (with error bit set) on fork failure.
+ *   F_failure (with error bit) on execution failure.
+ *   F_fork (with error bit) on fork failure.
  *
  *   Errors (with error bit) from: f_environment_get().
  *   Errors (with error bit) from: f_file_exists().
index 7c9ebd70882bd9e916855a1b558e2fcc594a5f01..97dab1371a1a8fc47a7111d44faa4e9f30b864fc 100644 (file)
@@ -17,7 +17,7 @@ extern "C" {
       status = fl_string_append(source, length, &argument);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamic_t_delete_simple(argument);
+        fl_string_dynamic_delete(&argument);
         return status;
       }
     }
@@ -25,7 +25,7 @@ extern "C" {
     status = fl_string_dynamic_terminate(&argument);
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(argument);
+      fl_string_dynamic_delete(&argument);
       return status;
     }
 
@@ -50,7 +50,7 @@ extern "C" {
       status = fl_string_append(prefix, prefix_length, &argument);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamic_t_delete_simple(argument);
+        fl_string_dynamic_delete(&argument);
         return status;
       }
     }
@@ -59,7 +59,7 @@ extern "C" {
       status = fl_string_append(name, name_length, &argument);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamic_t_delete_simple(argument);
+        fl_string_dynamic_delete(&argument);
         return status;
       }
     }
@@ -67,7 +67,7 @@ extern "C" {
     status = fl_string_dynamic_terminate(&argument);
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(argument);
+      fl_string_dynamic_delete(&argument);
       return status;
     }
 
@@ -82,7 +82,7 @@ extern "C" {
       status = fl_string_append(value, value_length, &argument);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamic_t_delete_simple(argument);
+        fl_string_dynamic_delete(&argument);
         return status;
       }
     }
@@ -90,14 +90,14 @@ extern "C" {
     status = fl_string_dynamic_terminate(&argument);
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(argument);
+      fl_string_dynamic_delete(&argument);
       return status;
     }
 
     status = fl_string_dynamics_increase(arguments);
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(argument);
+      fl_string_dynamic_delete(&argument);
       return status;
     }
 
index c8327e28e7f395081f2d6b0f1e3efbd95c29bd72..ea9dd2d66c31569a46aaa54cef9d375c338b9d27 100644 (file)
@@ -45,15 +45,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
- * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  * @see fll_execute_arguments_add()
@@ -88,15 +86,13 @@ extern "C" {
  * @return
  *   F_none on success.
  *
- *   Errors (with error bit) from: f_macro_string_dynamic_t_delete_simple().
- *   Errors (with error bit) from: f_macro_string_dynamics_t_resize().
  *   Errors (with error bit) from: fl_string_append().
+ *   Errors (with error bit) from: fl_string_dynamic_delete().
  *   Errors (with error bit) from: fl_string_dynamic_terminate().
  *   Errors (with error bit) from: fl_string_dynamics_increase().
  *
- * @see f_macro_string_dynamic_t_delete_simple()
- * @see f_macro_string_dynamics_t_resize()
  * @see fl_string_append()
+ * @see fl_string_dynamic_delete()
  * @see fl_string_dynamic_terminate()
  * @see fl_string_dynamics_increase()
  * @see fll_execute_arguments_add_parameter()
@@ -133,8 +129,8 @@ extern "C" {
  *   F_none on success.
  *   F_child on success but this is the child thread.
  *   F_parent on success but this is the parent thread and pipe is non-zero (function is not blocking).
- *   F_failure (with error bit set) on execution failure.
- *   F_fork (with error bit set) on fork failure.
+ *   F_failure (with error bit) on execution failure.
+ *   F_fork (with error bit) on fork failure.
  *
  * @see execv()
  * @see execvp()
@@ -178,8 +174,8 @@ extern "C" {
  *   F_none on success.
  *   F_child on success but this is the child thread.
  *   F_parent on success but this is the parent thread and pipe is non-zero (function is not blocking).
- *   F_failure (with error bit set) on execution failure.
- *   F_fork (with error bit set) on fork failure.
+ *   F_failure (with error bit) on execution failure.
+ *   F_fork (with error bit) on fork failure.
  *
  * @see execv()
  * @see execvpe()
index 62c9ac134c5d776f483786486c586fcdfd7f310e..01c7bbb3f219e777bea7264f3901995250dd1d72 100644 (file)
@@ -205,7 +205,7 @@ extern "C" {
         status = fl_string_dynamic_partial_append_nulless(buffer, contents.array[i].array[0], &name);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamic_t_delete_simple(name);
+          fl_string_dynamic_delete(&name);
           return status;
         }
 
@@ -217,14 +217,14 @@ extern "C" {
           status = fl_string_compare_trim(buffer.string + contents.array[i].array[0].start, values[j]->array[k].name.string, length_name, values[j]->array[k].name.used);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            fl_string_dynamic_delete(&name);
             return status;
           }
 
           if (status == F_equal_to) {
             matched = F_true;
 
-            f_macro_string_dynamic_t_delete_simple(name);
+            fl_string_dynamic_delete(&name);
             break;
           }
         } // for
@@ -237,14 +237,14 @@ extern "C" {
         if (values[j]->used == values[j]->size) {
           if (values[j]->used + f_fss_default_allocation_step > f_array_length_t_size) {
             if (values[j]->used == f_array_length_t_size) {
-              f_macro_string_dynamic_t_delete_simple(name);
+              fl_string_dynamic_delete(&name);
               return F_status_set_error(F_array_too_large);
             }
 
             f_macro_string_maps_t_resize(status, (*values[j]), values[j]->used + 1);
 
             if (F_status_is_error(status)) {
-              f_macro_string_dynamic_t_delete_simple(name);
+              fl_string_dynamic_delete(&name);
               return status;
             }
 
@@ -257,7 +257,7 @@ extern "C" {
             f_macro_string_maps_t_resize(status, (*values[j]), values[j]->used + f_fss_default_allocation_step);
 
             if (F_status_is_error(status)) {
-              f_macro_string_dynamic_t_delete_simple(name);
+              fl_string_dynamic_delete(&name);
               return status;
             }
 
@@ -274,7 +274,7 @@ extern "C" {
           status = fl_string_dynamic_partial_append_nulless(buffer, contents.array[i].array[1], &map->value);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            fl_string_dynamic_delete(&name);
             return status;
           }
         }
@@ -294,7 +294,7 @@ extern "C" {
       } // for
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(name);
+    fl_string_dynamic_delete(&name);
     return F_none;
   }
 #endif // _di_fll_fss_snatch_map_
@@ -514,7 +514,7 @@ extern "C" {
         status = fl_string_dynamic_partial_append_nulless(buffer, contents.array[i].array[0], &name);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamic_t_delete_simple(name);
+          fl_string_dynamic_delete(&name);
           return status;
         }
 
@@ -526,7 +526,7 @@ extern "C" {
           status = fl_string_compare_trim(buffer.string + contents.array[i].array[0].start, values[j]->array[k].name.string, length_name, values[j]->array[k].name.used);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            fl_string_dynamic_delete(&name);
             return status;
           }
 
@@ -605,7 +605,7 @@ extern "C" {
       } // for
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(name);
+    fl_string_dynamic_delete(&name);
     return F_none;
   }
 #endif // _di_fll_fss_snatch_map_mash_apart_
@@ -649,7 +649,7 @@ extern "C" {
         status = fl_string_dynamic_partial_append_nulless(buffer, contents.array[i].array[0], &name);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamic_t_delete_simple(name);
+          fl_string_dynamic_delete(&name);
           return status;
         }
 
@@ -661,14 +661,14 @@ extern "C" {
           status = fl_string_compare_trim(buffer.string + contents.array[i].array[0].start, values[j]->array[k].name.string, length_name, values[j]->array[k].name.used);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            fl_string_dynamic_delete(&name);
             return status;
           }
 
           if (status == F_equal_to) {
             matched = F_true;
 
-            f_macro_string_dynamic_t_delete_simple(name);
+            fl_string_dynamic_delete(&name);
             break;
           }
         } // for
@@ -682,14 +682,14 @@ extern "C" {
           if (values[j]->used == values[j]->size) {
             if (values[j]->used + f_fss_default_allocation_step > f_array_length_t_size) {
               if (values[j]->used == f_array_length_t_size) {
-                f_macro_string_dynamic_t_delete_simple(name);
+                fl_string_dynamic_delete(&name);
                 return F_status_set_error(F_array_too_large);
               }
 
               f_macro_string_maps_t_resize(status, (*values[j]), values[j]->used + 1);
 
               if (F_status_is_error(status)) {
-                f_macro_string_dynamic_t_delete_simple(name);
+                fl_string_dynamic_delete(&name);
                 return status;
               }
 
@@ -702,7 +702,7 @@ extern "C" {
               f_macro_string_maps_t_resize(status, (*values[j]), values[j]->used + f_fss_default_allocation_step);
 
               if (F_status_is_error(status)) {
-                f_macro_string_dynamic_t_delete_simple(name);
+                fl_string_dynamic_delete(&name);
                 return status;
               }
 
@@ -733,14 +733,14 @@ extern "C" {
           status = fl_string_dynamic_partial_mash_nulless(glue, glue_length, buffer, contents.array[i].array[1], &map->value);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(name);
+            fl_string_dynamic_delete(&name);
             return status;
           }
         }
       } // for
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(name);
+    fl_string_dynamic_delete(&name);
     return F_none;
   }
 #endif // _di_fll_fss_snatch_map_together_
index d929b2852339304e8c20226f2ad110c88185a7c4..1ae4d5c3bdf492bac4b42ae6a317c678b7405143 100644 (file)
@@ -23,7 +23,6 @@
 // fll-1 includes
 #include <level_1/conversion.h>
 #include <level_1/fss.h>
-#include <level_1/fss_macro.h>
 #include <level_1/fss_status.h>
 #include <level_1/string.h>
 
index 46b9192b3530ade84f57caf924c3b84b1fc1acc8..fc89b2d48ed3d29c16f650734b21a82e0c51f08d 100644 (file)
@@ -20,7 +20,6 @@
 
 // fll-1 includes
 #include <level_1/fss.h>
-#include <level_1/fss_macro.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_basic.h>
 #include <level_1/string.h>
index fb16ce3d4fdd0c532b8731133caf82bfe4024c44..57f1f090e14aaf1871918ba4cadc6150cc890444 100644 (file)
@@ -21,7 +21,6 @@
 #include <level_1/fss.h>
 #include <level_1/fss_basic_list.h>
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 #include <level_1/string.h>
 
 #ifdef __cplusplus
index a694b8c697141d323617837a49e0653d35cad70c..05f95fa7d21c64dfe827b717f740adad2a523c66 100644 (file)
@@ -21,7 +21,6 @@
 #include <level_1/fss.h>
 #include <level_1/fss_embedded_list.h>
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
index c0f3b14151fab2b19dbc2266c756f2d4bada5c7c..6f2aaa31b7c34bf0bb3b5be2206ccf1e93f1ac1b 100644 (file)
@@ -21,7 +21,6 @@
 #include <level_1/fss.h>
 #include <level_1/fss_status.h>
 #include <level_1/fss_extended.h>
-#include <level_1/fss_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
index c75daacdbc5a283cb655a6afd36fbad8eb6bf3e4..a6d46e764b05c84b950fb8c86719d4c73b4888af 100644 (file)
@@ -21,7 +21,6 @@
 #include <level_1/fss.h>
 #include <level_1/fss_extended_list.h>
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 
 #ifdef __cplusplus
 extern "C" {
index 072e6f4680fca3f07dcca0933e5341a904659428..57b9ef9ae4a6c2bbb7ceaec3c39d6eabdaa9e629 100644 (file)
@@ -22,7 +22,6 @@
 #include <level_1/fss.h>
 #include <level_1/fss_basic.h>
 #include <level_1/fss_status.h>
-#include <level_1/fss_macro.h>
 #include <level_1/status.h>
 #include <level_1/string.h>
 
index ba678f46af7113227f379cfd2a053022a5416109..81365fc3ecb21f58ab4b14fcee7d5eb29e50b2d3 100644 (file)
@@ -272,7 +272,7 @@ extern "C" {
         status = fl_string_rip(argv[values.array[i]], length, &ripped);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamic_t_delete_simple(ripped);
+          fl_string_dynamic_delete(&ripped);
           return status;
         }
 
@@ -280,7 +280,7 @@ extern "C" {
           status = fl_string_dynamic_mash(glue, glue_length, ripped, destination);
 
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(ripped);
+            fl_string_dynamic_delete(&ripped);
             return F_status_set_error(F_string_too_large);
           }
         }
index 4d9059c63276d1e69e4bc92458f0362238fe1bf1..881bcd332b008ef1d1737a94d714ac51812a972e 100644 (file)
@@ -143,7 +143,7 @@ extern "C" {
     }
 
   #define controller_macro_rule_action_t_delete_simple(action) \
-    f_macro_string_dynamics_t_delete_simple(action.parameters)
+    fl_string_dynamics_delete(&action.parameters);
 #endif // _di_controller_rule_action_t_
 
 #ifndef _di_controller_rule_actions_t_
@@ -283,16 +283,16 @@ extern "C" {
     }
 
   #define controller_macro_rule_t_delete_simple(rule) \
-    f_macro_string_dynamic_t_delete_simple(rule.id) \
-    f_macro_string_dynamic_t_delete_simple(rule.name) \
-    f_macro_string_dynamic_t_delete_simple(rule.control_group) \
-    f_macro_string_dynamic_t_delete_simple(rule.path) \
+    fl_string_dynamic_delete(&rule.id); \
+    fl_string_dynamic_delete(&rule.name); \
+    fl_string_dynamic_delete(&rule.control_group); \
+    fl_string_dynamic_delete(&rule.path); \
     f_macro_string_maps_t_delete_simple(rule.define) \
     f_macro_string_maps_t_delete_simple(rule.parameter) \
-    f_macro_string_dynamics_t_delete_simple(rule.environment) \
-    f_macro_string_dynamics_t_delete_simple(rule.need) \
-    f_macro_string_dynamics_t_delete_simple(rule.want) \
-    f_macro_string_dynamics_t_delete_simple(rule.wish) \
+    fl_string_dynamics_delete(&rule.environment); \
+    fl_string_dynamics_delete(&rule.need); \
+    fl_string_dynamics_delete(&rule.want); \
+    fl_string_dynamics_delete(&rule.wish); \
     controller_macro_rule_items_t_delete_simple(rule.items)
 #endif // _di_controller_rule_t_
 
@@ -362,7 +362,7 @@ extern "C" {
     }
 
   #define controller_macro_entry_action_t_delete_simple(action) \
-    f_macro_string_dynamics_t_delete_simple(action.parameters)
+    fl_string_dynamics_delete(&action.parameters);
 #endif // _di_controller_entry_action_t_
 
 #ifndef _di_controller_entry_actions_t_
@@ -406,7 +406,7 @@ extern "C" {
     }
 
   #define controller_macro_entry_item_t_delete_simple(item) \
-    f_macro_string_dynamic_t_delete_simple(item.name) \
+    fl_string_dynamic_delete(&item.name); \
     controller_macro_entry_actions_t_delete_simple(item.actions)
 #endif // _di_controller_entry_item_t_
 
@@ -497,8 +497,8 @@ extern "C" {
     }
 
   #define controller_macro_setting_t_delete_simple(setting) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_pid) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_setting) \
+    fl_string_dynamic_delete(&setting.path_pid); \
+    fl_string_dynamic_delete(&setting.path_setting); \
     controller_macro_entry_t_delete_simple(setting.entry) \
     controller_macro_rules_t_delete_simple(setting.rules)
 #endif // _di_controller_setting_t
@@ -557,8 +557,8 @@ extern "C" {
     }
 
   #define controller_macro_cache_t_delete_simple(cache) \
-    f_macro_array_lengths_t_delete_simple(cache.ats) \
-    f_macro_array_lengths_t_delete_simple(cache.stack) \
+    fl_type_array_lengths_delete(&cache.ats); \
+    fl_type_array_lengths_delete(&cache.stack); \
     f_macro_fss_comments_t_delete_simple(cache.comments) \
     f_macro_fss_delimits_t_delete_simple(cache.delimits) \
     f_macro_fss_content_t_delete_simple(cache.content_action) \
@@ -566,12 +566,12 @@ extern "C" {
     f_macro_fss_contents_t_delete_simple(cache.content_items) \
     f_macro_fss_objects_t_delete_simple(cache.object_actions) \
     f_macro_fss_objects_t_delete_simple(cache.object_items) \
-    f_macro_string_dynamic_t_delete_simple(cache.buffer_file) \
-    f_macro_string_dynamic_t_delete_simple(cache.buffer_item) \
-    f_macro_string_dynamic_t_delete_simple(cache.buffer_path) \
-    f_macro_string_dynamic_t_delete_simple(cache.name_action) \
-    f_macro_string_dynamic_t_delete_simple(cache.name_file) \
-    f_macro_string_dynamic_t_delete_simple(cache.name_item)
+    fl_string_dynamic_delete(&cache.buffer_file); \
+    fl_string_dynamic_delete(&cache.buffer_item); \
+    fl_string_dynamic_delete(&cache.buffer_path); \
+    fl_string_dynamic_delete(&cache.name_action); \
+    fl_string_dynamic_delete(&cache.name_file); \
+    fl_string_dynamic_delete(&cache.name_item);
 #endif // _di_controller_cache_t_
 
 #ifdef __cplusplus
index b1e3f529a38e8e99d79b4abe7336264bc5a175ed..27cd1e4d029c7309a6c2017f8cf8482faf4a922d 100644 (file)
@@ -144,7 +144,7 @@ extern "C" {
         status = f_directory_exists(path_directory.string);
       }
 
-      f_macro_string_dynamic_t_delete_simple(path_directory);
+      fl_string_dynamic_delete(&path_directory);
 
       if (F_status_is_error(status)) return status;
 
@@ -213,7 +213,7 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(pid_buffer);
+    fl_string_dynamic_delete(&pid_buffer);
   }
 #endif // _di_controller_file_pid_delete_
 
index 72d8db9be3d5a61ef1d250106ce72f8ec46b8f43..376537e87d2478b88b50747b3ac6d676551ca917 100644 (file)
@@ -244,7 +244,7 @@ extern "C" {
  *   The status code (without the error bit set) to simplify.
  *
  * @return
- *   A subset of status codes with error bit set.
+ *   A subset of status codes with error bit.
  */
 #ifndef _di_controller_status_simplify_
   extern f_return_status controller_status_simplify(const f_status_t status) f_gcc_attribute_visibility_internal;
index 0f1d37b55c1cbc902363b3a01b63db071c72a577..97814f26a4efea7f2f72911b9214bbc4d997676a 100644 (file)
@@ -372,60 +372,60 @@ extern "C" {
 
     f_macro_string_lengths_t_delete_simple(data->remaining);
 
-    f_macro_string_dynamics_t_delete_simple(data->define);
-    f_macro_string_dynamic_t_delete_simple(data->fakefile);
-    f_macro_string_dynamics_t_delete_simple(data->mode);
-    f_macro_string_dynamic_t_delete_simple(data->process);
-    f_macro_string_dynamic_t_delete_simple(data->settings);
-
-    f_macro_string_dynamic_t_delete_simple(data->path_build);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_documents);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_includes);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_libraries);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_libraries_script);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_libraries_shared);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_libraries_static);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_objects);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_programs);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_programs_script);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_programs_shared);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_programs_static);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_settings);
-    f_macro_string_dynamic_t_delete_simple(data->path_build_stage);
-    f_macro_string_dynamic_t_delete_simple(data->path_work);
-
-    f_macro_string_dynamic_t_delete_simple(data->path_data);
-    f_macro_string_dynamic_t_delete_simple(data->path_data_build);
-
-    f_macro_string_dynamic_t_delete_simple(data->path_data_settings);
-
-    f_macro_string_dynamic_t_delete_simple(data->path_documents);
-
-    f_macro_string_dynamic_t_delete_simple(data->path_licenses);
-
-    f_macro_string_dynamic_t_delete_simple(data->path_sources);
-    f_macro_string_dynamic_t_delete_simple(data->path_sources_bash);
-    f_macro_string_dynamic_t_delete_simple(data->path_sources_c);
-    f_macro_string_dynamic_t_delete_simple(data->path_sources_cpp);
-    f_macro_string_dynamic_t_delete_simple(data->path_sources_script);
-
-    f_macro_string_dynamic_t_delete_simple(data->path_work);
-    f_macro_string_dynamic_t_delete_simple(data->path_work_includes);
-    f_macro_string_dynamic_t_delete_simple(data->path_work_libraries);
-    f_macro_string_dynamic_t_delete_simple(data->path_work_libraries_script);
-    f_macro_string_dynamic_t_delete_simple(data->path_work_libraries_shared);
-    f_macro_string_dynamic_t_delete_simple(data->path_work_libraries_static);
-    f_macro_string_dynamic_t_delete_simple(data->path_work_programs);
-    f_macro_string_dynamic_t_delete_simple(data->path_work_programs_script);
-    f_macro_string_dynamic_t_delete_simple(data->path_work_programs_shared);
-    f_macro_string_dynamic_t_delete_simple(data->path_work_programs_static);
-
-    f_macro_string_dynamic_t_delete_simple(data->file_data_build_defines);
-    f_macro_string_dynamic_t_delete_simple(data->file_data_build_dependencies);
-    f_macro_string_dynamic_t_delete_simple(data->file_data_build_fakefile);
-    f_macro_string_dynamic_t_delete_simple(data->file_data_build_settings);
-
-    f_macro_string_dynamic_t_delete_simple(data->file_documents_readme);
+    fl_string_dynamics_delete(&data->define);
+    fl_string_dynamic_delete(&data->fakefile);
+    fl_string_dynamics_delete(&data->mode);
+    fl_string_dynamic_delete(&data->process);
+    fl_string_dynamic_delete(&data->settings);
+
+    fl_string_dynamic_delete(&data->path_build);
+    fl_string_dynamic_delete(&data->path_build_documents);
+    fl_string_dynamic_delete(&data->path_build_includes);
+    fl_string_dynamic_delete(&data->path_build_libraries);
+    fl_string_dynamic_delete(&data->path_build_libraries_script);
+    fl_string_dynamic_delete(&data->path_build_libraries_shared);
+    fl_string_dynamic_delete(&data->path_build_libraries_static);
+    fl_string_dynamic_delete(&data->path_build_objects);
+    fl_string_dynamic_delete(&data->path_build_programs);
+    fl_string_dynamic_delete(&data->path_build_programs_script);
+    fl_string_dynamic_delete(&data->path_build_programs_shared);
+    fl_string_dynamic_delete(&data->path_build_programs_static);
+    fl_string_dynamic_delete(&data->path_build_settings);
+    fl_string_dynamic_delete(&data->path_build_stage);
+    fl_string_dynamic_delete(&data->path_work);
+
+    fl_string_dynamic_delete(&data->path_data);
+    fl_string_dynamic_delete(&data->path_data_build);
+
+    fl_string_dynamic_delete(&data->path_data_settings);
+
+    fl_string_dynamic_delete(&data->path_documents);
+
+    fl_string_dynamic_delete(&data->path_licenses);
+
+    fl_string_dynamic_delete(&data->path_sources);
+    fl_string_dynamic_delete(&data->path_sources_bash);
+    fl_string_dynamic_delete(&data->path_sources_c);
+    fl_string_dynamic_delete(&data->path_sources_cpp);
+    fl_string_dynamic_delete(&data->path_sources_script);
+
+    fl_string_dynamic_delete(&data->path_work);
+    fl_string_dynamic_delete(&data->path_work_includes);
+    fl_string_dynamic_delete(&data->path_work_libraries);
+    fl_string_dynamic_delete(&data->path_work_libraries_script);
+    fl_string_dynamic_delete(&data->path_work_libraries_shared);
+    fl_string_dynamic_delete(&data->path_work_libraries_static);
+    fl_string_dynamic_delete(&data->path_work_programs);
+    fl_string_dynamic_delete(&data->path_work_programs_script);
+    fl_string_dynamic_delete(&data->path_work_programs_shared);
+    fl_string_dynamic_delete(&data->path_work_programs_static);
+
+    fl_string_dynamic_delete(&data->file_data_build_defines);
+    fl_string_dynamic_delete(&data->file_data_build_dependencies);
+    fl_string_dynamic_delete(&data->file_data_build_fakefile);
+    fl_string_dynamic_delete(&data->file_data_build_settings);
+
+    fl_string_dynamic_delete(&data->file_documents_readme);
 
     f_macro_color_context_t_delete_simple(data->context);
 
index 24e596846f423bbb5f374a544e74bdb888c34296..7c335863a4933faa874105bd6f252da32b0fd4d8 100644 (file)
@@ -188,7 +188,7 @@ extern "C" {
     if (F_status_is_error(*status)) {
       fll_error_print(data.error, F_status_set_fine(*status), "f_macro_string_dynamic_t_new", F_true);
 
-      f_macro_string_dynamic_t_delete_simple(path_source);
+      fl_string_dynamic_delete(&path_source);
       return;
     }
 
@@ -367,9 +367,9 @@ extern "C" {
     } // for
 
     f_macro_directory_statuss_t_delete_simple(failures);
-    f_macro_string_dynamic_t_delete_simple(path_source);
-    f_macro_string_dynamic_t_delete_simple(destination_file);
-    f_macro_string_dynamic_t_delete_simple(destination_directory);
+    fl_string_dynamic_delete(&path_source);
+    fl_string_dynamic_delete(&destination_file);
+    fl_string_dynamic_delete(&destination_directory);
 
     if (F_status_is_error_not(*status)) {
       fake_build_touch(data, file_stage, status);
@@ -514,7 +514,7 @@ extern "C" {
     if (F_status_is_error(*status)) {
       fll_error_print(data.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      fl_string_dynamics_delete(&arguments);
       return 0;
     }
 
@@ -534,8 +534,8 @@ extern "C" {
         if (F_status_is_error(*status)) {
           fll_error_print(data.error, F_status_set_fine(*status), "fl_string_dynamic_mash", F_true);
 
-          f_macro_string_dynamic_t_delete_simple(defines);
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          fl_string_dynamic_delete(&defines);
+          fl_string_dynamics_delete(&arguments);
           return 0;
         }
 
@@ -544,8 +544,8 @@ extern "C" {
         if (F_status_is_error(*status)) {
           fll_error_print(data.error, F_status_set_fine(*status), "fl_string_dynamic_terminate_after", F_true);
 
-          f_macro_string_dynamic_t_delete_simple(defines);
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          fl_string_dynamic_delete(&defines);
+          fl_string_dynamics_delete(&arguments);
           return 0;
         }
       }
@@ -612,12 +612,12 @@ extern "C" {
 
       *status = fll_execute_arguments_add_parameter_set(parameters_prefix, parameters_prefix_length, parameters_name, parameters_name_length, parameters_value, parameters_value_length, 7, &arguments);
 
-      f_macro_string_dynamic_t_delete_simple(defines);
+      fl_string_dynamic_delete(&defines);
 
       if (F_status_is_error(*status)) {
         fll_error_print(data.error, F_status_set_fine(*status), "fll_execute_arguments_add_parameter_set", F_true);
 
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        fl_string_dynamics_delete(&arguments);
         return 0;
       }
     }
@@ -644,8 +644,8 @@ extern "C" {
       if (F_status_is_error(*status)) {
         fll_error_print(data.error, F_status_set_fine(*status), function, F_true);
 
-        f_macro_string_dynamic_t_delete_simple(path);
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        fl_string_dynamic_delete(&path);
+        fl_string_dynamics_delete(&arguments);
         return 0;
       }
     }
@@ -655,8 +655,8 @@ extern "C" {
     if (fake_signal_received(data)) {
       *status = F_status_set_error(F_signal);
 
-      f_macro_string_dynamic_t_delete_simple(path);
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      fl_string_dynamic_delete(&path);
+      fl_string_dynamics_delete(&arguments);
     }
     else {
       // child processes should receive all signals, without blocking.
@@ -666,7 +666,7 @@ extern "C" {
 
       *status = fll_execute_path_environment(path.string, arguments, data_build.environment.names, data_build.environment.values, &signals, 0, &return_code);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      fl_string_dynamics_delete(&arguments);
 
       if (fake_signal_received(data)) {
         *status = F_status_set_error(F_signal);
@@ -692,7 +692,7 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(path);
+    fl_string_dynamic_delete(&path);
 
     return return_code;
   }
@@ -789,7 +789,7 @@ extern "C" {
       if (F_status_is_error(*status)) {
         fll_error_print(data.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        fl_string_dynamics_delete(&arguments);
         return 0;
       }
     }
@@ -928,7 +928,7 @@ extern "C" {
       if (F_status_is_error(*status)) {
         fll_error_print(data.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        fl_string_dynamics_delete(&arguments);
         return 0;
       }
     }
@@ -936,7 +936,7 @@ extern "C" {
     {
       const int result = fake_execute(data, data_build.environment, data_build.setting.build_compiler, arguments, status);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      fl_string_dynamics_delete(&arguments);
 
       if (F_status_is_error(*status)) {
         return 0;
@@ -1185,9 +1185,9 @@ extern "C" {
       result = fake_execute(data, data_build.environment, data_build.setting.build_indexer, arguments, status);
     }
 
-    f_macro_string_dynamic_t_delete_simple(file_name);
-    f_macro_string_dynamic_t_delete_simple(source_path);
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    fl_string_dynamic_delete(&file_name);
+    fl_string_dynamic_delete(&source_path);
+    fl_string_dynamics_delete(&arguments);
 
     if (F_status_is_error_not(*status) && *status != F_child) {
       fake_build_touch(data, file_stage, status);
@@ -1220,7 +1220,7 @@ extern "C" {
       if (F_status_is_error(*status)) {
         fll_error_print(data.error, F_status_set_fine(*status), "f_macro_string_dynamics_new", F_true);
 
-        f_macro_string_dynamics_t_delete_simple(names);
+        fl_string_dynamics_delete(&names);
         return;
       }
 
@@ -1252,8 +1252,8 @@ extern "C" {
               fprintf(data.error.to.stream, "%c", f_string_eol[0]);
             }
 
-            f_macro_string_dynamic_t_delete_simple(part);
-            f_macro_string_dynamics_t_delete_simple(names);
+            fl_string_dynamic_delete(&part);
+            fl_string_dynamics_delete(&names);
             *status = F_status_set_error(F_array_too_large);
             return;
           }
@@ -1263,8 +1263,8 @@ extern "C" {
           if (F_status_is_error(*status)) {
             fll_error_print(data.error, F_status_set_fine(*status), "f_macro_string_dynamics_t_resize", F_true);
 
-            f_macro_string_dynamic_t_delete_simple(part);
-            f_macro_string_dynamics_t_delete_simple(names);
+            fl_string_dynamic_delete(&part);
+            fl_string_dynamics_delete(&names);
             return;
           }
         }
@@ -1283,12 +1283,12 @@ extern "C" {
         } // for
       }
 
-      f_macro_string_dynamic_t_delete_simple(part);
+      fl_string_dynamic_delete(&part);
 
       if (F_status_is_error(*status)) {
         fll_error_print(data.error, F_status_set_fine(*status), "fl_string_append", F_true);
 
-        f_macro_string_dynamics_t_delete_simple(names);
+        fl_string_dynamics_delete(&names);
         return;
       }
     }
@@ -1359,9 +1359,9 @@ extern "C" {
       f_macro_string_dynamic_t_clear(variable_value);
     } // for
 
-    f_macro_string_dynamics_t_delete_simple(names);
-    f_macro_string_dynamic_t_delete_simple(variable_name);
-    f_macro_string_dynamic_t_delete_simple(variable_value);
+    fl_string_dynamics_delete(&names);
+    fl_string_dynamic_delete(&variable_name);
+    fl_string_dynamic_delete(&variable_value);
 
     if (F_status_is_error(*status) && F_status_set_fine(*status) != F_signal) {
       fll_error_print(data.error, *status, function, F_true);
@@ -1424,7 +1424,7 @@ extern "C" {
         f_macro_fss_delimits_t_delete_simple(delimits);
       }
 
-      f_macro_string_dynamic_t_delete_simple(buffer);
+      fl_string_dynamic_delete(&buffer);
       f_macro_fss_objects_t_delete_simple(objects);
       f_macro_fss_contents_t_delete_simple(contents);
     }
@@ -1724,7 +1724,7 @@ extern "C" {
         }
 
         for (j = 0; j < fake_build_setting_total; j++) {
-          f_macro_string_dynamic_t_delete_simple(settings_mode_name_dynamic[j]);
+          fl_string_dynamic_delete(&settings_mode_name_dynamic[j]);
         } // for
 
         if (F_status_is_error(*status)) break;
@@ -2064,33 +2064,33 @@ extern "C" {
       } // for
     }
 
-    f_macro_string_dynamics_t_delete_simple(build_compiler);
-    f_macro_string_dynamics_t_delete_simple(build_indexer);
-    f_macro_string_dynamics_t_delete_simple(build_language);
-    f_macro_string_dynamics_t_delete_simple(build_script);
-    f_macro_string_dynamics_t_delete_simple(build_shared);
-    f_macro_string_dynamics_t_delete_simple(build_static);
-    f_macro_string_dynamics_t_delete_simple(path_headers);
-    f_macro_string_dynamics_t_delete_simple(path_headers_preserve);
-    f_macro_string_dynamics_t_delete_simple(path_language);
-    f_macro_string_dynamics_t_delete_simple(path_library_script);
-    f_macro_string_dynamics_t_delete_simple(path_library_shared);
-    f_macro_string_dynamics_t_delete_simple(path_library_static);
-    f_macro_string_dynamics_t_delete_simple(path_program_script);
-    f_macro_string_dynamics_t_delete_simple(path_program_shared);
-    f_macro_string_dynamics_t_delete_simple(path_program_static);
-    f_macro_string_dynamics_t_delete_simple(path_sources);
-    f_macro_string_dynamics_t_delete_simple(path_standard);
-    f_macro_string_dynamics_t_delete_simple(process_post);
-    f_macro_string_dynamics_t_delete_simple(process_pre);
-    f_macro_string_dynamics_t_delete_simple(project_name);
-    f_macro_string_dynamics_t_delete_simple(search_exclusive);
-    f_macro_string_dynamics_t_delete_simple(search_shared);
-    f_macro_string_dynamics_t_delete_simple(search_static);
-    f_macro_string_dynamics_t_delete_simple(version_major);
-    f_macro_string_dynamics_t_delete_simple(version_micro);
-    f_macro_string_dynamics_t_delete_simple(version_minor);
-    f_macro_string_dynamics_t_delete_simple(version_target);
+    fl_string_dynamics_delete(&build_compiler);
+    fl_string_dynamics_delete(&build_indexer);
+    fl_string_dynamics_delete(&build_language);
+    fl_string_dynamics_delete(&build_script);
+    fl_string_dynamics_delete(&build_shared);
+    fl_string_dynamics_delete(&build_static);
+    fl_string_dynamics_delete(&path_headers);
+    fl_string_dynamics_delete(&path_headers_preserve);
+    fl_string_dynamics_delete(&path_language);
+    fl_string_dynamics_delete(&path_library_script);
+    fl_string_dynamics_delete(&path_library_shared);
+    fl_string_dynamics_delete(&path_library_static);
+    fl_string_dynamics_delete(&path_program_script);
+    fl_string_dynamics_delete(&path_program_shared);
+    fl_string_dynamics_delete(&path_program_static);
+    fl_string_dynamics_delete(&path_sources);
+    fl_string_dynamics_delete(&path_standard);
+    fl_string_dynamics_delete(&process_post);
+    fl_string_dynamics_delete(&process_pre);
+    fl_string_dynamics_delete(&project_name);
+    fl_string_dynamics_delete(&search_exclusive);
+    fl_string_dynamics_delete(&search_shared);
+    fl_string_dynamics_delete(&search_static);
+    fl_string_dynamics_delete(&version_major);
+    fl_string_dynamics_delete(&version_micro);
+    fl_string_dynamics_delete(&version_minor);
+    fl_string_dynamics_delete(&version_target);
   }
 #endif // _di_fake_build_load_setting_process_
 
@@ -2388,7 +2388,7 @@ extern "C" {
       }
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(settings_file_base);
+    fl_string_dynamic_delete(&settings_file_base);
   }
 #endif // _di_fake_build_load_stage_
 
@@ -2575,14 +2575,14 @@ extern "C" {
 
       result = fake_execute(data, data_build.environment, data_build.setting.build_compiler, arguments, status);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      fl_string_dynamics_delete(&arguments);
 
       if (F_status_is_error(*status) || *status == F_child) break;
     } // for
 
-    f_macro_string_dynamic_t_delete_simple(file_name);
-    f_macro_string_dynamic_t_delete_simple(destination_path);
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    fl_string_dynamic_delete(&file_name);
+    fl_string_dynamic_delete(&destination_path);
+    fl_string_dynamics_delete(&arguments);
 
     if (F_status_is_error_not(*status) && *status != F_child) {
       fake_build_touch(data, file_stage, status);
@@ -2820,13 +2820,13 @@ extern "C" {
     if (F_status_is_error(*status)) {
       fll_error_print(data.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      fl_string_dynamics_delete(&arguments);
       return 0;
     }
 
     int result = fake_execute(data, data_build.environment, data_build.setting.build_compiler, arguments, status);
 
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    fl_string_dynamics_delete(&arguments);
 
     if (F_status_is_error_not(*status) && *status != F_child) {
       fake_build_touch(data, file_stage, status);
@@ -2938,13 +2938,13 @@ extern "C" {
     if (F_status_is_error(*status)) {
       fll_error_print(data.error, F_status_set_fine(*status), "fll_execute_arguments_add", F_true);
 
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      fl_string_dynamics_delete(&arguments);
       return 0;
     }
 
     int result = fake_execute(data, data_build.environment, data_build.setting.build_compiler, arguments, status);
 
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    fl_string_dynamics_delete(&arguments);
 
     if (F_status_is_error_not(*status) && *status != F_child) {
       fake_build_touch(data, file_stage, status);
index c248381fdbe7cbd4707d2a32b29d8913093851cf..b7bc3f64fd16209031ee1139bf6cfdfa1a0766c2 100644 (file)
@@ -114,40 +114,40 @@ extern "C" {
   }
 
   #define fake_macro_build_setting_t_delete_simple(setting) \
-    f_macro_string_dynamic_t_delete_simple(setting.build_compiler) \
-    f_macro_string_dynamic_t_delete_simple(setting.build_indexer) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_headers) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_language) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_library_script) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_library_shared) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_library_static) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_program_script) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_program_shared) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_program_static) \
-    f_macro_string_dynamic_t_delete_simple(setting.path_sources) \
-    f_macro_string_dynamic_t_delete_simple(setting.process_post) \
-    f_macro_string_dynamic_t_delete_simple(setting.process_pre) \
-    f_macro_string_dynamic_t_delete_simple(setting.project_name) \
-    f_macro_string_dynamic_t_delete_simple(setting.version_major) \
-    f_macro_string_dynamic_t_delete_simple(setting.version_micro) \
-    f_macro_string_dynamic_t_delete_simple(setting.version_minor) \
-    f_macro_string_dynamics_t_delete_simple(setting.build_libraries) \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_headers) \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_library) \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_program) \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_setting) \
-    f_macro_string_dynamics_t_delete_simple(setting.build_sources_script) \
-    f_macro_string_dynamics_t_delete_simple(setting.defines_all) \
-    f_macro_string_dynamics_t_delete_simple(setting.defines_shared) \
-    f_macro_string_dynamics_t_delete_simple(setting.defines_static) \
-    f_macro_string_dynamics_t_delete_simple(setting.environment) \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_all) \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_library) \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_program) \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_shared) \
-    f_macro_string_dynamics_t_delete_simple(setting.flags_static) \
-    f_macro_string_dynamics_t_delete_simple(setting.modes) \
-    f_macro_string_dynamics_t_delete_simple(setting.modes_default)
+    fl_string_dynamic_delete(&setting.build_compiler); \
+    fl_string_dynamic_delete(&setting.build_indexer); \
+    fl_string_dynamic_delete(&setting.path_headers); \
+    fl_string_dynamic_delete(&setting.path_language); \
+    fl_string_dynamic_delete(&setting.path_library_script); \
+    fl_string_dynamic_delete(&setting.path_library_shared); \
+    fl_string_dynamic_delete(&setting.path_library_static); \
+    fl_string_dynamic_delete(&setting.path_program_script); \
+    fl_string_dynamic_delete(&setting.path_program_shared); \
+    fl_string_dynamic_delete(&setting.path_program_static); \
+    fl_string_dynamic_delete(&setting.path_sources); \
+    fl_string_dynamic_delete(&setting.process_post); \
+    fl_string_dynamic_delete(&setting.process_pre); \
+    fl_string_dynamic_delete(&setting.project_name); \
+    fl_string_dynamic_delete(&setting.version_major); \
+    fl_string_dynamic_delete(&setting.version_micro); \
+    fl_string_dynamic_delete(&setting.version_minor); \
+    fl_string_dynamics_delete(&setting.build_libraries); \
+    fl_string_dynamics_delete(&setting.build_sources_headers); \
+    fl_string_dynamics_delete(&setting.build_sources_library); \
+    fl_string_dynamics_delete(&setting.build_sources_program); \
+    fl_string_dynamics_delete(&setting.build_sources_setting); \
+    fl_string_dynamics_delete(&setting.build_sources_script); \
+    fl_string_dynamics_delete(&setting.defines_all); \
+    fl_string_dynamics_delete(&setting.defines_shared); \
+    fl_string_dynamics_delete(&setting.defines_static); \
+    fl_string_dynamics_delete(&setting.environment); \
+    fl_string_dynamics_delete(&setting.flags_all); \
+    fl_string_dynamics_delete(&setting.flags_library); \
+    fl_string_dynamics_delete(&setting.flags_program); \
+    fl_string_dynamics_delete(&setting.flags_shared); \
+    fl_string_dynamics_delete(&setting.flags_static); \
+    fl_string_dynamics_delete(&setting.modes); \
+    fl_string_dynamics_delete(&setting.modes_default);
 
   #define fake_build_setting_name_build_compiler         "build_compiler"
   #define fake_build_setting_name_build_language         "build_language"
@@ -282,19 +282,19 @@ extern "C" {
   #define fake_build_stage_total 13
 
   #define fake_macro_build_stage_t_delete_simple(stage) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_libraries_script) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_libraries_shared) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_libraries_static) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_objects_static) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_process_post) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_process_pre) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_programs_script) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_programs_shared) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_programs_static) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_skeleton) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_sources_headers) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_sources_script) \
-    f_macro_string_dynamic_t_delete_simple(stage.file_sources_settings)
+    fl_string_dynamic_delete(&stage.file_libraries_script); \
+    fl_string_dynamic_delete(&stage.file_libraries_shared); \
+    fl_string_dynamic_delete(&stage.file_libraries_static); \
+    fl_string_dynamic_delete(&stage.file_objects_static); \
+    fl_string_dynamic_delete(&stage.file_process_post); \
+    fl_string_dynamic_delete(&stage.file_process_pre); \
+    fl_string_dynamic_delete(&stage.file_programs_script); \
+    fl_string_dynamic_delete(&stage.file_programs_shared); \
+    fl_string_dynamic_delete(&stage.file_programs_static); \
+    fl_string_dynamic_delete(&stage.file_skeleton); \
+    fl_string_dynamic_delete(&stage.file_sources_headers); \
+    fl_string_dynamic_delete(&stage.file_sources_script); \
+    fl_string_dynamic_delete(&stage.file_sources_settings);
 
   #define fake_build_stage_built            ".built"
   #define fake_build_stage_libraries_script "libraries_script"
index e8c5601a3380cfed6e449f2ed1ea04107dc4a291..06c201e2b5656e0c4349db90be0adaa059daaac0 100644 (file)
@@ -108,7 +108,7 @@ extern "C" {
           if (F_status_is_error(status)) {
             fll_error_file_print(data.error, F_status_set_fine(status), name_function, F_true, path_file, "allocate buffer size for", fll_error_file_type_file);
 
-            f_macro_string_dynamic_t_delete_simple((*buffer));
+            fl_string_dynamic_delete(&(*buffer));
             return status;
           }
         }
@@ -141,7 +141,7 @@ extern "C" {
     if (F_status_is_error(status)) {
       fll_error_file_print(data.error, F_status_set_fine(status), name_function, F_true, path_file, "read", fll_error_file_type_file);
 
-      f_macro_string_dynamic_t_delete_simple((*buffer));
+      fl_string_dynamic_delete(&(*buffer));
     }
 
     return status;
index 857457d5ae3c7f78366788baf099895664150819..333f5e74544c788590674bc2a928f3acc0778548 100644 (file)
@@ -34,8 +34,8 @@ extern "C" {
   }
 
   #define fake_macro_environment_t_delete_simple(environment) \
-    f_macro_string_dynamics_t_delete_simple(environment.names) \
-    f_macro_string_dynamics_t_delete_simple(environment.values)
+    fl_string_dynamics_delete(&environment.names); \
+    fl_string_dynamics_delete(&environment.values);
 #endif // _di_fake_environment_t_
 
 /**
index 0ba2eb098197590b507c7a6cf6d8e268520fef53..04257d8fce633dcfe3771664e0ce1802e1401874 100644 (file)
@@ -486,12 +486,12 @@ extern "C" {
             } // for
 
             if (F_status_is_error(*status)) {
-              f_macro_string_dynamic_t_delete_simple(name_define);
+              fl_string_dynamic_delete(&name_define);
               break;
             }
 
             *status = F_none;
-            f_macro_string_dynamic_t_delete_simple(name_define);
+            fl_string_dynamic_delete(&name_define);
           }
           else if (fl_string_dynamic_partial_compare_string(fake_make_setting_fail, data_make->buffer, fake_make_setting_fail_length, settings.objects.array[i]) == F_equal_to) {
             if (unmatched_fail) {
@@ -745,7 +745,7 @@ extern "C" {
           }
         } // for
 
-        f_macro_string_dynamic_t_delete_simple(combined);
+        fl_string_dynamic_delete(&combined);
       }
 
       f_macro_string_map_multis_t_delete_simple(define);
@@ -1794,12 +1794,12 @@ extern "C" {
     }
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(value);
+      fl_string_dynamic_delete(&value);
       return status;
     }
 
     if (unmatched) {
-      f_macro_string_dynamic_t_delete_simple(value);
+      fl_string_dynamic_delete(&value);
       return F_false;
     }
 
@@ -1822,7 +1822,7 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(value);
+    fl_string_dynamic_delete(&value);
 
     if (F_status_is_error_not(status)) {
       return F_true;
@@ -1847,15 +1847,15 @@ extern "C" {
 
       status = f_environment_get(name.string, &value);
 
-      f_macro_string_dynamic_t_delete_simple(name);
+      fl_string_dynamic_delete(&name);
     }
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(value);
+      fl_string_dynamic_delete(&value);
       return status;
     }
     else if (status == F_exist_not) {
-      f_macro_string_dynamic_t_delete_simple(value);
+      fl_string_dynamic_delete(&value);
       return F_false;
     }
 
@@ -1878,7 +1878,7 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(value);
+    fl_string_dynamic_delete(&value);
 
     if (F_status_is_error_not(status)) {
       return F_true;
@@ -2233,7 +2233,7 @@ extern "C" {
 
     if (*status == F_status_set_error(F_signal)) {
       for (i = 0; i < section->objects.used; i++) {
-        f_macro_string_dynamics_t_delete_simple(arguments[i]);
+        fl_string_dynamics_delete(&arguments[i]);
       } // for
 
       return 0;
@@ -2268,7 +2268,7 @@ extern "C" {
     }
 
     for (i = 0; i < section->objects.used; i++) {
-      f_macro_string_dynamics_t_delete_simple(arguments[i]);
+      fl_string_dynamics_delete(&arguments[i]);
     } // for
 
     section_stack->used--;
@@ -3563,7 +3563,7 @@ extern "C" {
     }
 
     if (operation == fake_make_operation_type_pop) {
-      f_macro_string_dynamic_t_delete_simple(data_make->path.stack.array[data_make->path.stack.used - 1]);
+      fl_string_dynamic_delete(&data_make->path.stack.array[data_make->path.stack.used - 1]);
 
       data_make->path.stack.used--;
 
@@ -3711,7 +3711,7 @@ extern "C" {
 
       // clear stack, except for the project root.
       for (f_array_length_t i = 1; i < data_make->path.stack.used; i++) {
-        f_macro_string_dynamic_t_delete_simple(data_make->path.stack.array[i]);
+        fl_string_dynamic_delete(&data_make->path.stack.array[i]);
       } // for
 
       data_make->path.stack.used = 1;
@@ -3904,13 +3904,13 @@ extern "C" {
 
           fll_error_print(data_make->error, F_status_set_fine(*status), "f_conversion_number_signed_to_string", F_true);
 
-          f_macro_string_dynamic_t_delete_simple(number);
+          fl_string_dynamic_delete(&number);
           return;
         }
 
         status2 = fl_string_dynamic_append(number, &data_make->setting_make.parameter.array[0].value.array[0]);
 
-        f_macro_string_dynamic_t_delete_simple(number);
+        fl_string_dynamic_delete(&number);
       }
       else {
         status2 = fl_string_append("0", 1, &data_make->setting_make.parameter.array[0].value.array[0]);
@@ -3971,7 +3971,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data_make->error, F_status_set_fine(status), "fl_string_dynamic_append", F_true);
 
-          f_macro_string_dynamics_t_delete_simple(args);
+          fl_string_dynamics_delete(&args);
           return status;
         }
 
@@ -3980,7 +3980,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data_make->error, F_status_set_fine(status), "fl_string_dynamic_terminate", F_true);
 
-          f_macro_string_dynamics_t_delete_simple(args);
+          fl_string_dynamics_delete(&args);
           return status;
         }
 
@@ -3990,7 +3990,7 @@ extern "C" {
 
     status = fake_make_operate_process_execute(data, *program, args, as_shell, data_make);
 
-    f_macro_string_dynamics_t_delete_simple(args);
+    fl_string_dynamics_delete(&args);
     return status;
   }
 #endif // _di_fake_make_operate_process_run_
index 5a412c35d5ecb4c814f917cfd1ebff971e5c256f..b06db37f9b4936b0ddce94a0d229f355e4c91b75 100644 (file)
@@ -317,17 +317,17 @@ extern "C" {
   }
 
   #define fake_macro_make_parameter_delete_simple(parameter) \
-    f_macro_string_dynamics_t_delete_simple(parameter.build) \
-    f_macro_string_dynamics_t_delete_simple(parameter.color) \
-    f_macro_string_dynamics_t_delete_simple(parameter.data) \
-    f_macro_string_dynamics_t_delete_simple(parameter.define) \
-    f_macro_string_dynamics_t_delete_simple(parameter.fakefile) \
-    f_macro_string_dynamics_t_delete_simple(parameter.mode) \
-    f_macro_string_dynamics_t_delete_simple(parameter.process) \
-    f_macro_string_dynamics_t_delete_simple(parameter.settings) \
-    f_macro_string_dynamics_t_delete_simple(parameter.sources) \
-    f_macro_string_dynamics_t_delete_simple(parameter.verbosity) \
-    f_macro_string_dynamics_t_delete_simple(parameter.work)
+    fl_string_dynamics_delete(&parameter.build); \
+    fl_string_dynamics_delete(&parameter.color); \
+    fl_string_dynamics_delete(&parameter.data); \
+    fl_string_dynamics_delete(&parameter.define); \
+    fl_string_dynamics_delete(&parameter.fakefile); \
+    fl_string_dynamics_delete(&parameter.mode); \
+    fl_string_dynamics_delete(&parameter.process); \
+    fl_string_dynamics_delete(&parameter.settings); \
+    fl_string_dynamics_delete(&parameter.sources); \
+    fl_string_dynamics_delete(&parameter.verbosity); \
+    fl_string_dynamics_delete(&parameter.work);
 #endif // _di_fake_make_parameter_t_
 
 #ifndef _di_fake_make_path_t_
@@ -345,7 +345,7 @@ extern "C" {
   }
 
   #define fake_macro_make_path_delete_simple(path) \
-    f_macro_string_dynamics_t_delete_simple(path.stack)
+    fl_string_dynamics_delete(&path.stack);
 #endif // _di_fake_make_path_t_
 
 #ifndef _di_fake_make_data_t_
@@ -388,8 +388,8 @@ extern "C" {
     fake_macro_make_parameter_delete_simple(data.parameter) \
     fake_macro_make_path_delete_simple(data.path) \
     f_macro_fss_nameds_t_delete_simple(data.fakefile) \
-    f_macro_string_dynamic_t_delete_simple(data.buffer) \
-    f_macro_string_dynamic_t_delete_simple(data.path_cache)
+    fl_string_dynamic_delete(&data.buffer); \
+    fl_string_dynamic_delete(&data.path_cache);
 #endif // _di_fake_make_data_t_
 
 /**
@@ -632,8 +632,8 @@ extern "C" {
  *   The current operation stack.
  * @param status
  *   F_none on success.
- *   F_valid_not (with error bit set) is returned if any part of the section is invalid, such as an invalid operation name.
- *   F_recurse (with error bit set) is returned if unable to recurse to another operation section (usually max stack depth reached).
+ *   F_valid_not (with error bit) is returned if any part of the section is invalid, such as an invalid operation name.
+ *   F_recurse (with error bit) is returned if unable to recurse to another operation section (usually max stack depth reached).
  *
  *   Status codes (with error bit) are returned on any problem.
  *
index a9e541c765f291534bb9a903dffe7fae83e89faa..0cc08a14544038552100583f3b88e51a6da8532a 100644 (file)
@@ -147,8 +147,8 @@ extern "C" {
     }
 
     if (F_status_is_error(status)) {
-      f_macro_string_dynamic_t_delete_simple(file_data_build_process_post);
-      f_macro_string_dynamic_t_delete_simple(file_data_build_process_pre);
+      fl_string_dynamic_delete(&file_data_build_process_post);
+      fl_string_dynamic_delete(&file_data_build_process_pre);
       return status;
     }
 
index 2abbb7e9fc170c1da5aab1b1871b605b94684bd1..844c7f08335db58201c94a89847116201a02d327 100644 (file)
@@ -365,7 +365,7 @@ extern "C" {
         parameters.array[5].used = 0;
         parameters.array[6].used = 0;
 
-        f_macro_string_dynamics_t_delete_simple( parameters);
+        fl_string_dynamics_delete(& parameters);
         firewall_delete_local_data(&local);
         firewall_delete_data(data);
         return status;
@@ -600,7 +600,7 @@ extern "C" {
 
             status = firewall_buffer_rules(file_path.string, F_true, &local, data);
 
-            f_macro_string_dynamic_t_delete_simple(file_path);
+            fl_string_dynamic_delete(&file_path);
           }
 
           if (F_status_is_error(status)) {
@@ -717,9 +717,9 @@ extern "C" {
       f_macro_string_lengths_t_delete_simple(data->parameters[i].values);
     } // for
 
-    f_macro_string_dynamics_t_delete_simple(data->chains);
+    fl_string_dynamics_delete(&data->chains);
     f_macro_string_lengths_t_delete_simple(data->remaining);
-    f_macro_string_dynamics_t_delete_simple(data->devices);
+    fl_string_dynamics_delete(&data->devices);
 
     f_macro_color_context_t_delete_simple(data->context);
 
index 13f7b05c032e7514bcd2c7d797601f105eccbf3a..95e8438c7a4e5233329409d96e7e2a9cb542a21e 100644 (file)
@@ -44,7 +44,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
       f_macro_string_dynamic_t_new(status, device, data.devices.array[local.device].used);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamic_t_delete_simple(device);
+        fl_string_dynamic_delete(&device);
 
         return status;
       }
@@ -66,7 +66,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
     is_ip_list = F_false;
     ip_list_direction = F_false;
 
-    f_macro_string_dynamic_t_delete_simple(ip_list);
+    fl_string_dynamic_delete(&ip_list);
 
     // process chain rule
     if (length >= firewall_chain_length && fl_string_compare(local.buffer.string + local.rule_objects.array[i].start, (f_string_t) firewall_chain, length, firewall_chain_length) == F_equal_to) {
@@ -136,7 +136,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
         invalid = F_true;
       }
       else if (length >= firewall_device_all_length && fl_string_compare(local.buffer.string + local.rule_contents.array[i].array[0].start, (f_string_t) firewall_device_all, length, firewall_device_all_length) == F_equal_to) {
-        f_macro_string_dynamic_t_delete_simple(device);
+        fl_string_dynamic_delete(&device);
         device_all = F_true;
         continue;
       }
@@ -153,7 +153,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
           device.used = data.devices.array[local.device].used;
         }
         else {
-          f_macro_string_dynamic_t_delete_simple(device);
+          fl_string_dynamic_delete(&device);
         }
 
         device_all = F_false;
@@ -172,7 +172,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
           device.used = length;
         }
         else {
-          f_macro_string_dynamic_t_delete_simple(device);
+          fl_string_dynamic_delete(&device);
         }
 
         device_all = F_false;
@@ -230,7 +230,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
           use_protocol = F_false;
         }
         else if (length > 0) {
-          f_macro_string_dynamic_t_delete_simple(protocol);
+          fl_string_dynamic_delete(&protocol);
           f_macro_string_dynamic_t_new(status, protocol, length);
 
           if (F_status_is_error(status)) break;
@@ -319,7 +319,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
     for (r = repeat; r > 0; r--) {
 
       // first add the program name
-      f_macro_string_dynamics_t_delete_simple(arguments);
+      fl_string_dynamics_delete(&arguments);
       f_macro_string_dynamics_new(status, arguments, firewall_default_allocation_step);
 
       if (F_status_is_error(status)) break;
@@ -335,7 +335,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(argument);
+      fl_string_dynamic_delete(&argument);
 
       if (F_status_is_error(status)) break;
 
@@ -369,7 +369,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
         if (argument.used > 0) {
           firewall_macro_append_argument_to_arguments(status, arguments, argument)
           if (F_status_is_error(status)) {
-            f_macro_string_dynamic_t_delete_simple(argument);
+            fl_string_dynamic_delete(&argument);
             break;
           }
 
@@ -711,14 +711,14 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
                 if (F_status_is_error(status)) {
                   fl_color_print(data.error.to.stream, data.context.set.error, "%sUnable to allocate memory.%c", fll_error_print_error, f_string_eol[0]);
 
-                  f_macro_string_dynamic_t_delete_simple(ip_list_action);
+                  fl_string_dynamic_delete(&ip_list_action);
                 }
                 else {
                   f_string_dynamic_t ip_argument = f_string_dynamic_t_initialize;
 
                   firewall_macro_append_argument_to_arguments(status, arguments, ip_list_action)
                   if (F_status_is_error(status)) {
-                    f_macro_string_dynamic_t_delete_simple(ip_argument);
+                    fl_string_dynamic_delete(&ip_argument);
                     break;
                   }
 
@@ -774,7 +774,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
                       fprintf(f_type_error, "\n");
 
                       // remove ip_argument from arguments string.
-                      f_macro_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
+                      fl_string_dynamic_delete(&arguments.array[arguments.used]);
                       arguments.used--;
 
                       break;
@@ -783,21 +783,21 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
                       fl_color_print(data.error.to.stream, data.context.set.error, "%sInvalid parameter when calling fll_execute_program()%c", fll_error_print_error, f_string_eol[0]);
 
                       // remove ip_argument from arguments string.
-                      f_macro_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
+                      fl_string_dynamic_delete(&arguments.array[arguments.used]);
                       arguments.used--;
 
                       break;
                     }
 
                     // remove ip_argument from arguments string.
-                    f_macro_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
+                    fl_string_dynamic_delete(&arguments.array[arguments.used]);
                     arguments.used--;
                   } // for
 
-                  f_macro_string_dynamic_t_delete_simple(ip_argument);
+                  fl_string_dynamic_delete(&ip_argument);
 
                   // remove ip_list_action from arguments string.
-                  f_macro_string_dynamic_t_delete_simple(arguments.array[arguments.used]);
+                  fl_string_dynamic_delete(&arguments.array[arguments.used]);
                   arguments.used--;
                 }
               }
@@ -806,8 +806,8 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
             }
           }
 
-          f_macro_string_dynamic_t_delete_simple(local_buffer);
-          f_macro_string_dynamic_t_delete_simple(file_path);
+          fl_string_dynamic_delete(&local_buffer);
+          fl_string_dynamic_delete(&file_path);
           f_macro_fss_objects_t_delete_simple(basic_objects);
           f_macro_fss_contents_t_delete_simple(basic_contents);
 
@@ -857,11 +857,11 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con
     } // for
   } // for
 
-  f_macro_string_dynamic_t_delete_simple(ip_list);
-  f_macro_string_dynamic_t_delete_simple(argument);
-  f_macro_string_dynamics_t_delete_simple(arguments);
-  f_macro_string_dynamic_t_delete_simple(device);
-  f_macro_string_dynamic_t_delete_simple(protocol);
+  fl_string_dynamic_delete(&ip_list);
+  fl_string_dynamic_delete(&argument);
+  fl_string_dynamics_delete(&arguments);
+  fl_string_dynamic_delete(&device);
+  fl_string_dynamic_delete(&protocol);
 
   return status;
 }
@@ -899,7 +899,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv
   f_macro_string_dynamic_t_new(status, arguments.array[0], firewall_chain_create_command_length);
 
   if (F_status_is_error(status)) {
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    fl_string_dynamics_delete(&arguments);
 
     return status;
   }
@@ -912,7 +912,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv
 
   if (F_status_is_error(status)) {
     arguments.used = 1;
-    f_macro_string_dynamics_t_delete_simple(arguments);
+    fl_string_dynamics_delete(&arguments);
 
     return status;
   }
@@ -992,7 +992,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv
         f_macro_string_dynamics_t_resize(status, data->chains, data->chains.used + firewall_default_allocation_step);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          fl_string_dynamics_delete(&arguments);
 
           return status;
         }
@@ -1006,7 +1006,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv
         f_macro_string_dynamic_t_resize(status, arguments.array[1], length);
 
         if (F_status_is_error(status)) {
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          fl_string_dynamics_delete(&arguments);
 
           return status;
         }
@@ -1015,7 +1015,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv
       f_macro_string_dynamic_t_new(status, data->chains.array[data->chains.used], length);
 
       if (F_status_is_error(status)) {
-        f_macro_string_dynamics_t_delete_simple(arguments);
+        fl_string_dynamics_delete(&arguments);
 
         return status;
       }
@@ -1134,7 +1134,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv
             fl_color_print(data->error.to.stream, data->context.set.error, "%sAn unhandled error (%u) has occurred while calling fll_execute_program()%c", fll_error_print_error, status, f_string_eol[0]);
           }
 
-          f_macro_string_dynamics_t_delete_simple(arguments);
+          fl_string_dynamics_delete(&arguments);
           return status;
         }
       }
@@ -1145,7 +1145,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv
     i++;
   } // while
 
-  f_macro_string_dynamics_t_delete_simple(arguments);
+  fl_string_dynamics_delete(&arguments);
 
   return status;
 }
@@ -1520,7 +1520,7 @@ f_return_status firewall_delete_local_data(firewall_local_data_t *local) {
   local->device = 0;
   local->chain = 0;
 
-  f_macro_string_dynamic_t_delete_simple(local->buffer);
+  fl_string_dynamic_delete(&local->buffer);
   f_macro_array_lengths_t_delete_simple(local->chain_ids);
   f_macro_fss_objects_t_delete_simple(local->chain_objects);
   f_macro_fss_contents_t_delete_simple(local->chain_contents);
index a33092074196c6a6dc363b7730a3369097eb0c8e..f6051e43155716540770f827d067bb8d3eb1f4b0 100644 (file)
@@ -440,7 +440,7 @@ extern "C" {
         // Clear buffers before continuing.
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
       }
 
       if (F_status_is_error_not(status) && data->remaining.used > 0) {
@@ -496,13 +496,13 @@ extern "C" {
           // Clear buffers before repeating the loop.
           f_macro_fss_contents_t_delete_simple(data->contents);
           f_macro_fss_objects_t_delete_simple(data->objects);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         } // for
 
         if (F_status_is_error(status)) {
           f_macro_fss_contents_t_delete_simple(data->contents);
           f_macro_fss_objects_t_delete_simple(data->objects);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         }
       }
 
@@ -531,7 +531,7 @@ extern "C" {
 
     f_macro_fss_contents_t_delete_simple(data->contents);
     f_macro_fss_objects_t_delete_simple(data->objects);
-    f_macro_string_dynamic_t_delete_simple(data->buffer);
+    fl_string_dynamic_delete(&data->buffer);
     f_macro_string_lengths_t_delete_simple(data->remaining);
 
     f_macro_color_context_t_delete_simple(data->context);
index a05252d1c848d2cbb0c809b5c5d7718f4cc0366a..d47adb96045574c7a8e33af2fa5faee92386a27d 100644 (file)
@@ -196,7 +196,7 @@ extern "C" {
       else if (status == F_data_not_stop || status == F_data_not_eos) {
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         if (data->parameters[fss_basic_list_read_parameter_total].result == f_console_result_found) {
           fprintf(data->output.stream, "0%c", f_string_eol[0]);
@@ -209,7 +209,7 @@ extern "C" {
       if (F_status_is_error(status)) {
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         return status;
       }
index 0c53c1059b621b45cfb447089d60dc3fb40e67cf..3857a7a047f26a8ea69650c8b693e7b301ab2fb0 100644 (file)
@@ -457,7 +457,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      fl_string_dynamic_delete(&escaped);
 
       // object and content, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
       object.string = 0;
@@ -482,9 +482,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    fl_string_dynamic_delete(&buffer);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamic_delete(&content);
     fss_basic_list_write_delete_data(data);
     return status;
   }
index 5cf16ca528aec7b0d7667b81dea68cee28c57c42..d3f052cfe937bcacea25258a8fbce95cf47f47eb 100644 (file)
@@ -275,9 +275,9 @@ extern "C" {
       status = fss_basic_list_write_process(data, output, quote, &object, &content, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    fl_string_dynamic_delete(&block);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamic_delete(&content);
     return status;
   }
 #endif // _di_fss_basic_list_write_process_pipe_
index 412c4b99a1da008bfbacb09e1fbe2cd0738a624a..96ea46db9a63c261aa204ad43c7bb287ae4147bb 100644 (file)
@@ -439,7 +439,7 @@ extern "C" {
         // Clear buffers before continuing.
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
       }
 
       if (F_status_is_error_not(status) && data->remaining.used > 0) {
@@ -495,13 +495,13 @@ extern "C" {
           // Clear buffers before repeating the loop.
           f_macro_fss_contents_t_delete_simple(data->contents);
           f_macro_fss_objects_t_delete_simple(data->objects);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         } // for
 
         if (F_status_is_error(status)) {
           f_macro_fss_contents_t_delete_simple(data->contents);
           f_macro_fss_objects_t_delete_simple(data->objects);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         }
       }
 
@@ -529,7 +529,7 @@ extern "C" {
 
     f_macro_fss_contents_t_delete_simple(data->contents);
     f_macro_fss_objects_t_delete_simple(data->objects);
-    f_macro_string_dynamic_t_delete_simple(data->buffer);
+    fl_string_dynamic_delete(&data->buffer);
     f_macro_string_lengths_t_delete_simple(data->remaining);
 
     f_macro_color_context_t_delete_simple(data->context);
index b1b42ac55392999e7bddda9f132836f48bd2c8ad..e9bbb47385ed7d1809cd085d2b5d297702443a47 100644 (file)
@@ -195,7 +195,7 @@ extern "C" {
       else if (status == F_data_not_stop || status == F_data_not_eos) {
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         if (data->parameters[fss_basic_read_parameter_total].result == f_console_result_found) {
           fprintf(data->output.stream, "0%c", f_string_eol[0]);
@@ -208,7 +208,7 @@ extern "C" {
       if (F_status_is_error(status)) {
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         return status;
       }
index d909e8509ca31eb1e4fd4f110718490ae9dab036..cf0fcd1af21355d7ad9e82cf7aedbaccdee1723b 100644 (file)
@@ -456,7 +456,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      fl_string_dynamic_delete(&escaped);
 
       // object and content, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
       object.string = 0;
@@ -481,9 +481,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    fl_string_dynamic_delete(&buffer);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamic_delete(&content);
     fss_basic_write_delete_data(data);
     return status;
   }
index 4f2a55342a63aea58ffc90e4c485a9550d2a60bc..f418a33516af0184ae7a8b9feb013c6d3ad77eb7 100644 (file)
@@ -294,9 +294,9 @@ extern "C" {
       status = fss_basic_write_process(data, output, quote, &object, &content, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    fl_string_dynamic_delete(&block);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamic_delete(&content);
     return status;
   }
 #endif // _di_fss_basic_write_process_pipe_
index abcc40cbacbf3f2c6c2bfc017e2b5f11e6d22e50..35203fa2aa3907203f840cc598c810e9d17b7347 100644 (file)
@@ -426,7 +426,7 @@ extern "C" {
 
         // Clear buffers before continuing.
         f_macro_fss_nest_t_delete_simple(data->nest);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
       }
 
       if (F_status_is_error_not(status) && data->remaining.used > 0) {
@@ -480,12 +480,12 @@ extern "C" {
 
           // Clear buffers before repeating the loop.
           f_macro_fss_nest_t_delete_simple(data->nest);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         } // for
 
         if (F_status_is_error(status)) {
           f_macro_fss_nest_t_delete_simple(data->nest);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         }
       }
 
@@ -515,7 +515,7 @@ extern "C" {
 
     f_macro_fss_nest_t_delete_simple(data->nest);
 
-    f_macro_string_dynamic_t_delete_simple(data->buffer);
+    fl_string_dynamic_delete(&data->buffer);
     f_macro_string_lengths_t_delete_simple(data->remaining);
 
     f_macro_color_context_t_delete_simple(data->context);
index 3523db1df29e3829a9e4cca15e13ee0d4338e2de..0127c0aea139c3f1abaef20cff77d414ccf0176e 100644 (file)
@@ -234,7 +234,7 @@ extern "C" {
       }
       else if (status == F_data_not_stop || status == F_data_not_eos) {
         f_macro_fss_nest_t_delete_simple(data->nest);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         if (data->parameters[fss_embedded_list_read_parameter_total].result == f_console_result_found) {
           fprintf(data->output.stream, "0%c", f_string_eol[0]);
@@ -246,7 +246,7 @@ extern "C" {
 
       if (F_status_is_error(status)) {
         f_macro_fss_nest_t_delete_simple(data->nest);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         return status;
       }
index c31bc373fcc27817d803db5a53f275d93cd021d0..e6c58341ebe80a31feacd5a3bdb635f4696250fa 100644 (file)
@@ -473,7 +473,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      fl_string_dynamic_delete(&escaped);
       f_macro_string_ranges_t_delete_simple(ignore);
 
       // object and content, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
@@ -499,9 +499,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    fl_string_dynamic_delete(&buffer);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamic_delete(&content);
     fss_embedded_list_write_delete_data(data);
     return status;
   }
index e7af3b707dec48182744fe563378ab809b471f00..fb76c53627da700b1e1331281abfe24b00a26566 100644 (file)
@@ -314,9 +314,9 @@ extern "C" {
       status = fss_embedded_list_write_process(data, output, quote, &object, &content, ignore, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    fl_string_dynamic_delete(&block);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamic_delete(&content);
     return status;
   }
 #endif // _di_fss_embedded_list_write_process_pipe_
index 845fab7c2b9bd66d66ab37e90a1a86517df5d65b..7a7030cb082bf8cf4fc7a466958a9ed5adcd77ce 100644 (file)
@@ -440,7 +440,7 @@ extern "C" {
         // Clear buffers before continuing.
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
       }
 
       if (F_status_is_error_not(status) && data->remaining.used > 0) {
@@ -496,13 +496,13 @@ extern "C" {
           // Clear buffers before repeating the loop.
           f_macro_fss_contents_t_delete_simple(data->contents);
           f_macro_fss_objects_t_delete_simple(data->objects);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         } // for
 
         if (F_status_is_error(status)) {
           f_macro_fss_contents_t_delete_simple(data->contents);
           f_macro_fss_objects_t_delete_simple(data->objects);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         }
       }
 
@@ -531,7 +531,7 @@ extern "C" {
 
     f_macro_fss_contents_t_delete_simple(data->contents);
     f_macro_fss_objects_t_delete_simple(data->objects);
-    f_macro_string_dynamic_t_delete_simple(data->buffer);
+    fl_string_dynamic_delete(&data->buffer);
     f_macro_string_lengths_t_delete_simple(data->remaining);
 
     f_macro_color_context_t_delete_simple(data->context);
index 9e71171061c30295a0ec0d32ce6678bccf51e4e8..1f9e2b4c60b220880fb53e63e4791caa7abeacaf 100644 (file)
@@ -196,7 +196,7 @@ extern "C" {
       else if (status == F_data_not_stop || status == F_data_not_eos) {
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         if (data->parameters[fss_extended_list_read_parameter_total].result == f_console_result_found) {
           fprintf(data->output.stream, "0%c", f_string_eol[0]);
@@ -209,7 +209,7 @@ extern "C" {
       if (F_status_is_error(status)) {
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         return status;
       }
index 687b0c8436bf5c9c0d475832fb293d1d68bd5ea9..cf370f4ddbdf043d04a8101b83a822600cde98fb 100644 (file)
@@ -473,7 +473,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      fl_string_dynamic_delete(&escaped);
       f_macro_string_ranges_t_delete_simple(ignore);
 
       // object and content, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
@@ -499,9 +499,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    fl_string_dynamic_delete(&buffer);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamic_delete(&content);
     fss_extended_list_write_delete_data(data);
     return status;
   }
index 691e4fd76c6d623b3acdfe9aecaba643fbed34c7..12b93c9145c522f55a065c2bc2ee0d673e621ca8 100644 (file)
@@ -314,9 +314,9 @@ extern "C" {
       status = fss_extended_list_write_process(data, output, quote, &object, &content, ignore, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamic_t_delete_simple(content);
+    fl_string_dynamic_delete(&block);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamic_delete(&content);
     return status;
   }
 #endif // _di_fss_extended_list_write_process_pipe_
index 2742f231f63c86632c47bf23174e727dc150d58f..b40869abf7a73609907ccbad0cecd8d0f0742d14 100644 (file)
@@ -440,7 +440,7 @@ extern "C" {
         // Clear buffers before continuing.
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
       }
 
       if (F_status_is_error_not(status) && data->remaining.used > 0) {
@@ -496,13 +496,13 @@ extern "C" {
           // Clear buffers before repeating the loop.
           f_macro_fss_contents_t_delete_simple(data->contents);
           f_macro_fss_objects_t_delete_simple(data->objects);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         } // for
 
         if (F_status_is_error(status)) {
           f_macro_fss_contents_t_delete_simple(data->contents);
           f_macro_fss_objects_t_delete_simple(data->objects);
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         }
       }
 
@@ -531,7 +531,7 @@ extern "C" {
 
     f_macro_fss_contents_t_delete_simple(data->contents);
     f_macro_fss_objects_t_delete_simple(data->objects);
-    f_macro_string_dynamic_t_delete_simple(data->buffer);
+    fl_string_dynamic_delete(&data->buffer);
     f_macro_string_lengths_t_delete_simple(data->remaining);
 
     f_macro_color_context_t_delete_simple(data->context);
index 81f698604acf2c87942b9593299501c5f0e35c4d..602003bc1452e250719d4e8c1c0429da8f485fcd 100644 (file)
@@ -223,7 +223,7 @@ extern "C" {
       else if (status == F_data_not_stop || status == F_data_not_eos) {
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         if (data->parameters[fss_extended_read_parameter_total].result == f_console_result_found) {
           fprintf(data->output.stream, "0%c", f_string_eol[0]);
@@ -236,7 +236,7 @@ extern "C" {
       if (F_status_is_error(status)) {
         f_macro_fss_contents_t_delete_simple(data->contents);
         f_macro_fss_objects_t_delete_simple(data->objects);
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
 
         return status;
       }
index 5e973ad3ed6f0dc659129286fa97eaba0fa7254f..f0fea6eb22d0935927a426640d073944f1855e0a 100644 (file)
@@ -531,7 +531,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      fl_string_dynamic_delete(&escaped);
 
       // object, though being a "dynamic" type, is being used statically, so clear them up to avoid invalid free().
       object.string = 0;
@@ -555,9 +555,9 @@ extern "C" {
       }
     }
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamics_t_delete_simple(contents);
+    fl_string_dynamic_delete(&buffer);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamics_delete(&contents);
     fss_extended_write_delete_data(data);
     return status;
   }
index 5cd2b2a9d0d243d70d5cada12287a72aa78bb0ec..67593f3f19c4b8ba4726517e007a08ccdf026ead 100644 (file)
@@ -324,9 +324,9 @@ extern "C" {
       status = fss_extended_write_process(data, output, quote, &object, &contents, buffer);
     }
 
-    f_macro_string_dynamic_t_delete_simple(block);
-    f_macro_string_dynamic_t_delete_simple(object);
-    f_macro_string_dynamics_t_delete_simple(contents);
+    fl_string_dynamic_delete(&block);
+    fl_string_dynamic_delete(&object);
+    fl_string_dynamics_delete(&contents);
     return status;
   }
 #endif // _di_fss_extended_write_process_pipe_
index ac7906d07a415e6dcbd51a8cc65e811d2aa5ee06..904462490e8201e4fe4fab1933324e547fbc2405 100644 (file)
@@ -385,7 +385,7 @@ extern "C" {
         }
 
         // Clear buffers before continuing.
-        f_macro_string_dynamic_t_delete_simple(data->buffer);
+        fl_string_dynamic_delete(&data->buffer);
       }
 
       if (F_status_is_fine(status) && data->remaining.used > 0) {
@@ -432,7 +432,7 @@ extern "C" {
           if (F_status_is_error(status)) break;
 
           // Clear buffers before repeating the loop.
-          f_macro_string_dynamic_t_delete_simple(data->buffer);
+          fl_string_dynamic_delete(&data->buffer);
         } // for
       }
     }
@@ -467,7 +467,7 @@ extern "C" {
     } // for
 
     f_macro_string_lengths_t_delete_simple(data->remaining);
-    f_macro_string_dynamic_t_delete_simple(data->buffer);
+    fl_string_dynamic_delete(&data->buffer);
 
     f_macro_color_context_t_delete_simple(data->context);
 
index c8a467709ec351cb649cb5094af2ef2b12b6a329..6381e4e04a644e2084015d6b1ffa48293bdd744e 100644 (file)
@@ -153,7 +153,7 @@ extern "C" {
             iki_read_macro_substitutions_t_delete_simple(substitutionss[i]);
           } // for
 
-          f_macro_string_dynamic_t_delete_simple(name);
+          fl_string_dynamic_delete(&name);
           return status;
         }
 
@@ -178,7 +178,7 @@ extern "C" {
         } // for
       } // for
 
-      f_macro_string_dynamic_t_delete_simple(name);
+      fl_string_dynamic_delete(&name);
 
       if (unmatched) status = F_data_not;
       else status = F_none;
@@ -302,7 +302,7 @@ extern "C" {
           iki_read_macro_substitutions_t_delete_simple(substitutionss[i]);
         } // for
 
-        f_macro_string_dynamics_t_delete_simple(names);
+        fl_string_dynamics_delete(&names);
         return status;
       }
     }
@@ -383,7 +383,7 @@ extern "C" {
       iki_read_macro_substitutions_t_delete_simple(substitutionss[i]);
     } // for
 
-    f_macro_string_dynamics_t_delete_simple(names);
+    fl_string_dynamics_delete(&names);
     return F_none;
   }
 #endif // _di_iki_read_process_buffer_ranges_whole_
@@ -434,7 +434,7 @@ extern "C" {
         if (F_status_is_error(status)) {
           fll_error_print(data->error, F_status_set_fine(status), "fl_string_append_nulless", F_true);
 
-          f_macro_string_dynamic_t_delete_simple(name);
+          fl_string_dynamic_delete(&name);
           return status;
         }
 
@@ -447,7 +447,7 @@ extern "C" {
         } // for
       } // for
 
-      f_macro_string_dynamic_t_delete_simple(name);
+      fl_string_dynamic_delete(&name);
     }
     else {
       total = variable->used;
index ff95dae82b186565d187dd853722306cb1d1f138..636f65abf56005307a12861c0ab385ee61ad5e26 100644 (file)
@@ -351,9 +351,9 @@ extern "C" {
           status = F_status_set_error(F_parameter);
         }
 
-        f_macro_string_dynamic_t_delete_simple(buffer);
-        f_macro_string_dynamic_t_delete_simple(object);
-        f_macro_string_dynamic_t_delete_simple(content);
+        fl_string_dynamic_delete(&buffer);
+        fl_string_dynamic_delete(&object);
+        fl_string_dynamic_delete(&content);
       }
 
       if (F_status_is_error_not(status)) {
@@ -382,7 +382,7 @@ extern "C" {
         }
       }
 
-      f_macro_string_dynamic_t_delete_simple(escaped);
+      fl_string_dynamic_delete(&escaped);
     }
 
     if (data->parameters[iki_write_parameter_file].result == f_console_result_additional) {
@@ -413,7 +413,7 @@ extern "C" {
     } // for
 
     f_macro_string_lengths_t_delete_simple(data->remaining);
-    f_macro_string_dynamic_t_delete_simple(data->buffer);
+    fl_string_dynamic_delete(&data->buffer);
 
     f_macro_color_context_t_delete_simple(data->context);
 
index dbc8d5032a0f5c4b627117e692ab1bda552da922..bb533ef90fa515d1458eb27bbbf04a08ebe61ad7 100644 (file)
@@ -47,7 +47,7 @@ extern "C" {
     if (F_status_is_error(status)) {
       fll_error_print(data.error, F_status_set_fine(status), "fll_iki_content_escape", F_true);
 
-      f_macro_string_dynamic_t_delete_simple((*escaped));
+      fl_string_dynamic_delete(&(*escaped));
       return F_status_set_error(F_failure);
     }
 
index bac47ac3a1b981cf4ec867e773e1e939e467d5cd..81f146a1f17d9f19998bcb692d3bd65b8d2bf944 100644 (file)
@@ -99,12 +99,12 @@ extern "C" {
 
     f_macro_string_lengths_t_delete_simple(data->remaining);
 
-    f_macro_string_dynamic_t_delete_simple(data->setting_kernel.root);
-    f_macro_string_dynamic_t_delete_simple(data->setting_kernel.root_group);
-    f_macro_string_dynamic_t_delete_simple(data->setting_kernel.root_sub);
-    f_macro_string_dynamic_t_delete_simple(data->setting_kernel.run);
-    f_macro_string_dynamic_t_delete_simple(data->setting_kernel.settings);
-    f_macro_string_dynamic_t_delete_simple(data->setting_kernel.settings_name);
+    fl_string_dynamic_delete(&data->setting_kernel.root);
+    fl_string_dynamic_delete(&data->setting_kernel.root_group);
+    fl_string_dynamic_delete(&data->setting_kernel.root_sub);
+    fl_string_dynamic_delete(&data->setting_kernel.run);
+    fl_string_dynamic_delete(&data->setting_kernel.settings);
+    fl_string_dynamic_delete(&data->setting_kernel.settings_name);
 
     f_macro_color_context_t_delete_simple(data->context);
 
index 760ab4f2468046f3fab8ac20e768c793d71a0b55..4e0b1f68cd75161d8ef1ce45f7dff44eb551153d 100644 (file)
@@ -325,12 +325,12 @@ Consider the "*.device" files such that they are also use IKI.
       f_macro_iki_variable_t_delete_simple(variable);
       f_macro_iki_vocabulary_t_delete_simple(vocabulary);
       f_macro_iki_content_t_delete_simple(content);
-      f_macro_string_dynamic_t_delete_simple(cache);
+      fl_string_dynamic_delete(&cache);
     }
 
     f_file_stream_close(F_true, &command_line);
 
-    f_macro_string_dynamic_t_delete_simple(buffer);
+    fl_string_dynamic_delete(&buffer);
 
     return status;
   }