From 36879628ed43c462be1b31fd4b590fe2d7548394 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 5 Jan 2021 00:01:57 -0600 Subject: [PATCH] Update: memory changes, macro changes, and return type changes. The practice of having an increase(), increase_by(), etc.. has become standard. Redesign the code to better follow this, simplifying the code base some. There is more work to do in this regard, but this focuses on just changing the existing code. While I prefer to always return "const" where I can, simplify the design to always return "f_status_t" instead of using the wrapping macro "f_return_status". This will make things between C and C++ more consistent. --- build/level_0/settings | 8 +- build/monolithic/settings | 12 +- level_0/f_account/c/account.c | 10 +- level_0/f_account/c/account.h | 10 +- level_0/f_account/c/private-account.c | 2 +- level_0/f_account/c/private-account.h | 2 +- level_0/f_capability/c/capability.c | 68 +- level_0/f_capability/c/capability.h | 34 +- level_0/f_console/c/console.c | 8 +- level_0/f_console/c/console.h | 8 +- level_0/f_conversion/c/conversion.c | 24 +- level_0/f_conversion/c/conversion.h | 24 +- level_0/f_directory/c/directory.c | 26 +- level_0/f_directory/c/directory.h | 26 +- level_0/f_directory/c/private-directory.c | 4 +- level_0/f_directory/c/private-directory.h | 4 +- level_0/f_environment/c/environment.c | 16 +- level_0/f_environment/c/environment.h | 16 +- level_0/f_environment/c/private-environment.c | 6 +- level_0/f_environment/c/private-environment.h | 6 +- level_0/f_file/c/file.c | 144 +-- level_0/f_file/c/file.h | 144 +-- level_0/f_file/c/private-file.c | 54 +- level_0/f_file/c/private-file.h | 52 +- level_0/f_fss/c/fss-common.h | 24 +- level_0/f_fss/c/fss.c | 39 +- level_0/f_fss/c/fss.h | 24 +- level_0/f_fss/c/fss_delimit.h | 26 +- level_0/f_iki/c/iki.c | 10 +- level_0/f_iki/c/iki.h | 10 +- level_0/f_iki/c/private-iki.c | 4 +- level_0/f_iki/c/private-iki.h | 4 +- level_0/f_limit/c/limit-common.h | 38 +- level_0/f_limit/c/limit.c | 166 +--- level_0/f_limit/c/limit.h | 200 +---- level_0/f_limit/c/private-limit.c | 50 -- level_0/f_limit/c/private-limit.h | 116 --- level_0/f_limit/data/build/settings | 2 +- level_0/f_memory/c/memory-common.h | 433 +++++++++ level_0/f_memory/c/memory.c | 181 ++-- level_0/f_memory/c/memory.h | 107 +-- level_0/f_memory/c/memory_structure.c | 200 +++++ level_0/f_memory/c/memory_structure.h | 552 ++++++------ level_0/f_memory/c/private-memory.c | 157 ++++ level_0/f_memory/c/private-memory.h | 164 ++++ level_0/f_memory/data/build/defines | 3 +- level_0/f_memory/data/build/settings | 4 +- level_0/f_path/c/path.c | 10 +- level_0/f_path/c/path.h | 10 +- level_0/f_path/c/private-path.c | 2 +- level_0/f_path/c/private-path.h | 2 +- level_0/f_pipe/c/pipe.c | 8 +- level_0/f_pipe/c/pipe.h | 8 +- level_0/f_print/c/print.c | 24 +- level_0/f_print/c/print.h | 24 +- level_0/f_print/c/private-print.c | 8 +- level_0/f_print/c/private-print.h | 8 +- level_0/f_serialize/c/private-serialize.c | 2 +- level_0/f_serialize/c/private-serialize.h | 2 +- level_0/f_serialize/c/serialize.c | 10 +- level_0/f_serialize/c/serialize.h | 10 +- level_0/f_signal/c/signal.c | 20 +- level_0/f_signal/c/signal.h | 20 +- level_0/f_socket/c/socket.c | 6 +- level_0/f_socket/c/socket.h | 6 +- level_0/f_string/c/string-common.h | 20 +- level_0/f_string/c/string_quantity.h | 20 +- level_0/f_string/c/string_range.h | 20 +- level_0/f_thread/c/private-thread.c | 190 ---- level_0/f_thread/c/private-thread.h | 445 ---------- level_0/f_thread/c/thread-common.h | 182 +++- level_0/f_thread/c/thread.c | 830 ++--------------- level_0/f_thread/c/thread.h | 984 ++------------------- level_0/f_thread/data/build/settings | 2 +- level_0/f_type/c/type.h | 16 +- level_0/f_type/c/type_array.h | 354 +++++--- level_0/f_utf/c/private-utf.c | 46 +- level_0/f_utf/c/private-utf.h | 46 +- level_0/f_utf/c/utf.c | 114 +-- level_0/f_utf/c/utf.h | 114 +-- level_1/fl_color/c/color.c | 20 +- level_1/fl_color/c/color.h | 20 +- level_1/fl_console/c/console.c | 2 +- level_1/fl_console/c/console.h | 2 +- level_1/fl_control_group/c/control_group.c | 4 +- level_1/fl_control_group/c/control_group.h | 4 +- level_1/fl_conversion/c/conversion.c | 24 +- level_1/fl_conversion/c/conversion.h | 24 +- level_1/fl_directory/c/directory.c | 18 +- level_1/fl_directory/c/directory.h | 18 +- level_1/fl_directory/c/private-directory.c | 12 +- level_1/fl_directory/c/private-directory.h | 12 +- level_1/fl_environment/c/environment.c | 8 +- level_1/fl_environment/c/environment.h | 8 +- level_1/fl_fss/c/fss_basic.c | 10 +- level_1/fl_fss/c/fss_basic.h | 8 +- level_1/fl_fss/c/fss_basic_list.c | 24 +- level_1/fl_fss/c/fss_basic_list.h | 8 +- level_1/fl_fss/c/fss_embedded_list.c | 40 +- level_1/fl_fss/c/fss_embedded_list.h | 8 +- level_1/fl_fss/c/fss_extended.c | 10 +- level_1/fl_fss/c/fss_extended.h | 8 +- level_1/fl_fss/c/fss_extended_list.c | 20 +- level_1/fl_fss/c/fss_extended_list.h | 8 +- level_1/fl_fss/c/private-fss.c | 99 +-- level_1/fl_fss/c/private-fss.h | 113 +-- level_1/fl_fss/c/private-fss_macro.h | 8 +- level_1/fl_iki/c/iki.c | 2 +- level_1/fl_iki/c/iki.h | 2 +- level_1/fl_print/c/print.c | 24 +- level_1/fl_print/c/print.h | 24 +- level_1/fl_print/c/private-print.c | 8 +- level_1/fl_print/c/private-print.h | 8 +- level_1/fl_status/c/status.c | 2 +- level_1/fl_status/c/status.h | 2 +- level_1/fl_string/c/private-string.c | 42 +- level_1/fl_string/c/private-string.h | 69 +- level_1/fl_string/c/string.c | 276 ++---- level_1/fl_string/c/string.h | 286 ++---- level_1/fl_type/c/private-type.c | 216 +---- level_1/fl_type/c/private-type.h | 420 +-------- level_1/fl_type/c/type.c | 528 ++++------- level_1/fl_type/c/type.h | 144 +-- level_1/fl_utf/c/private-utf.c | 14 +- level_1/fl_utf/c/private-utf.h | 14 +- level_1/fl_utf/c/utf.c | 120 +-- level_1/fl_utf/c/utf.h | 122 +-- level_1/fl_utf_file/c/private-utf_file.c | 2 +- level_1/fl_utf_file/c/private-utf_file.h | 2 +- level_1/fl_utf_file/c/utf_file.c | 14 +- level_1/fl_utf_file/c/utf_file.h | 14 +- level_2/fll_control_group/c/control_group.c | 2 +- level_2/fll_control_group/c/control_group.h | 2 +- level_2/fll_environment/c/environment.c | 4 +- level_2/fll_environment/c/environment.h | 4 +- level_2/fll_error/c/error.c | 6 +- level_2/fll_error/c/error.h | 6 +- level_2/fll_error/c/private-error.c | 2 +- level_2/fll_error/c/private-error.h | 2 +- level_2/fll_execute/c/execute.c | 20 +- level_2/fll_execute/c/execute.h | 20 +- level_2/fll_execute/c/private-execute.c | 12 +- level_2/fll_execute/c/private-execute.h | 12 +- level_2/fll_file/c/file.c | 6 +- level_2/fll_file/c/file.h | 6 +- level_2/fll_file/c/private-file.c | 4 +- level_2/fll_file/c/private-file.h | 4 +- level_2/fll_fss/c/fss.c | 24 +- level_2/fll_fss/c/fss.h | 24 +- level_2/fll_fss/c/fss_basic.c | 4 +- level_2/fll_fss/c/fss_basic.h | 4 +- level_2/fll_fss/c/fss_basic_list.c | 4 +- level_2/fll_fss/c/fss_basic_list.h | 4 +- level_2/fll_fss/c/fss_embedded_list.c | 4 +- level_2/fll_fss/c/fss_embedded_list.h | 4 +- level_2/fll_fss/c/fss_extended.c | 4 +- level_2/fll_fss/c/fss_extended.h | 4 +- level_2/fll_fss/c/fss_extended_list.c | 4 +- level_2/fll_fss/c/fss_extended_list.h | 4 +- level_2/fll_fss/c/fss_status.c | 10 +- level_2/fll_fss/c/fss_status.h | 10 +- level_2/fll_fss/c/private-fss.c | 2 +- level_2/fll_fss/c/private-fss.h | 2 +- level_2/fll_iki/c/iki.c | 8 +- level_2/fll_iki/c/iki.h | 8 +- level_2/fll_iki/c/private-iki.c | 4 +- level_2/fll_iki/c/private-iki.h | 4 +- level_2/fll_path/c/path.c | 2 +- level_2/fll_path/c/path.h | 2 +- level_2/fll_program/c/program.c | 22 +- level_2/fll_program/c/program.h | 22 +- level_2/fll_status/c/status.c | 2 +- level_2/fll_status/c/status.h | 2 +- level_3/byte_dump/c/byte_dump.c | 6 +- level_3/byte_dump/c/byte_dump.h | 6 +- level_3/byte_dump/c/private-byte_dump.c | 2 +- level_3/byte_dump/c/private-byte_dump.h | 2 +- level_3/control/c/control.c | 6 +- level_3/control/c/control.h | 6 +- level_3/controller/c/controller.c | 6 +- level_3/controller/c/controller.h | 6 +- level_3/controller/c/private-common.h | 2 +- level_3/controller/c/private-controller.c | 26 +- level_3/controller/c/private-controller.h | 26 +- level_3/controller/c/private-entry.c | 8 +- level_3/controller/c/private-entry.h | 8 +- level_3/controller/c/private-rule.c | 30 +- level_3/controller/c/private-rule.h | 28 +- level_3/fake/c/fake.c | 6 +- level_3/fake/c/fake.h | 6 +- level_3/fake/c/private-build.c | 4 +- level_3/fake/c/private-build.h | 4 +- level_3/fake/c/private-clean.c | 2 +- level_3/fake/c/private-clean.h | 2 +- level_3/fake/c/private-fake.c | 12 +- level_3/fake/c/private-fake.h | 12 +- level_3/fake/c/private-make.c | 32 +- level_3/fake/c/private-make.h | 22 +- level_3/fake/c/private-skeleton.c | 6 +- level_3/fake/c/private-skeleton.h | 6 +- level_3/firewall/c/firewall.c | 6 +- level_3/firewall/c/firewall.h | 6 +- level_3/firewall/c/private-firewall.c | 14 +- level_3/firewall/c/private-firewall.h | 14 +- .../fss_basic_list_read/c/fss_basic_list_read.c | 6 +- .../fss_basic_list_read/c/fss_basic_list_read.h | 6 +- .../c/private-fss_basic_list_read.c | 6 +- .../c/private-fss_basic_list_read.h | 4 +- .../fss_basic_list_write/c/fss_basic_list_write.c | 6 +- .../fss_basic_list_write/c/fss_basic_list_write.h | 6 +- .../c/private-fss_basic_list_write.c | 4 +- .../c/private-fss_basic_list_write.h | 4 +- level_3/fss_basic_read/c/fss_basic_read.c | 6 +- level_3/fss_basic_read/c/fss_basic_read.h | 6 +- level_3/fss_basic_read/c/private-fss_basic_read.c | 6 +- level_3/fss_basic_read/c/private-fss_basic_read.h | 4 +- level_3/fss_basic_write/c/fss_basic_write.c | 6 +- level_3/fss_basic_write/c/fss_basic_write.h | 6 +- .../fss_basic_write/c/private-fss_basic_write.c | 4 +- .../fss_basic_write/c/private-fss_basic_write.h | 4 +- .../c/fss_embedded_list_read.c | 6 +- .../c/fss_embedded_list_read.h | 6 +- .../c/private-fss_embedded_list_read.c | 10 +- .../c/private-fss_embedded_list_read.h | 8 +- .../c/fss_embedded_list_write.c | 6 +- .../c/fss_embedded_list_write.h | 6 +- .../c/private-fss_embedded_list_write.c | 6 +- .../c/private-fss_embedded_list_write.h | 6 +- .../c/fss_extended_list_read.c | 6 +- .../c/fss_extended_list_read.h | 6 +- .../c/private-fss_extended_list_read.c | 6 +- .../c/private-fss_extended_list_read.h | 4 +- .../c/fss_extended_list_write.c | 6 +- .../c/fss_extended_list_write.h | 6 +- .../c/private-fss_extended_list_write.c | 6 +- .../c/private-fss_extended_list_write.h | 6 +- level_3/fss_extended_read/c/fss_extended_read.c | 6 +- level_3/fss_extended_read/c/fss_extended_read.h | 6 +- .../c/private-fss_extended_read.c | 8 +- .../c/private-fss_extended_read.h | 6 +- level_3/fss_extended_write/c/fss_extended_write.c | 6 +- level_3/fss_extended_write/c/fss_extended_write.h | 6 +- .../c/private-fss_extended_write.c | 4 +- .../c/private-fss_extended_write.h | 4 +- level_3/fss_status_code/c/fss_status_code.c | 6 +- level_3/fss_status_code/c/fss_status_code.h | 6 +- .../fss_status_code/c/private-fss_status_code.c | 8 +- .../fss_status_code/c/private-fss_status_code.h | 8 +- level_3/iki_read/c/iki_read.c | 6 +- level_3/iki_read/c/iki_read.h | 6 +- level_3/iki_read/c/private-iki_read.c | 12 +- level_3/iki_read/c/private-iki_read.h | 12 +- level_3/iki_write/c/iki_write.c | 6 +- level_3/iki_write/c/iki_write.h | 6 +- level_3/iki_write/c/private-iki_write.c | 2 +- level_3/iki_write/c/private-iki_write.h | 2 +- level_3/init/c/init.c | 6 +- level_3/init/c/init.h | 6 +- level_3/init/c/private-init.c | 6 +- level_3/init/c/private-init.h | 6 +- level_3/status_code/c/private-status_code.c | 8 +- level_3/status_code/c/private-status_code.h | 8 +- level_3/status_code/c/status_code.c | 6 +- level_3/status_code/c/status_code.h | 6 +- 264 files changed, 3952 insertions(+), 6712 deletions(-) delete mode 100644 level_0/f_limit/c/private-limit.c delete mode 100644 level_0/f_limit/c/private-limit.h create mode 100644 level_0/f_memory/c/memory-common.h create mode 100644 level_0/f_memory/c/memory_structure.c create mode 100644 level_0/f_memory/c/private-memory.c create mode 100644 level_0/f_memory/c/private-memory.h delete mode 100644 level_0/f_thread/c/private-thread.c delete mode 100644 level_0/f_thread/c/private-thread.h diff --git a/build/level_0/settings b/build/level_0/settings index 7952ea0..3363f4f 100644 --- a/build/level_0/settings +++ b/build/level_0/settings @@ -21,11 +21,11 @@ build_language c build_libraries -lc -lcap build_libraries-level build_libraries-level_threadless -build_sources_library-level account.c private-account.c capability.c console.c conversion.c directory.c private-directory.c environment.c private-environment.c file.c private-file.c fss.c iki.c private-iki.c limit.c private-limit.c memory.c path.c private-path.c pipe.c print.c private-print.c serialize.c private-serialize.c signal.c socket.c thread.c private-thread.c utf.c private-utf.c -build_sources_library-level_threadless account.c private-account.c capability.c console.c conversion.c directory.c private-directory.c environment.c private-environment.c file.c private-file.c fss.c iki.c private-iki.c limit.c private-limit.c memory.c path.c private-path.c pipe.c print.c private-print.c serialize.c private-serialize.c signal.c socket.c utf.c private-utf.c +build_sources_library account.c private-account.c capability.c console.c conversion.c directory.c private-directory.c environment.c private-environment.c file.c private-file.c fss.c iki.c private-iki.c limit.c memory.c memory_structure.c private-memory.c path.c private-path.c pipe.c print.c private-print.c serialize.c private-serialize.c signal.c socket.c utf.c private-utf.c +build_sources_library-level thread.c build_sources_program -build_sources_headers-level account.h account-common.h capability.h capability-common.h color.h console.h console-common.h control_group.h control_group-common.h conversion.h conversion-common.h directory.h directory_type.h directory-common.h environment.h environment-common.h execute.h execute-common.h file.h file-common.h fss.h fss-common.h fss_comment.h fss_delimit.h fss_named.h fss_nest.h fss_quote.h fss_set.h iki.h iki-common.h limit.h limit-common.h memory.h memory_structure.h path.h path-common.h pipe.h print.h serialize.h serialize-common.h signal.h signal-common.h socket.h socket-common.h status.h status_array.h string.h string-common.h string_dynamic.h string_map.h string_quantity.h string_range.h string_triple.h thread.h thread-common.h type.h type_array.h utf.h utf-common.h -build_sources_headers-level_threadless account.h account-common.h capability.h capability-common.h color.h console.h console-common.h control_group.h control_group-common.h conversion.h conversion-common.h directory.h directory_type.h directory-common.h environment.h environment-common.h execute.h execute-common.h file.h file-common.h fss.h fss-common.h fss_comment.h fss_delimit.h fss_named.h fss_nest.h fss_quote.h fss_set.h iki.h iki-common.h limit.h limit-common.h memory.h memory_structure.h path.h path-common.h pipe.h print.h serialize.h serialize-common.h signal.h signal-common.h socket.h socket-common.h status.h status_array.h string.h string-common.h string_dynamic.h string_map.h string_quantity.h string_range.h string_triple.h type.h type_array.h utf.h utf-common.h +build_sources_headers account.h account-common.h capability.h capability-common.h color.h console.h console-common.h control_group.h control_group-common.h conversion.h conversion-common.h directory.h directory_type.h directory-common.h environment.h environment-common.h execute.h execute-common.h file.h file-common.h fss.h fss-common.h fss_comment.h fss_delimit.h fss_named.h fss_nest.h fss_quote.h fss_set.h iki.h iki-common.h limit.h limit-common.h memory.h memory_structure.h memory-common.h path.h path-common.h pipe.h print.h serialize.h serialize-common.h signal.h signal-common.h socket.h socket-common.h status.h status_array.h string.h string-common.h string_dynamic.h string_map.h string_quantity.h string_range.h string_triple.h type.h type_array.h utf.h utf-common.h +build_sources_headers-level thread.h thread-common.h build_sources_script build_sources_setting build_script yes diff --git a/build/monolithic/settings b/build/monolithic/settings index df778bf..9d86110 100644 --- a/build/monolithic/settings +++ b/build/monolithic/settings @@ -21,11 +21,15 @@ build_language c build_libraries -lc -lcap build_libraries-monolithic build_libraries-monolithic_threadless -build_sources_library-monolithic level_0/account.c level_0/private-account.c level_0/capability.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/limit.c level_0/private-limit.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/serialize.c level_0/private-serialize.c level_0/signal.c level_0/socket.c level_0/thread.c level_0/private-thread.c level_0/utf.c level_0/private-utf.c level_1/color.c level_1/console.c level_1/control_group.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/control_group.c level_2/environment.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-monolithic_threadless level_0/account.c level_0/private-account.c level_0/capability.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/limit.c level_0/private-limit.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/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/control_group.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/control_group.c level_2/environment.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/private-account.c level_0/capability.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/limit.c level_0/memory.c level_0/memory_structure.c level_0/private-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/serialize.c level_0/private-serialize.c level_0/signal.c level_0/socket.c level_0/utf.c level_0/private-utf.c +build_sources_library level_1/color.c level_1/console.c level_1/control_group.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 +build_sources_library level_2/control_group.c level_2/environment.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-monolithic level_0/thread.c build_sources_program -build_sources_headers-monolithic level_0/account.h level_0/account-common.h level_0/capability.h level_0/capability-common.h level_0/color.h level_0/console.h level_0/console-common.h level_0/control_group.h level_0/control_group-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/limit.h level_0/limit-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/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/thread.h level_0/thread-common.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/control_group.h level_1/conversion.h level_1/directory.h level_1/environment.h level_1/execute.h level_1/execute-common.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/control_group.h level_2/environment.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-monolithic_threadless level_0/account.h level_0/account-common.h level_0/capability.h level_0/capability-common.h level_0/color.h level_0/console.h level_0/console-common.h level_0/control_group.h level_0/control_group-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/limit.h level_0/limit-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/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/control_group.h level_1/conversion.h level_1/directory.h level_1/environment.h level_1/execute.h level_1/execute-common.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/control_group.h level_2/environment.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/capability.h level_0/capability-common.h level_0/color.h level_0/console.h level_0/console-common.h level_0/control_group.h level_0/control_group-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/limit.h level_0/limit-common.h level_0/memory.h level_0/memory_structure.h level_0/memory-common.h level_0/path.h level_0/path-common.h level_0/pipe.h level_0/print.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 +build_sources_headers level_1/color.h level_1/console.h level_1/control_group.h level_1/conversion.h level_1/directory.h level_1/environment.h level_1/execute.h level_1/execute-common.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 +build_sources_headers level_2/control_group.h level_2/environment.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-monolithic level_0/thread.h level_0/thread-common.h build_sources_script build_sources_setting build_script yes diff --git a/level_0/f_account/c/account.c b/level_0/f_account/c/account.c index 020bf5c..436b064 100644 --- a/level_0/f_account/c/account.c +++ b/level_0/f_account/c/account.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_account_by_name_ - f_return_status f_account_by_name(const f_string_t name, f_account_t *account) { + f_status_t f_account_by_name(const f_string_t name, f_account_t *account) { #ifndef _di_level_0_parameter_checking_ if (!account) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -89,7 +89,7 @@ extern "C" { #endif // _di_f_account_by_name_ #ifndef _di_f_account_by_id_ - f_return_status f_account_by_id(const uid_t id, f_account_t *account) { + f_status_t f_account_by_id(const uid_t id, f_account_t *account) { #ifndef _di_level_0_parameter_checking_ if (!account) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -172,7 +172,7 @@ extern "C" { #endif // _di_f_account_by_id_ #ifndef _di_f_account_id_group_by_name_ - f_return_status f_account_id_group_by_name(const f_string_t name, gid_t *id) { + f_status_t f_account_id_group_by_name(const f_string_t name, gid_t *id) { #ifndef _di_level_0_parameter_checking_ if (!id) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -251,7 +251,7 @@ extern "C" { #endif // _di_f_account_id_group_by_name_ #ifndef _di_f_account_id_user_by_name_ - f_return_status f_account_id_user_by_name(const f_string_t name, uid_t *id) { + f_status_t f_account_id_user_by_name(const f_string_t name, uid_t *id) { #ifndef _di_level_0_parameter_checking_ if (!id) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -330,7 +330,7 @@ extern "C" { #endif // _di_f_account_id_user_by_name_ #ifndef _di_f_account_name_user_by_id_ - f_return_status f_account_name_user_by_id(const uid_t id, f_string_dynamic_t *name) { + f_status_t f_account_name_user_by_id(const uid_t id, f_string_dynamic_t *name) { #ifndef _di_level_0_parameter_checking_ if (!name) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_account/c/account.h b/level_0/f_account/c/account.h index 853e854..76bb496 100644 --- a/level_0/f_account/c/account.h +++ b/level_0/f_account/c/account.h @@ -57,7 +57,7 @@ extern "C" { * @see getpwnam_r() */ #ifndef _di_f_account_by_name_ - extern f_return_status f_account_by_name(const f_string_t name, f_account_t *account); + extern f_status_t f_account_by_name(const f_string_t name, f_account_t *account); #endif // _di_f_account_by_name_ /** @@ -84,7 +84,7 @@ extern "C" { * @see getpwuid_r() */ #ifndef _di_f_account_by_id_ - extern f_return_status f_account_by_id(const uid_t id, f_account_t *account); + extern f_status_t f_account_by_id(const uid_t id, f_account_t *account); #endif // _di_f_account_by_id_ /** @@ -111,7 +111,7 @@ extern "C" { * @see getgrnam_r() */ #ifndef _di_f_account_id_group_by_name_ - extern f_return_status f_account_id_group_by_name(const f_string_t name, gid_t *id); + extern f_status_t f_account_id_group_by_name(const f_string_t name, gid_t *id); #endif // _di_f_account_id_group_by_name_ /** @@ -138,7 +138,7 @@ extern "C" { * @see getpwnam_r() */ #ifndef _di_f_account_id_user_by_name_ - extern f_return_status f_account_id_user_by_name(const f_string_t name, uid_t *id); + extern f_status_t f_account_id_user_by_name(const f_string_t name, uid_t *id); #endif // _di_f_account_id_user_by_name_ /** @@ -165,7 +165,7 @@ extern "C" { * @see getpwuid_r() */ #ifndef _di_f_account_name_user_by_id_ - extern f_return_status f_account_name_user_by_id(const uid_t id, f_string_dynamic_t *name); + extern f_status_t f_account_name_user_by_id(const uid_t id, f_string_dynamic_t *name); #endif // _di_f_account_name_user_by_id_ #ifdef __cplusplus diff --git a/level_0/f_account/c/private-account.c b/level_0/f_account/c/private-account.c index f79bd72..424e178 100644 --- a/level_0/f_account/c/private-account.c +++ b/level_0/f_account/c/private-account.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_account_by_name_) || !defined(_di_f_account_by_id_) - f_return_status private_f_account_from_passwd(const struct passwd password, const f_string_length_t password_length, f_account_t *account) { + f_status_t private_f_account_from_passwd(const struct passwd password, const f_string_length_t password_length, f_account_t *account) { f_status_t status = F_none; diff --git a/level_0/f_account/c/private-account.h b/level_0/f_account/c/private-account.h index 9cdab9c..7f3166a 100644 --- a/level_0/f_account/c/private-account.h +++ b/level_0/f_account/c/private-account.h @@ -39,7 +39,7 @@ extern "C" { * @see f_macro_string_dynamic_t_resize() */ #if !defined(_di_f_account_by_name_) || !defined(_di_f_account_by_id_) - extern f_return_status private_f_account_from_passwd(const struct passwd password, const f_string_length_t password_length, f_account_t *account) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_account_from_passwd(const struct passwd password, const f_string_length_t password_length, f_account_t *account) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_account_by_name_) || !defined(_di_f_account_by_id_) #ifdef __cplusplus diff --git a/level_0/f_capability/c/capability.c b/level_0/f_capability/c/capability.c index a222cf2..9cf1884 100644 --- a/level_0/f_capability/c/capability.c +++ b/level_0/f_capability/c/capability.c @@ -7,31 +7,31 @@ extern "C" { #ifdef _di_libcap_ #ifndef _di_f_capability_clear_ - f_return_status f_capability_clear(f_capability_t *capability) { + f_status_t f_capability_clear(f_capability_t *capability) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_clear_ #ifndef _di_f_capability_clear_flag_ - f_return_status f_capability_clear_flag(const f_capability_flag_t flag, f_capability_t *capability) { + f_status_t f_capability_clear_flag(const f_capability_flag_t flag, f_capability_t *capability) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_clear_flag_ #ifndef _di_f_capability_compare_ - f_return_status f_capability_compare(const f_capability_t capability1, const f_capability_t capability2, int *flags) { + f_status_t f_capability_compare(const f_capability_t capability1, const f_capability_t capability2, int *flags) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_compare_ #ifndef _di_f_capability_delete_ - f_return_status f_capability_delete(f_capability_t *capability) { + f_status_t f_capability_delete(f_capability_t *capability) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_delete_ #ifndef _di_f_capability_duplicate_ - f_return_status f_capability_duplicate(const f_capability_t source, f_capability_t *destination) { + f_status_t f_capability_duplicate(const f_capability_t source, f_capability_t *destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -41,31 +41,31 @@ extern "C" { #endif // _di_f_capability_duplicate_ #ifndef _di_f_capability_flag_get_ - f_return_status f_capability_flag_get(const f_capability_t capability, const f_capability_value_t code, const f_capability_flag_t flag, f_capability_flag_value_t *enabled) { + f_status_t f_capability_flag_get(const f_capability_t capability, const f_capability_value_t code, const f_capability_flag_t flag, f_capability_flag_value_t *enabled) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_flag_get_ #ifndef _di_f_capability_flag_set_ - f_return_status f_capability_flag_set(const f_capability_flag_t flag, const f_capability_flag_value_t enabled, const f_int32s_t codes, f_capability_t *capability) { + f_status_t f_capability_flag_set(const f_capability_flag_t flag, const f_capability_flag_value_t enabled, const f_int32s_t codes, f_capability_t *capability) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_flag_set_ #ifndef _di_f_capability_from_name_ - f_return_status f_capability_from_name(const f_string_t name, f_capability_value_t *code) { + f_status_t f_capability_from_name(const f_string_t name, f_capability_value_t *code) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_from_name_ #ifndef _di_f_capability_from_text_ - f_return_status f_capability_from_text(const f_string_t text, f_capability_t *capability) { + f_status_t f_capability_from_text(const f_string_t text, f_capability_t *capability) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_from_text_ #ifndef _di_f_capability_process_bound_drop_ - f_return_status f_capability_process_bound_drop(f_capability_value_t code, int *bound) { + f_status_t f_capability_process_bound_drop(f_capability_value_t code, int *bound) { #ifndef _di_level_0_parameter_checking_ if (!bound) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -75,7 +75,7 @@ extern "C" { #endif // _di_f_capability_process_bound_drop_ #ifndef _di_f_capability_process_bound_get_ - f_return_status f_capability_process_bound_get(f_capability_value_t code, int *bound) { + f_status_t f_capability_process_bound_get(f_capability_value_t code, int *bound) { #ifndef _di_level_0_parameter_checking_ if (!bound) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -85,7 +85,7 @@ extern "C" { #endif // _di_f_capability_process_bound_get_ #ifndef _di_f_capability_initialize_ - f_return_status f_capability_initialize(f_capability_t *capability) { + f_status_t f_capability_initialize(f_capability_t *capability) { #ifndef _di_level_0_parameter_checking_ if (!capability) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -95,7 +95,7 @@ extern "C" { #endif // _di_f_capability_initialize_ #ifndef _di_f_capability_process_get_ - f_return_status f_capability_process_get(f_capability_t *capability) { + f_status_t f_capability_process_get(f_capability_t *capability) { #ifndef _di_level_0_parameter_checking_ if (!capability) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -105,7 +105,7 @@ extern "C" { #endif // _di_f_capability_process_get_ #ifndef _di_f_capability_process_get_by_id_ - f_return_status f_capability_process_get_by_id(const pid_t id, f_capability_t *capability) { + f_status_t f_capability_process_get_by_id(const pid_t id, f_capability_t *capability) { #ifndef _di_level_0_parameter_checking_ if (!capability) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -115,7 +115,7 @@ extern "C" { #endif // _di_f_capability_process_get_by_id_ #ifndef _di_f_capability_process_set_ - f_return_status f_capability_process_set(const f_capability_t capability) { + f_status_t f_capability_process_set(const f_capability_t capability) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_process_set_ @@ -133,7 +133,7 @@ extern "C" { #endif // _di_f_capability_supported_code_ #ifndef _di_f_capability_to_name_ - f_return_status f_capability_to_name(const int code, f_string_dynamic_t *name) { + f_status_t f_capability_to_name(const int code, f_string_dynamic_t *name) { #ifndef _di_level_0_parameter_checking_ if (!name) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -143,7 +143,7 @@ extern "C" { #endif // _di_f_capability_to_name_ #ifndef _di_f_capability_to_text_ - f_return_status f_capability_to_text(const f_capability_t capability, f_string_dynamic_t *text) { + f_status_t f_capability_to_text(const f_capability_t capability, f_string_dynamic_t *text) { return F_status_set_error(F_supported_not); } #endif // _di_f_capability_to_text_ @@ -151,7 +151,7 @@ extern "C" { #else // _di_libcap_ #ifndef _di_f_capability_clear_ - f_return_status f_capability_clear(f_capability_t *capability) { + f_status_t f_capability_clear(f_capability_t *capability) { if (cap_clear(*capability) < 0) { if (errno == EINVAL) return F_status_set_error(F_parameter); @@ -164,7 +164,7 @@ extern "C" { #endif // _di_f_capability_clear_ #ifndef _di_f_capability_clear_flag_ - f_return_status f_capability_clear_flag(const f_capability_flag_t flag, f_capability_t *capability) { + f_status_t f_capability_clear_flag(const f_capability_flag_t flag, f_capability_t *capability) { if (cap_clear_flag(*capability, flag) < 0) { if (errno == EINVAL) return F_status_set_error(F_parameter); @@ -177,7 +177,7 @@ extern "C" { #endif // _di_f_capability_clear_flag_ #ifndef _di_f_capability_compare_ - f_return_status f_capability_compare(const f_capability_t capability1, const f_capability_t capability2, int *flags) { + f_status_t f_capability_compare(const f_capability_t capability1, const f_capability_t capability2, int *flags) { if (*flags) { *flags = 0; @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_capability_compare_ #ifndef _di_f_capability_delete_ - f_return_status f_capability_delete(f_capability_t *capability) { + f_status_t f_capability_delete(f_capability_t *capability) { if (cap_free(*capability) < 0) { return F_status_set_error(F_failure); @@ -217,7 +217,7 @@ extern "C" { #endif // _di_f_capability_delete_ #ifndef _di_f_capability_duplicate_ - f_return_status f_capability_duplicate(const f_capability_t source, f_capability_t *destination) { + f_status_t f_capability_duplicate(const f_capability_t source, f_capability_t *destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -236,7 +236,7 @@ extern "C" { #endif // _di_f_capability_duplicate_ #ifndef _di_f_capability_flag_get_ - f_return_status f_capability_flag_get(const f_capability_t capability, const f_capability_value_t code, const f_capability_flag_t flag, f_capability_flag_value_t *enabled) { + f_status_t f_capability_flag_get(const f_capability_t capability, const f_capability_value_t code, const f_capability_flag_t flag, f_capability_flag_value_t *enabled) { #ifndef _di_level_0_parameter_checking_ if (!enabled) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { #endif // _di_f_capability_flag_get_ #ifndef _di_f_capability_flag_set_ - f_return_status f_capability_flag_set(const f_capability_flag_t flag, const f_capability_flag_value_t enabled, const f_int32s_t codes, f_capability_t *capability) { + f_status_t f_capability_flag_set(const f_capability_flag_t flag, const f_capability_flag_value_t enabled, const f_int32s_t codes, f_capability_t *capability) { if (cap_set_flag(*capability, flag, codes.used, codes.array, enabled) < 0) { if (errno == EINVAL) return F_status_set_error(F_parameter); @@ -265,7 +265,7 @@ extern "C" { #endif // _di_f_capability_flag_set_ #ifndef _di_f_capability_from_name_ - f_return_status f_capability_from_name(const f_string_t name, f_capability_value_t *code) { + f_status_t f_capability_from_name(const f_string_t name, f_capability_value_t *code) { if (cap_from_name(name, code) < 0) { if (errno == EINVAL) return F_status_set_error(F_parameter); @@ -279,7 +279,7 @@ extern "C" { #endif // _di_f_capability_from_name_ #ifndef _di_f_capability_from_text_ - f_return_status f_capability_from_text(const f_string_t text, f_capability_t *capability) { + f_status_t f_capability_from_text(const f_string_t text, f_capability_t *capability) { *capability = cap_from_text(text); if (*capability) { @@ -294,7 +294,7 @@ extern "C" { #endif // _di_f_capability_from_text_ #ifndef _di_f_capability_initialize_ - f_return_status f_capability_initialize(f_capability_t *capability) { + f_status_t f_capability_initialize(f_capability_t *capability) { #ifndef _di_level_0_parameter_checking_ if (!capability) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -313,7 +313,7 @@ extern "C" { #endif // _di_f_capability_initialize_ #ifndef _di_f_capability_process_bound_drop_ - f_return_status f_capability_process_bound_drop(f_capability_value_t code, int *bound) { + f_status_t f_capability_process_bound_drop(f_capability_value_t code, int *bound) { *bound = cap_drop_bound(code); @@ -330,7 +330,7 @@ extern "C" { #endif // _di_f_capability_process_bound_drop_ #ifndef _di_f_capability_process_bound_get_ - f_return_status f_capability_process_bound_get(f_capability_value_t code, int *bound) { + f_status_t f_capability_process_bound_get(f_capability_value_t code, int *bound) { #ifndef _di_level_0_parameter_checking_ if (!bound) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -350,7 +350,7 @@ extern "C" { #endif // _di_f_capability_process_bound_get_ #ifndef _di_f_capability_process_get_ - f_return_status f_capability_process_get(f_capability_t *capability) { + f_status_t f_capability_process_get(f_capability_t *capability) { *capability = cap_get_proc(); @@ -366,7 +366,7 @@ extern "C" { #endif // _di_f_capability_process_get_ #ifndef _di_f_capability_process_get_by_id_ - f_return_status f_capability_process_get_by_id(const pid_t id, f_capability_t *capability) { + f_status_t f_capability_process_get_by_id(const pid_t id, f_capability_t *capability) { *capability = cap_get_pid(id); @@ -382,7 +382,7 @@ extern "C" { #endif // _di_f_capability_process_get_by_id_ #ifndef _di_f_capability_process_set_ - f_return_status f_capability_process_set(const f_capability_t capability) { + f_status_t f_capability_process_set(const f_capability_t capability) { if (cap_set_proc(capability) < 0) { if (errno == EINVAL) return F_status_set_error(F_parameter); @@ -409,7 +409,7 @@ extern "C" { #endif // _di_f_capability_supported_code_ #ifndef _di_f_capability_to_name_ - f_return_status f_capability_to_name(const int code, f_string_dynamic_t *name) { + f_status_t f_capability_to_name(const int code, f_string_dynamic_t *name) { #ifndef _di_level_0_parameter_checking_ if (!name) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -452,7 +452,7 @@ extern "C" { #endif // _di_f_capability_to_name_ #ifndef _di_f_capability_to_text_ - f_return_status f_capability_to_text(const f_capability_t capability, f_string_dynamic_t *text) { + f_status_t f_capability_to_text(const f_capability_t capability, f_string_dynamic_t *text) { #ifndef _di_level_0_parameter_checking_ if (!text) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_capability/c/capability.h b/level_0/f_capability/c/capability.h index a36c228..4b94458 100644 --- a/level_0/f_capability/c/capability.h +++ b/level_0/f_capability/c/capability.h @@ -55,7 +55,7 @@ extern "C" { * @see cap_clear() */ #ifndef _di_f_capability_clear_ - extern f_return_status f_capability_clear(f_capability_t *capability); + extern f_status_t f_capability_clear(f_capability_t *capability); #endif // _di_f_capability_clear_ /** @@ -76,7 +76,7 @@ extern "C" { * @see cap_clear_flag() */ #ifndef _di_f_capability_clear_flag_ - extern f_return_status f_capability_clear_flag(const f_capability_flag_t flag, f_capability_t *capability); + extern f_status_t f_capability_clear_flag(const f_capability_flag_t flag, f_capability_t *capability); #endif // _di_f_capability_clear_flag_ /** @@ -100,7 +100,7 @@ extern "C" { * @see cap_compare() */ #ifndef _di_f_capability_compare_ - extern f_return_status f_capability_compare(const f_capability_t capability1, const f_capability_t capability2, int *flags); + extern f_status_t f_capability_compare(const f_capability_t capability1, const f_capability_t capability2, int *flags); #endif // _di_f_capability_compare_ /** @@ -118,7 +118,7 @@ extern "C" { * @see cap_free() */ #ifndef _di_f_capability_delete_ - extern f_return_status f_capability_delete(f_capability_t *capability); + extern f_status_t f_capability_delete(f_capability_t *capability); #endif // _di_f_capability_delete_ /** @@ -141,7 +141,7 @@ extern "C" { * @see cap_dup() */ #ifndef _di_f_capability_duplicate_ - extern f_return_status f_capability_duplicate(const f_capability_t source, f_capability_t *destination); + extern f_status_t f_capability_duplicate(const f_capability_t source, f_capability_t *destination); #endif // _di_f_capability_duplicate_ /** @@ -166,7 +166,7 @@ extern "C" { * @see cap_get_flag() */ #ifndef _di_f_capability_flag_get_ - extern f_return_status f_capability_flag_get(const f_capability_t capability, const f_capability_value_t code, const f_capability_flag_t flag, f_capability_flag_value_t *enabled); + extern f_status_t f_capability_flag_get(const f_capability_t capability, const f_capability_value_t code, const f_capability_flag_t flag, f_capability_flag_value_t *enabled); #endif // _di_f_capability_flag_get /** @@ -191,7 +191,7 @@ extern "C" { * @see cap_set_flag() */ #ifndef _di_f_capability_flag_set_ - extern f_return_status f_capability_flag_set(const f_capability_flag_t flag, const f_capability_flag_value_t enabled, const f_int32s_t codes, f_capability_t *capability); + extern f_status_t f_capability_flag_set(const f_capability_flag_t flag, const f_capability_flag_value_t enabled, const f_int32s_t codes, f_capability_t *capability); #endif // _di_f_capability_flag_set_ /** @@ -213,7 +213,7 @@ extern "C" { * @see cap_from_name() */ #ifndef _di_f_capability_from_name_ - extern f_return_status f_capability_from_name(const f_string_t name, f_capability_value_t *code); + extern f_status_t f_capability_from_name(const f_string_t name, f_capability_value_t *code); #endif // _di_f_capability_from_name_ /** @@ -234,7 +234,7 @@ extern "C" { * @see cap_from_text() */ #ifndef _di_f_capability_from_text_ - extern f_return_status f_capability_from_text(const f_string_t text, f_capability_t *capability); + extern f_status_t f_capability_from_text(const f_string_t text, f_capability_t *capability); #endif // _di_f_capability_from_text_ /** @@ -255,7 +255,7 @@ extern "C" { * @see cap_init() */ #ifndef _di_f_capability_initialize_ - extern f_return_status f_capability_initialize(f_capability_t *capability); + extern f_status_t f_capability_initialize(f_capability_t *capability); #endif // _di_f_capability_initialize_ /** @@ -280,7 +280,7 @@ extern "C" { * @see cap_drop_bound() */ #ifndef _di_f_capability_process_bound_drop_ - extern f_return_status f_capability_process_bound_drop(f_capability_value_t code, int *bound); + extern f_status_t f_capability_process_bound_drop(f_capability_value_t code, int *bound); #endif // _di_f_capability_process_bound_drop_ /** @@ -303,7 +303,7 @@ extern "C" { * @see cap_get_bound() */ #ifndef _di_f_capability_process_bound_get_ - extern f_return_status f_capability_process_bound_get(f_capability_value_t code, int *bound); + extern f_status_t f_capability_process_bound_get(f_capability_value_t code, int *bound); #endif // _di_f_capability_process_bound_get_ /** @@ -324,7 +324,7 @@ extern "C" { * @see cap_get_proc() */ #ifndef _di_f_capability_process_get_ - extern f_return_status f_capability_process_get(f_capability_t *capability); + extern f_status_t f_capability_process_get(f_capability_t *capability); #endif // _di_f_capability_process_get_ /** @@ -347,7 +347,7 @@ extern "C" { * @see cap_get_pid() */ #ifndef _di_f_capability_process_get_by_id_ - extern f_return_status f_capability_process_get_by_id(const pid_t id, f_capability_t *capability); + extern f_status_t f_capability_process_get_by_id(const pid_t id, f_capability_t *capability); #endif // _di_f_capability_process_get_by_id_ /** @@ -367,7 +367,7 @@ extern "C" { * @see cap_set_proc() */ #ifndef _di_f_capability_process_set_ - extern f_return_status f_capability_process_set(const f_capability_t capability); + extern f_status_t f_capability_process_set(const f_capability_t capability); #endif // _di_f_capability_process_set_ /** @@ -418,7 +418,7 @@ extern "C" { * @see cap_to_name() */ #ifndef _di_f_capability_to_name_ - extern f_return_status f_capability_to_name(const f_capability_value_t code, f_string_dynamic_t *name); + extern f_status_t f_capability_to_name(const f_capability_value_t code, f_string_dynamic_t *name); #endif // _di_f_capability_to_name_ /** @@ -440,7 +440,7 @@ extern "C" { * @see cap_to_text() */ #ifndef _di_f_capability_to_text_ - extern f_return_status f_capability_to_text(const f_capability_t capability, f_string_dynamic_t *text); + extern f_status_t f_capability_to_text(const f_capability_t capability, f_string_dynamic_t *text); #endif // _di_f_capability_to_text_ #ifdef __cplusplus diff --git a/level_0/f_console/c/console.c b/level_0/f_console/c/console.c index b093f45..ba2620e 100644 --- a/level_0/f_console/c/console.c +++ b/level_0/f_console/c/console.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_f_console_identify_ - f_return_status f_console_identify(const f_string_t input, f_console_id_t *result) { + f_status_t f_console_identify(const f_string_t input, f_console_id_t *result) { #ifndef _di_level_0_parameter_checking_ if (!result) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_f @@ -48,7 +48,7 @@ extern "C" { #endif // _di_f_console_identify_ #ifndef _di_f_console_parameter_process_ - f_return_status f_console_parameter_process(const f_console_arguments_t arguments, f_console_parameters_t parameters, f_string_lengths_t *remaining) { + f_status_t f_console_parameter_process(const f_console_arguments_t arguments, f_console_parameters_t parameters, f_string_lengths_t *remaining) { #ifndef _di_level_0_parameter_checking_ if (!remaining) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -338,7 +338,7 @@ extern "C" { #endif // _di_f_console_parameter_process_ #ifndef _di_f_console_parameter_prioritize_left_ - f_return_status f_console_parameter_prioritize_left(const f_console_parameters_t parameters, const f_console_parameter_ids_t choices, f_console_parameter_id_t *decision) { + f_status_t f_console_parameter_prioritize_left(const f_console_parameters_t parameters, const f_console_parameter_ids_t choices, f_console_parameter_id_t *decision) { #ifndef _di_level_0_parameter_checking_ if (!decision) return F_status_set_error(F_parameter); if (!choices.id) return F_status_set_error(F_parameter); @@ -380,7 +380,7 @@ extern "C" { #endif // _di_f_console_parameter_prioritize_left_ #ifndef _di_f_console_parameter_prioritize_right_ - f_return_status f_console_parameter_prioritize_right(const f_console_parameters_t parameters, const f_console_parameter_ids_t choices, f_console_parameter_id_t *decision) { + f_status_t f_console_parameter_prioritize_right(const f_console_parameters_t parameters, const f_console_parameter_ids_t choices, f_console_parameter_id_t *decision) { #ifndef _di_level_0_parameter_checking_ if (!decision) return F_status_set_error(F_parameter); if (!choices.id) return F_status_set_error(F_parameter); diff --git a/level_0/f_console/c/console.h b/level_0/f_console/c/console.h index 7c0d3cc..5914581 100644 --- a/level_0/f_console/c/console.h +++ b/level_0/f_console/c/console.h @@ -42,7 +42,7 @@ extern "C" { * F_memory_reallocation (with error bit) on memory reallocation error. */ #ifndef _di_f_console_identify_ - extern f_return_status f_console_identify(const f_string_t input, f_console_id_t *result); + extern f_status_t f_console_identify(const f_string_t input, f_console_id_t *result); #endif // _di_f_console_identify_ /** @@ -86,7 +86,7 @@ extern "C" { * F_memory_reallocation (with error bit) on memory reallocation error. */ #ifndef _di_f_console_parameter_process_ - extern f_return_status f_console_parameter_process(const f_console_arguments_t arguments, f_console_parameters_t parameters, f_string_lengths_t *remaining); + extern f_status_t f_console_parameter_process(const f_console_arguments_t arguments, f_console_parameters_t parameters, f_string_lengths_t *remaining); #endif // _di_f_console_parameter_process_ /** @@ -116,7 +116,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_console_parameter_prioritize_left_ - extern f_return_status f_console_parameter_prioritize_left(const f_console_parameters_t parameters, const f_console_parameter_ids_t choices, f_console_parameter_id_t *decision); + extern f_status_t f_console_parameter_prioritize_left(const f_console_parameters_t parameters, const f_console_parameter_ids_t choices, f_console_parameter_id_t *decision); #endif // _di_f_console_parameter_prioritize_left_ /** @@ -146,7 +146,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_console_parameter_prioritize_right_ - extern f_return_status f_console_parameter_prioritize_right(const f_console_parameters_t parameters, const f_console_parameter_ids_t choices, f_console_parameter_id_t *decision); + extern f_status_t f_console_parameter_prioritize_right(const f_console_parameters_t parameters, const f_console_parameter_ids_t choices, f_console_parameter_id_t *decision); #endif // _di_f_console_parameter_prioritize_right_ #ifdef __cplusplus diff --git a/level_0/f_conversion/c/conversion.c b/level_0/f_conversion/c/conversion.c index eb7946b..89150fa 100644 --- a/level_0/f_conversion/c/conversion.c +++ b/level_0/f_conversion/c/conversion.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_f_conversion_character_is_binary_ - f_return_status f_conversion_character_is_binary(const int8_t character) { + f_status_t f_conversion_character_is_binary(const int8_t character) { if (character == 0x30 || character == 0x31) { return F_true; @@ -16,7 +16,7 @@ extern "C" { #endif // _di_f_conversion_character_is_binary_ #ifndef _di_f_conversion_character_is_decimal_ - f_return_status f_conversion_character_is_decimal(const int8_t character) { + f_status_t f_conversion_character_is_decimal(const int8_t character) { if (character > 0x29 && character < 0x40) { return F_true; @@ -27,7 +27,7 @@ extern "C" { #endif // _di_f_conversion_character_is_decimal_ #ifndef _di_f_conversion_character_is_duodecimal_ - f_return_status f_conversion_character_is_duodecimal(const int8_t character) { + f_status_t f_conversion_character_is_duodecimal(const int8_t character) { if (character > 0x29 && character < 0x40) { return F_true; @@ -46,7 +46,7 @@ extern "C" { #endif // _di_f_conversion_character_is_duodecimal_ #ifndef _di_f_conversion_character_is_hexidecimal_ - f_return_status f_conversion_character_is_hexidecimal(const int8_t character) { + f_status_t f_conversion_character_is_hexidecimal(const int8_t character) { if (character > 0x29 && character < 0x40) { return F_true; @@ -63,7 +63,7 @@ extern "C" { #endif // _di_f_conversion_character_is_hexidecimal_ #ifndef _di_f_conversion_character_is_octal_ - f_return_status f_conversion_character_is_octal(const int8_t character) { + f_status_t f_conversion_character_is_octal(const int8_t character) { if (character > 0x29 && character < 0x38) { return F_true; @@ -74,7 +74,7 @@ extern "C" { #endif // _di_f_conversion_character_is_octal_ #ifndef _di_f_conversion_character_to_binary_ - f_return_status f_conversion_character_to_binary(const int8_t character, f_number_unsigned_t *number) { + f_status_t f_conversion_character_to_binary(const int8_t character, f_number_unsigned_t *number) { #ifndef _di_level_0_parameter_checking_ if (!number) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -91,7 +91,7 @@ extern "C" { #endif // _di_f_conversion_character_to_binary_ #ifndef _di_f_conversion_character_to_decimal_ - f_return_status f_conversion_character_to_decimal(const int8_t character, f_number_unsigned_t *number) { + f_status_t f_conversion_character_to_decimal(const int8_t character, f_number_unsigned_t *number) { #ifndef _di_level_0_parameter_checking_ if (!number) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -116,7 +116,7 @@ extern "C" { #endif // _di_f_conversion_character_to_decimal_ #ifndef _di_f_conversion_character_to_duodecimal_ - f_return_status f_conversion_character_to_duodecimal(const int8_t character, f_number_unsigned_t *decimal) { + f_status_t f_conversion_character_to_duodecimal(const int8_t character, f_number_unsigned_t *decimal) { #ifndef _di_level_0_parameter_checking_ if (!decimal) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -145,7 +145,7 @@ extern "C" { #endif // _di_f_conversion_character_to_duodecimal_ #ifndef _di_f_conversion_character_to_hexidecimal_ - f_return_status f_conversion_character_to_hexidecimal(const int8_t character, f_number_unsigned_t *decimal) { + f_status_t f_conversion_character_to_hexidecimal(const int8_t character, f_number_unsigned_t *decimal) { #ifndef _di_level_0_parameter_checking_ if (!decimal) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -182,7 +182,7 @@ extern "C" { #endif // _di_f_conversion_character_to_hexidecimal_ #ifndef _di_f_conversion_character_to_octal_ - f_return_status f_conversion_character_to_octal(const int8_t character, f_number_unsigned_t *number) { + f_status_t f_conversion_character_to_octal(const int8_t character, f_number_unsigned_t *number) { #ifndef _di_level_0_parameter_checking_ if (!number) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -205,7 +205,7 @@ extern "C" { #endif // _di_f_conversion_character_to_octal_ #ifndef _di_f_conversion_number_signed_to_string_ - f_return_status f_conversion_number_signed_to_string(const f_number_signed_t number, const uint8_t base, f_string_dynamic_t *destination) { + f_status_t f_conversion_number_signed_to_string(const f_number_signed_t number, const uint8_t base, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); if (base < 2 || base > 16) return F_status_set_error(F_parameter); @@ -326,7 +326,7 @@ extern "C" { #endif // _di_f_conversion_decimal_signed_to_string_ #ifndef _di_f_conversion_number_unsigned_to_string_ - f_return_status f_conversion_number_unsigned_to_string(const f_number_unsigned_t number, const uint8_t base, f_string_dynamic_t *destination) { + f_status_t f_conversion_number_unsigned_to_string(const f_number_unsigned_t number, const uint8_t base, f_string_dynamic_t *destination) { #ifndef _di_level_0_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); if (base < 2 || base > 16) return F_status_set_error(F_parameter); diff --git a/level_0/f_conversion/c/conversion.h b/level_0/f_conversion/c/conversion.h index 0728de1..c20f6b8 100644 --- a/level_0/f_conversion/c/conversion.h +++ b/level_0/f_conversion/c/conversion.h @@ -39,7 +39,7 @@ extern "C" { * F_false if character is not a binary. */ #ifndef _di_f_conversion_character_is_binary_ - extern f_return_status f_conversion_character_is_binary(const int8_t character); + extern f_status_t f_conversion_character_is_binary(const int8_t character); #endif // _di_f_conversion_character_is_binary_ /** @@ -53,7 +53,7 @@ extern "C" { * F_false if character is not a decimal. */ #ifndef _di_f_conversion_character_is_decimal_ - extern f_return_status f_conversion_character_is_decimal(const int8_t character); + extern f_status_t f_conversion_character_is_decimal(const int8_t character); #endif // _di_f_conversion_character_is_decimal_ /** @@ -67,7 +67,7 @@ extern "C" { * F_false if character is not a duodecimal. */ #ifndef _di_f_conversion_character_is_duodecimal_ - extern f_return_status f_conversion_character_is_duodecimal(const int8_t character); + extern f_status_t f_conversion_character_is_duodecimal(const int8_t character); #endif // _di_f_conversion_character_is_duodecimal_ /** @@ -81,7 +81,7 @@ extern "C" { * F_false if character is not a hexidecimal. */ #ifndef _di_f_conversion_character_is_hexidecimal_ - extern f_return_status f_conversion_character_is_hexidecimal(const int8_t character); + extern f_status_t f_conversion_character_is_hexidecimal(const int8_t character); #endif // _di_f_conversion_character_is_hexidecimal_ /** @@ -95,7 +95,7 @@ extern "C" { * F_false if character is not an octal. */ #ifndef _di_f_conversion_character_is_octal_ - extern f_return_status f_conversion_character_is_octal(const int8_t character); + extern f_status_t f_conversion_character_is_octal(const int8_t character); #endif // _di_f_conversion_character_is_octal_ /** @@ -113,7 +113,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_conversion_character_to_binary_ - extern f_return_status f_conversion_character_to_binary(const int8_t character, f_number_unsigned_t *number); + extern f_status_t f_conversion_character_to_binary(const int8_t character, f_number_unsigned_t *number); #endif // _di_f_conversion_character_to_binary_ /** @@ -131,7 +131,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_conversion_character_to_decimal_ - extern f_return_status f_conversion_character_to_decimal(const int8_t character, f_number_unsigned_t *number); + extern f_status_t f_conversion_character_to_decimal(const int8_t character, f_number_unsigned_t *number); #endif // _di_f_conversion_character_to_decimal_ /** @@ -149,7 +149,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_conversion_character_to_duodecimal_ - extern f_return_status f_conversion_character_to_duodecimal(const int8_t character, f_number_unsigned_t *number); + extern f_status_t f_conversion_character_to_duodecimal(const int8_t character, f_number_unsigned_t *number); #endif // _di_f_conversion_character_to_duodecimal_ /** @@ -167,7 +167,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_conversion_character_to_hexidecimal_ - extern f_return_status f_conversion_character_to_hexidecimal(const int8_t character, f_number_unsigned_t *number); + extern f_status_t f_conversion_character_to_hexidecimal(const int8_t character, f_number_unsigned_t *number); #endif // _di_f_conversion_character_to_hexidecimal_ /** @@ -185,7 +185,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_conversion_character_to_octal_ - extern f_return_status f_conversion_character_to_octal(const int8_t character, f_number_unsigned_t *number); + extern f_status_t f_conversion_character_to_octal(const int8_t character, f_number_unsigned_t *number); #endif // _di_f_conversion_character_to_octal_ /** @@ -208,7 +208,7 @@ extern "C" { * F_memory_reallocation (with error bit) on memory reallocation error. */ #ifndef _di_f_conversion_number_signed_to_string_ - extern f_return_status f_conversion_number_signed_to_string(const f_number_signed_t number, const uint8_t base, f_string_dynamic_t *destination); + extern f_status_t f_conversion_number_signed_to_string(const f_number_signed_t number, const uint8_t base, f_string_dynamic_t *destination); #endif // _di_f_conversion_number_signed_to_string_ /** @@ -231,7 +231,7 @@ extern "C" { * F_memory_reallocation (with error bit) on memory reallocation error. */ #ifndef _di_f_conversion_number_unsigned_to_string_ - extern f_return_status f_conversion_number_unsigned_to_string(const f_number_unsigned_t number, const uint8_t base, f_string_dynamic_t *destination); + extern f_status_t f_conversion_number_unsigned_to_string(const f_number_unsigned_t number, const uint8_t base, f_string_dynamic_t *destination); #endif // _di_f_conversion_number_unsigned_to_string_ #ifdef __cplusplus diff --git a/level_0/f_directory/c/directory.c b/level_0/f_directory/c/directory.c index 46422f5..cf8d7b3 100644 --- a/level_0/f_directory/c/directory.c +++ b/level_0/f_directory/c/directory.c @@ -6,13 +6,13 @@ extern "C" { #endif #ifndef _di_f_directory_create_ - f_return_status f_directory_create(const f_string_t path, const mode_t mode) { + f_status_t f_directory_create(const f_string_t path, const mode_t mode) { return private_f_directory_create(path, mode); } #endif // _di_f_directory_create_ #ifndef _di_f_directory_create_at_ - f_return_status f_directory_create_at(const int at_id, const f_string_t path, const mode_t mode) { + f_status_t f_directory_create_at(const int at_id, const f_string_t path, const mode_t mode) { #ifndef _di_level_0_parameter_checking_ if (at_id <= 0) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -22,7 +22,7 @@ extern "C" { #endif // _di_f_directory_create_at_ #ifndef _di_f_directory_exists_ - f_return_status f_directory_exists(const f_string_t path) { + f_status_t f_directory_exists(const f_string_t path) { struct stat file_stat; memset(&file_stat, 0, sizeof(struct stat)); @@ -47,7 +47,7 @@ extern "C" { #endif // _di_f_directory_exists_ #ifndef _di_f_directory_exists_at_ - f_return_status f_directory_exists_at(const int at_id, const f_string_t path, const int flag) { + f_status_t f_directory_exists_at(const int at_id, const f_string_t path, const int flag) { struct stat file_stat; memset(&file_stat, 0, sizeof(struct stat)); @@ -73,7 +73,7 @@ extern "C" { #endif // _di_f_directory_exists_at_ #ifndef _di_f_directory_is_ - f_return_status f_directory_is(const f_string_t path) { + f_status_t f_directory_is(const f_string_t path) { struct stat file_stat; memset(&file_stat, AT_SYMLINK_NOFOLLOW, sizeof(struct stat)); @@ -98,7 +98,7 @@ extern "C" { #endif // _di_f_directory_is_ #ifndef _di_f_directory_is_at_ - f_return_status f_directory_is_at(const int at_id, const f_string_t path, const int flag) { + f_status_t f_directory_is_at(const int at_id, const f_string_t path, const int flag) { struct stat file_stat; memset(&file_stat, 0, sizeof(struct stat)); @@ -124,7 +124,7 @@ extern "C" { #endif // _di_f_directory_is_at_ #ifndef _di_f_directory_list_ - f_return_status f_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), f_string_dynamics_t *names) { + f_status_t f_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), f_string_dynamics_t *names) { #ifndef _di_level_0_parameter_checking_ if (!names) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -179,7 +179,7 @@ extern "C" { #endif // _di_f_directory_list_ #ifndef _di_f_directory_open_ - f_return_status f_directory_open(const f_string_t path, const bool dereference, int *id) { + f_status_t f_directory_open(const f_string_t path, const bool dereference, int *id) { #ifndef _di_level_0_parameter_checking_ if (!id) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -216,7 +216,7 @@ extern "C" { #endif // _di_f_directory_open_ #ifndef _di_f_directory_open_at_ - f_return_status f_directory_open_at(const int at_id, const f_string_t path, const bool dereference, int *id) { + f_status_t f_directory_open_at(const int at_id, const f_string_t path, const bool dereference, int *id) { #ifndef _di_level_0_parameter_checking_ if (at_id <= 0) return F_status_set_error(F_parameter); if (!id) return F_status_set_error(F_parameter); @@ -255,7 +255,7 @@ extern "C" { #endif // _di_f_directory_open_at_ #ifndef _di_f_directory_remove_ - f_return_status f_directory_remove(const f_string_t path, const int depth_max, const bool preserve) { + f_status_t f_directory_remove(const f_string_t path, const int depth_max, const bool preserve) { #ifndef _di_level_0_parameter_checking_ if (depth_max < 0) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -302,7 +302,7 @@ extern "C" { #endif // _di_f_directory_remove_ #ifndef _di_f_directory_remove_custom_ - f_return_status f_directory_remove_custom(const f_string_t path, const int depth_max, const bool preserve, int (*custom) (const char *, const struct stat *, int, struct FTW *)) { + f_status_t f_directory_remove_custom(const f_string_t path, const int depth_max, const bool preserve, int (*custom) (const char *, const struct stat *, int, struct FTW *)) { #ifndef _di_level_0_parameter_checking_ if (depth_max < 0) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -349,7 +349,7 @@ extern "C" { #endif // _di_f_directory_remove_custom_ #ifndef _di_f_directory_touch_ - f_return_status f_directory_touch(const f_string_t path, const mode_t mode) { + f_status_t f_directory_touch(const f_string_t path, const mode_t mode) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -398,7 +398,7 @@ extern "C" { #endif // _di_f_directory_touch_ #ifndef _di_f_directory_touch_at_ - f_return_status f_directory_touch_at(const int at_id, const f_string_t path, const mode_t mode, const int flag) { + f_status_t f_directory_touch_at(const int at_id, const f_string_t path, const mode_t mode, const int flag) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_directory/c/directory.h b/level_0/f_directory/c/directory.h index ffe95ef..27cae00 100644 --- a/level_0/f_directory/c/directory.h +++ b/level_0/f_directory/c/directory.h @@ -71,7 +71,7 @@ extern "C" { * @see mkdir() */ #ifndef _di_f_directory_create_ - extern f_return_status f_directory_create(const f_string_t path, const mode_t mode); + extern f_status_t f_directory_create(const f_string_t path, const mode_t mode); #endif // _di_f_directory_create_ /** @@ -105,7 +105,7 @@ extern "C" { * @see mkdirat() */ #ifndef _di_f_directory_create_at_ - extern f_return_status f_directory_create_at(const int at_id, const f_string_t path, const mode_t mode); + extern f_status_t f_directory_create_at(const int at_id, const f_string_t path, const mode_t mode); #endif // _di_f_directory_create_at_ /** @@ -128,7 +128,7 @@ extern "C" { * @see stat() */ #ifndef _di_f_directory_exists_ - extern f_return_status f_directory_exists(const f_string_t path); + extern f_status_t f_directory_exists(const f_string_t path); #endif // _di_f_directory_exists_ /** @@ -156,7 +156,7 @@ extern "C" { * @see fstatat() */ #ifndef _di_f_directory_exists_at_ - extern f_return_status f_directory_exists_at(const int at_id, const f_string_t path, const int flag); + extern f_status_t f_directory_exists_at(const int at_id, const f_string_t path, const int flag); #endif // _di_f_directory_exists_at_ /** @@ -179,7 +179,7 @@ extern "C" { * @see stat() */ #ifndef _di_f_directory_is_ - extern f_return_status f_directory_is(const f_string_t path); + extern f_status_t f_directory_is(const f_string_t path); #endif // _di_f_directory_is_ /** @@ -207,7 +207,7 @@ extern "C" { * @see fstatat() */ #ifndef _di_f_directory_is_at_ - extern f_return_status f_directory_is_at(const int at_id, const f_string_t path, const int flag); + extern f_status_t f_directory_is_at(const int at_id, const f_string_t path, const int flag); #endif // _di_f_directory_is_at_ /** @@ -240,7 +240,7 @@ extern "C" { * @see versionsort() */ #ifndef _di_f_directory_list_ - extern f_return_status f_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), f_string_dynamics_t *names); + extern f_status_t f_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), f_string_dynamics_t *names); #endif // _di_f_directory_list_ /** @@ -278,7 +278,7 @@ extern "C" { * @see open() */ #ifndef _di_f_directory_open_ - extern f_return_status f_directory_open(const f_string_t path, const bool dereference, int *id); + extern f_status_t f_directory_open(const f_string_t path, const bool dereference, int *id); #endif // _di_f_directory_open_ /** @@ -319,7 +319,7 @@ extern "C" { * @see openat() */ #ifndef _di_f_directory_open_at_ - extern f_return_status f_directory_open_at(const int at_id, const f_string_t path, const bool dereference, int *id); + extern f_status_t f_directory_open_at(const int at_id, const f_string_t path, const bool dereference, int *id); #endif // _di_f_directory_open_at_ /** @@ -358,7 +358,7 @@ extern "C" { * @see remove() */ #ifndef _di_f_directory_remove_ - extern f_return_status f_directory_remove(const f_string_t path, const int depth_max, const bool preserve); + extern f_status_t f_directory_remove(const f_string_t path, const int depth_max, const bool preserve); #endif // _di_f_directory_remove_ /** @@ -400,7 +400,7 @@ extern "C" { * @see remove() */ #ifndef _di_f_directory_remove_custom_ - extern f_return_status f_directory_remove_custom(const f_string_t path, const int depth_max, const bool preserve, int (*custom) (const char *, const struct stat *, int, struct FTW *)); + extern f_status_t f_directory_remove_custom(const f_string_t path, const int depth_max, const bool preserve, int (*custom) (const char *, const struct stat *, int, struct FTW *)); #endif // _di_f_directory_remove_custom_ /** @@ -438,7 +438,7 @@ extern "C" { * @see utimensat() */ #ifndef _di_f_directory_touch_ - extern f_return_status f_directory_touch(const f_string_t path, const mode_t mode); + extern f_status_t f_directory_touch(const f_string_t path, const mode_t mode); #endif // _di_f_directory_touch_ /** @@ -480,7 +480,7 @@ extern "C" { * @see utimensat() */ #ifndef _di_f_directory_touch_at_ - extern f_return_status f_directory_touch_at(const int at_id, const f_string_t path, const mode_t mode, const int flag); + extern f_status_t f_directory_touch_at(const int at_id, const f_string_t path, const mode_t mode, const int flag); #endif // _di_f_directory_touch_at_ #ifdef __cplusplus diff --git a/level_0/f_directory/c/private-directory.c b/level_0/f_directory/c/private-directory.c index 89166f1..90e3e46 100644 --- a/level_0/f_directory/c/private-directory.c +++ b/level_0/f_directory/c/private-directory.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_directory_create_) || !defined(_di_f_directory_touch_) - f_return_status private_f_directory_create(const f_string_t path, const mode_t mode) { + f_status_t private_f_directory_create(const f_string_t path, const mode_t mode) { if (mkdir(path, mode) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -32,7 +32,7 @@ extern "C" { #endif // !defined(_di_f_directory_create_) || !defined(_di_f_directory_touch_) #if !defined(_di_f_directory_create_at_) || !defined(_di_f_directory_touch_at_) - f_return_status private_f_directory_create_at(const int at_id, const f_string_t path, const mode_t mode) { + f_status_t private_f_directory_create_at(const int at_id, const f_string_t path, const mode_t mode) { if (mkdirat(at_id, path, mode) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); diff --git a/level_0/f_directory/c/private-directory.h b/level_0/f_directory/c/private-directory.h index 29cd8e6..7ddbc13 100644 --- a/level_0/f_directory/c/private-directory.h +++ b/level_0/f_directory/c/private-directory.h @@ -45,7 +45,7 @@ extern "C" { * @see f_directory_touch() */ #if !defined(_di_f_directory_create_) || !defined(_di_f_directory_touch_) - extern f_return_status private_f_directory_create(const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_directory_create(const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_directory_create_) || !defined(_di_f_directory_touch_) /** @@ -82,7 +82,7 @@ extern "C" { * @see f_directory_touch_at() */ #if !defined(_di_f_directory_create_at_) || !defined(_di_f_directory_touch_at_) - extern f_return_status private_f_directory_create_at(const int at_id, const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_directory_create_at(const int at_id, const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_directory_create_at_) || !defined(_di_f_directory_touch_at_) /** diff --git a/level_0/f_environment/c/environment.c b/level_0/f_environment/c/environment.c index 6be2077..48f45e2 100644 --- a/level_0/f_environment/c/environment.c +++ b/level_0/f_environment/c/environment.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_environment_clear_ - f_return_status f_environment_clear() { + f_status_t f_environment_clear() { if (!clearenv()) { return F_none; } @@ -16,7 +16,7 @@ extern "C" { #endif // _di_f_environment_clear_ #ifndef _di_f_environment_exists_ - f_return_status f_environment_exists(const f_string_t name) { + f_status_t f_environment_exists(const f_string_t name) { #ifndef _di_level_0_parameter_checking_ if (!name) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -30,7 +30,7 @@ extern "C" { #endif // _di_f_environment_exists_ #ifndef _di_f_environment_get_ - f_return_status f_environment_get(const f_string_t name, f_string_dynamic_t *value) { + f_status_t f_environment_get(const f_string_t name, f_string_dynamic_t *value) { #ifndef _di_level_0_parameter_checking_ if (!name) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -40,7 +40,7 @@ extern "C" { #endif // _di_f_environment_get_ #ifndef _di_f_environment_get_dynamic_ - f_return_status f_environment_get_dynamic(const f_string_static_t name, f_string_dynamic_t *value) { + f_status_t f_environment_get_dynamic(const f_string_static_t name, f_string_dynamic_t *value) { #ifndef _di_level_0_parameter_checking_ if (name.used > name.size) return F_status_set_error(F_parameter); if (value->used > value->size) return F_status_set_error(F_parameter); @@ -62,13 +62,13 @@ extern "C" { #endif // _di_f_environment_get_dynamic_ #ifndef _di_f_environment_set_ - f_return_status f_environment_set(const f_string_t name, const f_string_t value, const bool replace) { + f_status_t f_environment_set(const f_string_t name, const f_string_t value, const bool replace) { return private_f_environment_set(name, value, replace); } #endif // _di_f_environment_set_ #ifndef _di_f_environment_set_dynamic_ - f_return_status f_environment_set_dynamic(const f_string_static_t name, const f_string_static_t value, const bool replace) { + f_status_t f_environment_set_dynamic(const f_string_static_t name, const f_string_static_t value, const bool replace) { #ifndef _di_level_0_parameter_checking_ if (name.used > name.size) return F_status_set_error(F_parameter); if (value.used > value.size) return F_status_set_error(F_parameter); @@ -114,13 +114,13 @@ extern "C" { #endif // _di_f_environment_set_dynamic_ #ifndef _di_f_environment_unset_ - f_return_status f_environment_unset(const f_string_t name) { + f_status_t f_environment_unset(const f_string_t name) { return private_f_environment_unset(name); } #endif // _di_f_environment_unset_ #ifndef _di_f_environment_unset_ - f_return_status f_environment_unset_dynamic(const f_string_static_t name) { + f_status_t f_environment_unset_dynamic(const f_string_static_t name) { #ifndef _di_level_0_parameter_checking_ if (name.used > name.size) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_environment/c/environment.h b/level_0/f_environment/c/environment.h index 80ca2bd..24e37a6 100644 --- a/level_0/f_environment/c/environment.h +++ b/level_0/f_environment/c/environment.h @@ -37,7 +37,7 @@ extern "C" { * @see clearenv() */ #ifndef _di_f_environment_clear_ - extern f_return_status f_environment_clear(); + extern f_status_t f_environment_clear(); #endif // _di_f_environment_clear_ /** @@ -62,7 +62,7 @@ extern "C" { * @see getenv() */ #ifndef _di_f_environment_exists_ - extern f_return_status f_environment_exists(const f_string_t name); + extern f_status_t f_environment_exists(const f_string_t name); #endif // _di_f_environment_exists_ /** @@ -89,7 +89,7 @@ extern "C" { * @see getenv() */ #ifndef _di_f_environment_get_ - extern f_return_status f_environment_get(const f_string_t name, f_string_dynamic_t *value); + extern f_status_t f_environment_get(const f_string_t name, f_string_dynamic_t *value); #endif // _di_f_environment_get_ /** @@ -117,7 +117,7 @@ extern "C" { * @see getenv() */ #ifndef _di_f_environment_get_dynamic_ - extern f_return_status f_environment_get_dynamic(const f_string_static_t name, f_string_dynamic_t *value); + extern f_status_t f_environment_get_dynamic(const f_string_static_t name, f_string_dynamic_t *value); #endif // _di_f_environment_get_dynamic_ /** @@ -145,7 +145,7 @@ extern "C" { * @see setenv() */ #ifndef _di_f_environment_set_ - extern f_return_status f_environment_set(const f_string_t name, const f_string_t value, const bool replace); + extern f_status_t f_environment_set(const f_string_t name, const f_string_t value, const bool replace); #endif // _di_f_environment_set_ /** @@ -175,7 +175,7 @@ extern "C" { * @see setenv() */ #ifndef _di_f_environment_set_dynamic_ - extern f_return_status f_environment_set_dynamic(const f_string_static_t name, const f_string_static_t value, const bool replace); + extern f_status_t f_environment_set_dynamic(const f_string_static_t name, const f_string_static_t value, const bool replace); #endif // _di_f_environment_set_dynamic_ /** @@ -195,7 +195,7 @@ extern "C" { * @see unsetenv() */ #ifndef _di_f_environment_unset_ - extern f_return_status f_environment_unset(const f_string_t name); + extern f_status_t f_environment_unset(const f_string_t name); #endif // _di_f_environment_unset_ /** @@ -216,7 +216,7 @@ extern "C" { * @see unsetenv() */ #ifndef _di_f_environment_unset_dynamic_ - extern f_return_status f_environment_unset_dynamic(const f_string_static_t name); + extern f_status_t f_environment_unset_dynamic(const f_string_static_t name); #endif // _di_f_environment_unset_dynamic_ #ifdef __cplusplus diff --git a/level_0/f_environment/c/private-environment.c b/level_0/f_environment/c/private-environment.c index 41fc282..b328415 100644 --- a/level_0/f_environment/c/private-environment.c +++ b/level_0/f_environment/c/private-environment.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_environment_get_) || !defined(_di_f_environment_get_dynamic_) - f_return_status private_f_environment_get(const f_string_t name, f_string_dynamic_t *value) { + f_status_t private_f_environment_get(const f_string_t name, f_string_dynamic_t *value) { const f_string_t result = getenv(name); if (!result) { @@ -39,7 +39,7 @@ extern "C" { #endif // !defined(_di_f_environment_get_) || !defined(_di_f_environment_get_dynamic_) #if !defined(_di_f_environment_set_) || !defined(_di_f_environment_set_dynamic_) - f_return_status private_f_environment_set(const f_string_t name, const f_string_t value, const bool replace) { + f_status_t private_f_environment_set(const f_string_t name, const f_string_t value, const bool replace) { if (setenv(name, value, replace) < 0) { if (errno == EINVAL) { @@ -57,7 +57,7 @@ extern "C" { #endif // !defined(_di_f_environment_set_) || !defined(_di_f_environment_set_dynamic_) #if !defined(_di_f_environment_unset_) || !defined(_di_f_environment_unset_dynamic_) - f_return_status private_f_environment_unset(const f_string_t name) { + f_status_t private_f_environment_unset(const f_string_t name) { if (unsetenv(name) < 0) { if (errno == EINVAL) { diff --git a/level_0/f_environment/c/private-environment.h b/level_0/f_environment/c/private-environment.h index dd8eb65..3e94750 100644 --- a/level_0/f_environment/c/private-environment.h +++ b/level_0/f_environment/c/private-environment.h @@ -38,7 +38,7 @@ extern "C" { * @see f_environment_get_dynamic() */ #if !defined(_di_f_environment_get_) || !defined(_di_f_environment_get_dynamic_) - extern f_return_status private_f_environment_get(const f_string_t name, f_string_dynamic_t *value) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_environment_get(const f_string_t name, f_string_dynamic_t *value) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_environment_get_) || !defined(_di_f_environment_get_dynamic_) /** @@ -65,7 +65,7 @@ extern "C" { * @see f_environment_set_dynamic() */ #if !defined(_di_f_environment_set_) || !defined(_di_f_environment_set_dynamic_) - extern f_return_status private_f_environment_set(const f_string_t name, const f_string_t value, const bool replace) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_environment_set(const f_string_t name, const f_string_t value, const bool replace) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_environment_set_) || !defined(_di_f_environment_set_dynamic_) /** @@ -85,7 +85,7 @@ extern "C" { * @see f_environment_unset_dynamic() */ #if !defined(_di_f_environment_unset_) || !defined(_di_f_environment_unset_dynamic_) - extern f_return_status private_f_environment_unset(const f_string_t name) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_environment_unset(const f_string_t name) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_environment_unset_) || !defined(_di_f_environment_unset_dynamic_) #ifdef __cplusplus diff --git a/level_0/f_file/c/file.c b/level_0/f_file/c/file.c index 8cb1db1..5df1a57 100644 --- a/level_0/f_file/c/file.c +++ b/level_0/f_file/c/file.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_file_access_ - f_return_status f_file_access(const f_string_t path) { + f_status_t f_file_access(const f_string_t path) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -29,7 +29,7 @@ extern "C" { #endif // _di_f_file_access_ #ifndef _di_f_file_clone_ - f_return_status f_file_clone(const f_string_t source, const f_string_t destination, const bool role, const f_number_unsigned_t size_block, const bool exclusive) { + f_status_t f_file_clone(const f_string_t source, const f_string_t destination, const bool role, const f_number_unsigned_t size_block, const bool exclusive) { #ifndef _di_level_0_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -84,13 +84,13 @@ extern "C" { #endif // _di_f_file_clone_ #ifndef _di_f_file_close_ - f_return_status f_file_close(int *id) { + f_status_t f_file_close(int *id) { return private_f_file_close(id); } #endif // _di_f_file_close_ #ifndef _di_f_file_copy_ - f_return_status f_file_copy(const f_string_t source, const f_string_t destination, const f_mode_t mode, const f_number_unsigned_t size_block, const bool exclusive) { + f_status_t f_file_copy(const f_string_t source, const f_string_t destination, const f_mode_t mode, const f_number_unsigned_t size_block, const bool exclusive) { #ifndef _di_level_0_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -199,7 +199,7 @@ extern "C" { #endif // _di_f_file_copy_ #ifndef _di_f_file_create_ - f_return_status f_file_create(const f_string_t path, const mode_t mode, const bool exclusive) { + f_status_t f_file_create(const f_string_t path, const mode_t mode, const bool exclusive) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -209,7 +209,7 @@ extern "C" { #endif // _di_f_file_create_ #ifndef _di_f_file_create_at_ - f_return_status f_file_create_at(const int at_id, const f_string_t path, const mode_t mode, const bool exclusive) { + f_status_t f_file_create_at(const int at_id, const f_string_t path, const mode_t mode, const bool exclusive) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -219,7 +219,7 @@ extern "C" { #endif // _di_f_file_create_at_ #ifndef _di_f_file_create_device_ - f_return_status f_file_create_device(const f_string_t path, const mode_t mode, const unsigned int major, const unsigned int minor) { + f_status_t f_file_create_device(const f_string_t path, const mode_t mode, const unsigned int major, const unsigned int minor) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -236,7 +236,7 @@ extern "C" { #endif // _di_f_file_create_device_ #ifndef _di_f_file_create_device_at_ - f_return_status f_file_create_device_at(const int at_id, const f_string_t path, const mode_t mode, const unsigned int major, const unsigned int minor) { + f_status_t f_file_create_device_at(const int at_id, const f_string_t path, const mode_t mode, const unsigned int major, const unsigned int minor) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -252,7 +252,7 @@ extern "C" { #endif // _di_f_file_create_device_at_ #ifndef _di_f_file_create_fifo_ - f_return_status f_file_create_fifo(const f_string_t path, const mode_t mode) { + f_status_t f_file_create_fifo(const f_string_t path, const mode_t mode) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -262,7 +262,7 @@ extern "C" { #endif // _di_f_file_create_fifo_ #ifndef _di_f_file_create_fifo_at_ - f_return_status f_file_create_fifo_at(const int at_id, const f_string_t path, const mode_t mode) { + f_status_t f_file_create_fifo_at(const int at_id, const f_string_t path, const mode_t mode) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -272,7 +272,7 @@ extern "C" { #endif // _di_f_file_create_fifo_at_ #ifndef _di_f_file_create_node_ - f_return_status f_file_create_node(const f_string_t path, const mode_t mode, const dev_t device) { + f_status_t f_file_create_node(const f_string_t path, const mode_t mode, const dev_t device) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -286,7 +286,7 @@ extern "C" { #endif // _di_f_file_create_node_ #ifndef _di_f_file_create_node_at_ - f_return_status f_file_create_node_at(const int at_id, const f_string_t path, const mode_t mode, const dev_t device) { + f_status_t f_file_create_node_at(const int at_id, const f_string_t path, const mode_t mode, const dev_t device) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -300,7 +300,7 @@ extern "C" { #endif // _di_f_file_create_node_at_ #ifndef _di_f_file_descriptor_ - f_return_status f_file_descriptor(f_file_t *file) { + f_status_t f_file_descriptor(f_file_t *file) { file->id = fileno(file->stream); if (file->id == -1) { @@ -312,7 +312,7 @@ extern "C" { #endif // _di_f_file_descriptor_ #ifndef _di_f_file_exists_ - f_return_status f_file_exists(const f_string_t path) { + f_status_t f_file_exists(const f_string_t path) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -335,7 +335,7 @@ extern "C" { #endif // _di_f_file_exists_ #ifndef _di_f_file_exists_at_ - f_return_status f_file_exists_at(const int at_id, const f_string_t path, const int flag) { + f_status_t f_file_exists_at(const int at_id, const f_string_t path, const int flag) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -358,13 +358,13 @@ extern "C" { #endif // _di_f_file_exists_at_ #ifndef _di_f_file_flush_ - f_return_status f_file_flush(const int id) { + f_status_t f_file_flush(const int id) { return private_f_file_flush(id); } #endif // _di_f_file_flush_ #ifndef _di_f_file_group_read_ - f_return_status f_file_group_read(const f_string_t path, gid_t *group) { + f_status_t f_file_group_read(const f_string_t path, gid_t *group) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!group) return F_status_set_error(F_parameter); @@ -386,7 +386,7 @@ extern "C" { #endif // _di_f_file_group_read_ #ifndef _di_f_file_is_ - f_return_status f_file_is(const f_string_t path, const int type, const bool dereference) { + f_status_t f_file_is(const f_string_t path, const int type, const bool dereference) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -405,7 +405,7 @@ extern "C" { #endif // _di_f_file_is_ #ifndef _di_f_file_is_at_ - f_return_status f_file_is_at(const int at_id, const f_string_t path, const int type, const int flag) { + f_status_t f_file_is_at(const int at_id, const f_string_t path, const int type, const int flag) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -435,7 +435,7 @@ extern "C" { #endif // _di_f_file_is_at_ #ifndef _di_f_file_link_ - f_return_status f_file_link(const f_string_t target, const f_string_t point) { + f_status_t f_file_link(const f_string_t target, const f_string_t point) { #ifndef _di_level_0_parameter_checking_ if (!target) return F_status_set_error(F_parameter); if (!point) return F_status_set_error(F_parameter); @@ -446,7 +446,7 @@ extern "C" { #endif // _di_f_file_link_ #ifndef _di_f_file_link_at_ - f_return_status f_file_link_at(const int at_id, const f_string_t target, const f_string_t point) { + f_status_t f_file_link_at(const int at_id, const f_string_t target, const f_string_t point) { #ifndef _di_level_0_parameter_checking_ if (!target) return F_status_set_error(F_parameter); if (!point) return F_status_set_error(F_parameter); @@ -457,7 +457,7 @@ extern "C" { #endif // _di_f_file_link_at_ #ifndef _di_f_file_link_hard_ - f_return_status f_file_link_hard(const f_string_t target, const f_string_t point) { + f_status_t f_file_link_hard(const f_string_t target, const f_string_t point) { #ifndef _di_level_0_parameter_checking_ if (!target) return F_status_set_error(F_parameter); if (!point) return F_status_set_error(F_parameter); @@ -489,7 +489,7 @@ extern "C" { #endif // _di_f_file_link_hard_ #ifndef _di_f_file_link_hard_at_ - f_return_status f_file_link_hard_at(const int at_id_target, const int at_id_point, const f_string_t target, const f_string_t point, const int flag) { + f_status_t f_file_link_hard_at(const int at_id_target, const int at_id_point, const f_string_t target, const f_string_t point, const int flag) { #ifndef _di_level_0_parameter_checking_ if (!target) return F_status_set_error(F_parameter); if (!point) return F_status_set_error(F_parameter); @@ -522,7 +522,7 @@ extern "C" { #endif // _di_f_file_link_hard_at_ #ifndef _di_f_file_link_read_ - f_return_status f_file_link_read(const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) { + f_status_t f_file_link_read(const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!link_stat.st_size) return F_status_set_error(F_parameter); @@ -534,7 +534,7 @@ extern "C" { #endif // _di_f_file_link_read_ #ifndef _di_f_file_link_read_at_ - f_return_status f_file_link_read_at(const int at_id, const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) { + f_status_t f_file_link_read_at(const int at_id, const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) { #ifndef _di_level_0_parameter_checking_ if (!link_stat.st_size) return F_status_set_error(F_parameter); if (!target) return F_status_set_error(F_parameter); @@ -545,7 +545,7 @@ extern "C" { #endif // _di_f_file_link_read_at_ #ifndef _di_f_file_mode_determine_ - f_return_status f_file_mode_determine(const mode_t mode_file, const f_file_mode_t mode_change, const uint8_t mode_replace, const bool directory_is, mode_t *mode) { + f_status_t f_file_mode_determine(const mode_t mode_file, const f_file_mode_t mode_change, const uint8_t mode_replace, const bool directory_is, mode_t *mode) { #ifndef _di_level_0_parameter_checking_ if (!mode) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -851,7 +851,7 @@ extern "C" { #endif // _di_f_file_mode_determine_ #ifndef _di_f_file_mode_from_string_ - f_return_status f_file_mode_from_string(const f_string_t string, const mode_t umask, f_file_mode_t *mode, uint8_t *replace) { + f_status_t f_file_mode_from_string(const f_string_t string, const mode_t umask, f_file_mode_t *mode, uint8_t *replace) { #ifndef _di_level_0_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!string[0]) return F_status_set_error(F_parameter); @@ -1202,7 +1202,7 @@ extern "C" { #endif // _di_f_file_mode_from_string_ #ifndef _di_f_file_mode_read_ - f_return_status f_file_mode_read(const f_string_t path, mode_t *mode) { + f_status_t f_file_mode_read(const f_string_t path, mode_t *mode) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!mode) return F_status_set_error(F_parameter); @@ -1224,7 +1224,7 @@ extern "C" { #endif // _di_f_file_mode_read_ #ifndef _di_f_file_mode_read_at_ - f_return_status f_file_mode_read_at(const int at_id, const f_string_t path, mode_t *mode) { + f_status_t f_file_mode_read_at(const int at_id, const f_string_t path, mode_t *mode) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!mode) return F_status_set_error(F_parameter); @@ -1246,7 +1246,7 @@ extern "C" { #endif // _di_f_file_mode_read_at_ #ifndef _di_f_file_mode_set_ - f_return_status f_file_mode_set(const f_string_t path, const mode_t mode) { + f_status_t f_file_mode_set(const f_string_t path, const mode_t mode) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1256,7 +1256,7 @@ extern "C" { #endif // _di_f_file_mode_set_ #ifndef _di_f_file_mode_set_at_ - f_return_status f_file_mode_set_at(const int at_id, const f_string_t path, const mode_t mode) { + f_status_t f_file_mode_set_at(const int at_id, const f_string_t path, const mode_t mode) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1266,7 +1266,7 @@ extern "C" { #endif // _di_f_file_mode_set_at_ #ifndef _di_f_file_mode_to_mode_ - f_return_status f_file_mode_to_mode(const f_file_mode_t from, mode_t *to) { + f_status_t f_file_mode_to_mode(const f_file_mode_t from, mode_t *to) { #ifndef _di_level_0_parameter_checking_ if (!to) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1328,7 +1328,7 @@ extern "C" { #endif // _di_f_file_mode_to_mode_ #ifndef _di_f_file_name_base_ - f_return_status f_file_name_base(const f_string_t path, const f_string_length_t length, f_string_dynamic_t *name_base) { + f_status_t f_file_name_base(const f_string_t path, const f_string_length_t length, f_string_dynamic_t *name_base) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!name_base) return F_status_set_error(F_parameter); @@ -1364,7 +1364,7 @@ extern "C" { #endif // _di_f_file_name_base_ #ifndef _di_f_file_name_directory_ - f_return_status f_file_name_directory(const f_string_t path, const f_string_length_t length, f_string_dynamic_t *name_directory) { + f_status_t f_file_name_directory(const f_string_t path, const f_string_length_t length, f_string_dynamic_t *name_directory) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!name_directory) return F_status_set_error(F_parameter); @@ -1400,7 +1400,7 @@ extern "C" { #endif // _di_f_file_name_directory_ #ifndef _di_f_file_open_ - f_return_status f_file_open(const f_string_t path, const mode_t mode, f_file_t *file) { + f_status_t f_file_open(const f_string_t path, const mode_t mode, f_file_t *file) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!file) return F_status_set_error(F_parameter); @@ -1411,7 +1411,7 @@ extern "C" { #endif // _di_f_file_open_ #ifndef _di_f_file_open_at_ - f_return_status f_file_open_at(const int at_id, const f_string_t path, const mode_t mode, f_file_t *file) { + f_status_t f_file_open_at(const int at_id, const f_string_t path, const mode_t mode, f_file_t *file) { #ifndef _di_level_0_parameter_checking_ if (!file) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1421,7 +1421,7 @@ extern "C" { #endif // _di_f_file_open_at_ #ifndef _di_f_file_owner_read_ - f_return_status f_file_owner_read(const f_string_t path, uid_t *owner) { + f_status_t f_file_owner_read(const f_string_t path, uid_t *owner) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!owner) return F_status_set_error(F_parameter); @@ -1443,7 +1443,7 @@ extern "C" { #endif // _di_f_file_owner_read_ #ifndef _di_f_file_read_ - f_return_status f_file_read(const f_file_t file, f_string_dynamic_t *buffer) { + f_status_t f_file_read(const f_file_t file, f_string_dynamic_t *buffer) { #ifndef _di_level_0_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (buffer->used > buffer->size) return F_status_set_error(F_parameter); @@ -1491,7 +1491,7 @@ extern "C" { #endif // _di_f_file_read_ #ifndef _di_f_file_read_block_ - f_return_status f_file_read_block(const f_file_t file, f_string_dynamic_t *buffer) { + f_status_t f_file_read_block(const f_file_t file, f_string_dynamic_t *buffer) { #ifndef _di_level_0_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (buffer->used > buffer->size) return F_status_set_error(F_parameter); @@ -1542,7 +1542,7 @@ extern "C" { #endif // _di_f_file_read_block_ #ifndef _di_f_file_read_until_ - f_return_status f_file_read_until(const f_file_t file, const f_string_length_t total, f_string_dynamic_t *buffer) { + f_status_t f_file_read_until(const f_file_t file, const f_string_length_t total, f_string_dynamic_t *buffer) { #ifndef _di_level_0_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (buffer->used > buffer->size) return F_status_set_error(F_parameter); @@ -1605,7 +1605,7 @@ extern "C" { #endif // _di_f_file_read_until_ #ifndef _di_f_file_remove_ - f_return_status f_file_remove(const f_string_t path) { + f_status_t f_file_remove(const f_string_t path) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1632,7 +1632,7 @@ extern "C" { #endif // _di_f_file_remove_ #ifndef _di_f_file_remove_at_ - f_return_status f_file_remove_at(const int at_id, const f_string_t path, const int flag) { + f_status_t f_file_remove_at(const int at_id, const f_string_t path, const int flag) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1660,7 +1660,7 @@ extern "C" { #endif // _di_f_file_remove_at_ #ifndef _di_f_file_rename_ - f_return_status f_file_rename(const f_string_t source, const f_string_t destination) { + f_status_t f_file_rename(const f_string_t source, const f_string_t destination) { #ifndef _di_level_0_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -1694,7 +1694,7 @@ extern "C" { #endif // _di_f_file_rename_ #ifndef _di_f_file_rename_at_ - f_return_status f_file_rename_at(const int at_id, const int to_id, const f_string_t source, const f_string_t destination) { + f_status_t f_file_rename_at(const int at_id, const int to_id, const f_string_t source, const f_string_t destination) { #ifndef _di_level_0_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -1729,7 +1729,7 @@ extern "C" { #endif // _di_f_file_rename_at_ #ifndef _di_f_file_role_change_ - f_return_status f_file_role_change(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference) { + f_status_t f_file_role_change(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (uid == -1 && gid == -1) return F_status_set_error(F_parameter); @@ -1740,7 +1740,7 @@ extern "C" { #endif // _di_f_file_role_change_ #ifndef _di_f_file_role_change_at_ - f_return_status f_file_role_change_at(const int at_id, const f_string_t path, const uid_t uid, const gid_t gid, const int flag) { + f_status_t f_file_role_change_at(const int at_id, const f_string_t path, const uid_t uid, const gid_t gid, const int flag) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (uid == -1 && gid == -1) return F_status_set_error(F_parameter); @@ -1751,7 +1751,7 @@ extern "C" { #endif // _di_f_file_role_change_at_ #ifndef _di_f_file_seek_ - f_return_status f_file_seek(const int id, const int whence, const f_string_length_t offset, f_string_length_t *seeked) { + f_status_t f_file_seek(const int id, const int whence, const f_string_length_t offset, f_string_length_t *seeked) { #ifndef _di_level_0_parameter_checking_ if (id <= 0) return F_status_set_error(F_parameter); if (whence < 0) return F_status_set_error(F_parameter); @@ -1774,7 +1774,7 @@ extern "C" { #endif // _di_f_file_seek_ #ifndef _di_f_file_size_ - f_return_status f_file_size(const f_string_t path, const bool dereference, f_string_length_t *size) { + f_status_t f_file_size(const f_string_t path, const bool dereference, f_string_length_t *size) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!size) return F_status_set_error(F_parameter); @@ -1795,7 +1795,7 @@ extern "C" { #endif // _di_f_file_size_ #ifndef _di_f_file_size_at_ - f_return_status f_file_size_at(const int at_id, const f_string_t path, const bool dereference, f_string_length_t *size) { + f_status_t f_file_size_at(const int at_id, const f_string_t path, const bool dereference, f_string_length_t *size) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (at_id <= 0) return F_status_set_error(F_parameter); @@ -1817,7 +1817,7 @@ extern "C" { #endif // _di_f_file_size_at_ #ifndef _di_f_file_size_by_id_ - f_return_status f_file_size_by_id(const int id, f_string_length_t *size) { + f_status_t f_file_size_by_id(const int id, f_string_length_t *size) { #ifndef _di_level_0_parameter_checking_ if (id <= 0) return F_status_set_error(F_parameter); if (!size) return F_status_set_error(F_parameter); @@ -1838,7 +1838,7 @@ extern "C" { #endif // _di_f_file_size_by_id_ #ifndef _di_f_file_stat_ - f_return_status f_file_stat(const f_string_t path, const bool dereference, struct stat *stat_file) { + f_status_t f_file_stat(const f_string_t path, const bool dereference, struct stat *stat_file) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!stat_file) return F_status_set_error(F_parameter); @@ -1849,7 +1849,7 @@ extern "C" { #endif // _di_f_file_stat_ #ifndef _di_f_file_stat_at_ - f_return_status f_file_stat_at(const int at_id, const f_string_t path, const int flag, struct stat *stat_file) { + f_status_t f_file_stat_at(const int at_id, const f_string_t path, const int flag, struct stat *stat_file) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (at_id <= 0) return F_status_set_error(F_parameter); @@ -1861,7 +1861,7 @@ extern "C" { #endif // _di_f_file_stat_at_ #ifndef _di_f_file_stat_by_id_ - f_return_status f_file_stat_by_id(const int id, struct stat *stat_file) { + f_status_t f_file_stat_by_id(const int id, struct stat *stat_file) { #ifndef _di_level_0_parameter_checking_ if (id <= 0) return F_status_set_error(F_parameter); if (!stat_file) return F_status_set_error(F_parameter); @@ -1872,7 +1872,7 @@ extern "C" { #endif // _di_f_file_stat_by_id_ #ifndef _di_f_file_stream_close_ - f_return_status f_file_stream_close(const bool complete, f_file_t *file) { + f_status_t f_file_stream_close(const bool complete, f_file_t *file) { #ifndef _di_level_0_parameter_checking_ if (!file) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1904,7 +1904,7 @@ extern "C" { #endif // _di_f_file_stream_close_ #ifndef _di_f_file_stream_descriptor_ - f_return_status f_file_stream_descriptor(const f_string_t mode, f_file_t *file) { + f_status_t f_file_stream_descriptor(const f_string_t mode, f_file_t *file) { #ifndef _di_level_0_parameter_checking_ if (!file) return F_status_set_error(F_parameter); if (file->id == -1) return F_status_set_error(F_parameter); @@ -1939,7 +1939,7 @@ extern "C" { #ifndef _di_f_file_stream_open_ - f_return_status f_file_stream_open(const f_string_t path, const f_string_t mode, f_file_t *file) { + f_status_t f_file_stream_open(const f_string_t path, const f_string_t mode, f_file_t *file) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!file) return F_status_set_error(F_parameter); @@ -1987,7 +1987,7 @@ extern "C" { #endif // _di_f_file_stream_open_ #ifndef _di_f_file_stream_read_ - f_return_status f_file_stream_read(const f_file_t file, const f_string_length_t amount, f_string_dynamic_t *buffer) { + f_status_t f_file_stream_read(const f_file_t file, const f_string_length_t amount, f_string_dynamic_t *buffer) { #ifndef _di_level_0_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (amount < 1) return F_status_set_error(F_parameter); @@ -2036,7 +2036,7 @@ extern "C" { #endif // _di_f_file_stream_read_ #ifndef _di_f_file_stream_read_block_ - f_return_status f_file_stream_read_block(const f_file_t file, const f_string_length_t amount, f_string_dynamic_t *buffer) { + f_status_t f_file_stream_read_block(const f_file_t file, const f_string_length_t amount, f_string_dynamic_t *buffer) { #ifndef _di_level_0_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (amount < 1) return F_status_set_error(F_parameter); @@ -2084,7 +2084,7 @@ extern "C" { #endif // _di_f_file_stream_read_block_ #ifndef _di_f_file_stream_read_until_ - f_return_status f_file_stream_read_until(const f_file_t file, const f_string_length_t amount, const f_string_length_t total, f_string_dynamic_t *buffer) { + f_status_t f_file_stream_read_until(const f_file_t file, const f_string_length_t amount, const f_string_length_t total, f_string_dynamic_t *buffer) { #ifndef _di_level_0_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (amount < 1) return F_status_set_error(F_parameter); @@ -2144,7 +2144,7 @@ extern "C" { #endif // _di_f_file_stream_read_until_ #ifndef _di_f_file_stream_reopen_ - f_return_status f_file_stream_reopen(const f_string_t path, const f_string_t mode, f_file_t *file) { + f_status_t f_file_stream_reopen(const f_string_t path, const f_string_t mode, f_file_t *file) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!file) return F_status_set_error(F_parameter); @@ -2186,7 +2186,7 @@ extern "C" { #endif // _di_f_file_stream_reopen_ #ifndef _di_f_file_stream_write_ - f_return_status f_file_stream_write(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, f_string_length_t *written) { + f_status_t f_file_stream_write(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, f_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -2222,7 +2222,7 @@ extern "C" { #endif // _di_f_file_stream_write_ #ifndef _di_f_file_stream_write_block_ - f_return_status f_file_stream_write_block(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, f_string_length_t *written) { + f_status_t f_file_stream_write_block(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, f_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -2268,7 +2268,7 @@ extern "C" { #endif // _di_f_file_stream_write_block_ #ifndef _di_f_file_stream_write_until_ - f_return_status f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, const f_string_length_t total, f_string_length_t *written) { + f_status_t f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, const f_string_length_t total, f_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -2315,7 +2315,7 @@ extern "C" { #endif // _di_f_file_stream_write_until_ #ifndef _di_f_file_stream_write_range_ - f_return_status f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, const f_string_range_t range, f_string_length_t *written) { + f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, const f_string_range_t range, f_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -2364,7 +2364,7 @@ extern "C" { #endif // _di_f_file_stream_write_range_ #ifndef _di_f_file_touch_ - f_return_status f_file_touch(const f_string_t path, const mode_t mode, const bool dereference) { + f_status_t f_file_touch(const f_string_t path, const mode_t mode, const bool dereference) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -2404,7 +2404,7 @@ extern "C" { #endif // _di_f_file_touch_ #ifndef _di_f_file_touch_at_ - f_return_status f_file_touch_at(const int at_id, const f_string_t path, const mode_t mode, const int flag) { + f_status_t f_file_touch_at(const int at_id, const f_string_t path, const mode_t mode, const int flag) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -2444,7 +2444,7 @@ extern "C" { #endif // _di_f_file_touch_at_ #ifndef _di_f_file_type_ - f_return_status f_file_type(const f_string_t path, int *type) { + f_status_t f_file_type(const f_string_t path, int *type) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!type) return F_status_set_error(F_parameter); @@ -2474,7 +2474,7 @@ extern "C" { #endif // _di_f_file_type_ #ifndef _di_f_file_type_at_ - f_return_status f_file_type_at(const int at_id, const f_string_t path, const int flag, int *type) { + f_status_t f_file_type_at(const int at_id, const f_string_t path, const int flag, int *type) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!type) return F_status_set_error(F_parameter); @@ -2505,7 +2505,7 @@ extern "C" { #endif // _di_f_file_type_at_ #ifndef _di_f_file_write_ - f_return_status f_file_write(const f_file_t file, const f_string_static_t buffer, f_string_length_t *written) { + f_status_t f_file_write(const f_file_t file, const f_string_static_t buffer, f_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -2540,7 +2540,7 @@ extern "C" { #endif // _di_f_file_write_ #ifndef _di_f_file_write_block_ - f_return_status f_file_write_block(const f_file_t file, const f_string_static_t buffer, f_string_length_t *written) { + f_status_t f_file_write_block(const f_file_t file, const f_string_static_t buffer, f_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -2585,7 +2585,7 @@ extern "C" { #endif // _di_f_file_write_block_ #ifndef _di_f_file_write_until_ - f_return_status f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_string_length_t total, f_string_length_t *written) { + f_status_t f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_string_length_t total, f_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -2631,7 +2631,7 @@ extern "C" { #endif // _di_f_file_write_until_ #ifndef _di_f_file_write_range_ - f_return_status f_file_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_string_length_t *written) { + f_status_t f_file_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); diff --git a/level_0/f_file/c/file.h b/level_0/f_file/c/file.h index 962db2a..ef9e9e8 100644 --- a/level_0/f_file/c/file.h +++ b/level_0/f_file/c/file.h @@ -65,7 +65,7 @@ extern "C" { * @see access() */ #ifndef _di_f_file_access_ - extern f_return_status f_file_access(const f_string_t path); + extern f_status_t f_file_access(const f_string_t path); #endif // _di_f_file_access_ /** @@ -119,7 +119,7 @@ extern "C" { * F_failure (with error bit) for any other error. */ #ifndef _di_f_file_clone_ - extern f_return_status f_file_clone(const f_string_t source, const f_string_t destination, const bool role, const f_number_unsigned_t size_block, const bool exclusive); + extern f_status_t f_file_clone(const f_string_t source, const f_string_t destination, const bool role, const f_number_unsigned_t size_block, const bool exclusive); #endif // _di_f_file_clone_ /** @@ -145,7 +145,7 @@ extern "C" { * @see fclose() */ #ifndef _di_f_file_close_ - extern f_return_status f_file_close(int *id); + extern f_status_t f_file_close(int *id); #endif // _di_f_file_close_ /** @@ -197,7 +197,7 @@ extern "C" { * F_failure (with error bit) for any other error. */ #ifndef _di_f_file_copy_ - extern f_return_status f_file_copy(const f_string_t source, const f_string_t destination, const f_mode_t mode, const f_number_unsigned_t size_block, const bool exclusive); + extern f_status_t f_file_copy(const f_string_t source, const f_string_t destination, const f_mode_t mode, const f_number_unsigned_t size_block, const bool exclusive); #endif // _di_f_file_copy_ /** @@ -235,7 +235,7 @@ extern "C" { * @see open() */ #ifndef _di_f_file_create_ - extern f_return_status f_file_create(const f_string_t path, const mode_t mode, const bool exclusive); + extern f_status_t f_file_create(const f_string_t path, const mode_t mode, const bool exclusive); #endif // _di_f_file_create_ /** @@ -275,7 +275,7 @@ extern "C" { * @see openat() */ #ifndef _di_f_file_create_at_ - extern f_return_status f_file_create_at(const int at_id, const f_string_t path, const mode_t mode, const bool exclusive); + extern f_status_t f_file_create_at(const int at_id, const f_string_t path, const mode_t mode, const bool exclusive); #endif // _di_f_file_create_at_ /** @@ -313,7 +313,7 @@ extern "C" { * @see mknod() */ #ifndef _di_f_file_create_device_ - extern f_return_status f_file_create_device(const f_string_t path, const mode_t mode, const unsigned int major, const unsigned int minor); + extern f_status_t f_file_create_device(const f_string_t path, const mode_t mode, const unsigned int major, const unsigned int minor); #endif // _di_f_file_create_device_ /** @@ -354,7 +354,7 @@ extern "C" { * @see mknodat() */ #ifndef _di_f_file_create_device_at_ - extern f_return_status f_file_create_device_at(const int at_id, const f_string_t path, const mode_t mode, const unsigned int major, const unsigned int minor); + extern f_status_t f_file_create_device_at(const int at_id, const f_string_t path, const mode_t mode, const unsigned int major, const unsigned int minor); #endif // _di_f_file_create_device_at_ /** @@ -383,7 +383,7 @@ extern "C" { * @see mkfifo() */ #ifndef _di_f_file_create_fifo_ - extern f_return_status f_file_create_fifo(const f_string_t path, const mode_t mode); + extern f_status_t f_file_create_fifo(const f_string_t path, const mode_t mode); #endif // _di_f_file_create_fifo_ /** @@ -415,7 +415,7 @@ extern "C" { * @see mkfifoat() */ #ifndef _di_f_file_create_fifo_at_ - extern f_return_status f_file_create_fifo_at(const int at_id, const f_string_t path, const mode_t mode); + extern f_status_t f_file_create_fifo_at(const int at_id, const f_string_t path, const mode_t mode); #endif // _di_f_file_create_fifo_at_ /** @@ -447,7 +447,7 @@ extern "C" { * @see mknod() */ #ifndef _di_f_file_create_node_ - extern f_return_status f_file_create_node(const f_string_t path, const mode_t mode, const dev_t device); + extern f_status_t f_file_create_node(const f_string_t path, const mode_t mode, const dev_t device); #endif // _di_f_file_create_node_ /** @@ -482,7 +482,7 @@ extern "C" { * @see mknodat() */ #ifndef _di_f_file_create_node_at_ - extern f_return_status f_file_create_node_at(const int at_id, const f_string_t path, const mode_t mode, const dev_t device); + extern f_status_t f_file_create_node_at(const int at_id, const f_string_t path, const mode_t mode, const dev_t device); #endif // _di_f_file_create_node_at_ /** @@ -499,7 +499,7 @@ extern "C" { * @see fileno() */ #ifndef _di_f_file_descriptor_ - extern f_return_status f_file_descriptor(f_file_t *file); + extern f_status_t f_file_descriptor(f_file_t *file); #endif // _di_f_file_descriptor_ /** @@ -525,7 +525,7 @@ extern "C" { * @see stat() */ #ifndef _di_f_file_exists_ - extern f_return_status f_file_exists(const f_string_t path); + extern f_status_t f_file_exists(const f_string_t path); #endif // _di_f_file_exists_ /** @@ -556,7 +556,7 @@ extern "C" { * @see fstatat() */ #ifndef _di_f_file_exists_at_ - extern f_return_status f_file_exists_at(const int at_id, const f_string_t path, const int flag); + extern f_status_t f_file_exists_at(const int at_id, const f_string_t path, const int flag); #endif // _di_f_file_exists_at_ /** @@ -578,7 +578,7 @@ extern "C" { * @see fsync() */ #ifndef _di_f_file_flush_ - extern f_return_status f_file_flush(const int id); + extern f_status_t f_file_flush(const int id); #endif // _di_f_file_flush_ /** @@ -603,7 +603,7 @@ extern "C" { * @see fstat() */ #ifndef _di_f_file_group_read_ - extern f_return_status f_file_group_read(const f_string_t path, uid_t *group); + extern f_status_t f_file_group_read(const f_string_t path, uid_t *group); #endif // _di_f_file_group_read_ /** @@ -635,7 +635,7 @@ extern "C" { * @see stat() */ #ifndef _di_f_file_is_ - extern f_return_status f_file_is(const f_string_t path, const int type, const bool dereference); + extern f_status_t f_file_is(const f_string_t path, const int type, const bool dereference); #endif // _di_f_file_is_ /** @@ -665,7 +665,7 @@ extern "C" { * @see fstatat() */ #ifndef _di_f_file_is_at_ - extern f_return_status f_file_is_at(const int at_id, const f_string_t path, const int type, const int flag); + extern f_status_t f_file_is_at(const int at_id, const f_string_t path, const int type, const int flag); #endif // _di_f_file_is_at_ /** @@ -701,7 +701,7 @@ extern "C" { * @see symlink() */ #ifndef _di_f_file_link_ - extern f_return_status f_file_link(const f_string_t target, const f_string_t point); + extern f_status_t f_file_link(const f_string_t target, const f_string_t point); #endif // _di_f_file_link_ /** @@ -740,7 +740,7 @@ extern "C" { * @see symlinkat() */ #ifndef _di_f_file_link_at_ - extern f_return_status f_file_link_at(const int at_id, const f_string_t target, const f_string_t point); + extern f_status_t f_file_link_at(const int at_id, const f_string_t target, const f_string_t point); #endif // _di_f_file_link_at_ /** @@ -775,7 +775,7 @@ extern "C" { * @see link() */ #ifndef _di_f_file_link_hard_ - extern f_return_status f_file_link_hard(const f_string_t target, const f_string_t point); + extern f_status_t f_file_link_hard(const f_string_t target, const f_string_t point); #endif // _di_f_file_link_hard_ /** @@ -817,7 +817,7 @@ extern "C" { * @see linkat() */ #ifndef _di_f_file_link_hard_at_ - extern f_return_status f_file_link_hard_at(const int at_id_target, const int at_id_point, const f_string_t target, const f_string_t point, const int flag); + extern f_status_t f_file_link_hard_at(const int at_id_target, const int at_id_point, const f_string_t target, const f_string_t point, const int flag); #endif // _di_f_file_link_hard_at_ /** @@ -851,7 +851,7 @@ extern "C" { * @see readlink() */ #ifndef _di_f_file_link_read_ - extern f_return_status f_file_link_read(const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target); + extern f_status_t f_file_link_read(const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target); #endif // _di_f_file_link_read_ /** @@ -888,7 +888,7 @@ extern "C" { * @see readlinkat() */ #ifndef _di_f_file_link_read_at_ - extern f_return_status f_file_link_read_at(const int at_id, const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target); + extern f_status_t f_file_link_read_at(const int at_id, const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target); #endif // _di_f_file_link_read_at_ /** @@ -917,7 +917,7 @@ extern "C" { * @see f_file_mode_from_string() */ #ifndef _di_f_file_mode_determine_ - extern f_return_status f_file_mode_determine(const mode_t mode_file, const f_file_mode_t mode_change, const uint8_t mode_replace, const bool directory_is, mode_t *mode); + extern f_status_t f_file_mode_determine(const mode_t mode_file, const f_file_mode_t mode_change, const uint8_t mode_replace, const bool directory_is, mode_t *mode); #endif // _di_f_file_mode_determine_ /** @@ -1006,7 +1006,7 @@ extern "C" { * @see private_f_file_mode_determine() */ #ifndef _di_f_file_mode_from_string_ - extern f_return_status f_file_mode_from_string(const f_string_t string, const mode_t umask, f_file_mode_t *mode, uint8_t *replace); + extern f_status_t f_file_mode_from_string(const f_string_t string, const mode_t umask, f_file_mode_t *mode, uint8_t *replace); #endif // _di_f_file_mode_from_string_ /** @@ -1031,7 +1031,7 @@ extern "C" { * @see fstat() */ #ifndef _di_f_file_mode_read_ - extern f_return_status f_file_mode_read(const f_string_t path, mode_t *mode); + extern f_status_t f_file_mode_read(const f_string_t path, mode_t *mode); #endif // _di_f_file_mode_read_ /** @@ -1058,7 +1058,7 @@ extern "C" { * @see fstatat() */ #ifndef _di_f_file_mode_read_at_ - extern f_return_status f_file_mode_read_at(const int at_id, const f_string_t path, mode_t *mode); + extern f_status_t f_file_mode_read_at(const int at_id, const f_string_t path, mode_t *mode); #endif // _di_f_file_mode_read_at_ /** @@ -1089,7 +1089,7 @@ extern "C" { * @see chmod() */ #ifndef _di_f_file_mode_set_ - extern f_return_status f_file_mode_set(const f_string_t path, const mode_t mode); + extern f_status_t f_file_mode_set(const f_string_t path, const mode_t mode); #endif // _di_f_file_mode_set_ /** @@ -1122,7 +1122,7 @@ extern "C" { * @see fchmodat() */ #ifndef _di_f_file_mode_set_at_ - extern f_return_status f_file_mode_set_at(const int at_id, const f_string_t path, const mode_t mode); + extern f_status_t f_file_mode_set_at(const int at_id, const f_string_t path, const mode_t mode); #endif // _di_f_file_mode_set_at_ /** @@ -1142,7 +1142,7 @@ extern "C" { * @see f_file_mode_from_string() */ #ifndef _di_f_file_mode_to_mode_ - extern f_return_status f_file_mode_to_mode(const f_file_mode_t from, mode_t *to); + extern f_status_t f_file_mode_to_mode(const f_file_mode_t from, mode_t *to); #endif // _di_f_file_mode_to_mode_ /** @@ -1166,7 +1166,7 @@ extern "C" { * @see basename() */ #ifndef _di_f_file_name_base_ - extern f_return_status f_file_name_base(const f_string_t path, const f_string_length_t length, f_string_dynamic_t *name_base); + extern f_status_t f_file_name_base(const f_string_t path, const f_string_length_t length, f_string_dynamic_t *name_base); #endif // _di_f_file_name_base_ /** @@ -1190,7 +1190,7 @@ extern "C" { * @see dirname() */ #ifndef _di_f_file_name_directory_ - extern f_return_status f_file_name_directory(const f_string_t path, const f_string_length_t length, f_string_dynamic_t *name_directory); + extern f_status_t f_file_name_directory(const f_string_t path, const f_string_length_t length, f_string_dynamic_t *name_directory); #endif // _di_f_file_name_directory_ /** @@ -1231,7 +1231,7 @@ extern "C" { * @see open() */ #ifndef _di_f_file_open_ - extern f_return_status f_file_open(const f_string_t path, const mode_t mode, f_file_t *file); + extern f_status_t f_file_open(const f_string_t path, const mode_t mode, f_file_t *file); #endif // _di_f_file_open_ /** @@ -1261,7 +1261,7 @@ extern "C" { * @see openat() */ #ifndef _di_f_file_open_at_ - extern f_return_status f_file_open_at(const int at_id, const f_string_t path, const mode_t mode, f_file_t *file); + extern f_status_t f_file_open_at(const int at_id, const f_string_t path, const mode_t mode, f_file_t *file); #endif // _di_f_file_open_at_ /** @@ -1286,7 +1286,7 @@ extern "C" { * @see fstat() */ #ifndef _di_f_file_owner_read_ - extern f_return_status f_file_owner_read(const f_string_t path, uid_t *owner); + extern f_status_t f_file_owner_read(const f_string_t path, uid_t *owner); #endif // _di_f_file_owner_read_ /** @@ -1315,7 +1315,7 @@ extern "C" { * @see read() */ #ifndef _di_f_file_read_ - extern f_return_status f_file_read(const f_file_t file, f_string_dynamic_t *buffer); + extern f_status_t f_file_read(const f_file_t file, f_string_dynamic_t *buffer); #endif // _di_f_file_read_ /** @@ -1345,7 +1345,7 @@ extern "C" { * @see read() */ #ifndef _di_f_file_read_block_ - extern f_return_status f_file_read_block(const f_file_t file, f_string_dynamic_t *buffer); + extern f_status_t f_file_read_block(const f_file_t file, f_string_dynamic_t *buffer); #endif // _di_f_file_read_block_ /** @@ -1381,7 +1381,7 @@ extern "C" { * @see read() */ #ifndef _di_f_file_read_until_ - extern f_return_status f_file_read_until(const f_file_t file, const f_string_length_t total, f_string_dynamic_t *buffer); + extern f_status_t f_file_read_until(const f_file_t file, const f_string_length_t total, f_string_dynamic_t *buffer); #endif // _di_f_file_read_until_ /** @@ -1409,7 +1409,7 @@ extern "C" { * @see unlink() */ #ifndef _di_f_file_remove_ - extern f_return_status f_file_remove(const f_string_t path); + extern f_status_t f_file_remove(const f_string_t path); #endif // _di_f_file_remove_ /** @@ -1441,7 +1441,7 @@ extern "C" { * @see unlinkat() */ #ifndef _di_f_file_remove_at_ - extern f_return_status f_file_remove_at(const int at_id, const f_string_t path, const int flag); + extern f_status_t f_file_remove_at(const int at_id, const f_string_t path, const int flag); #endif // _di_f_file_remove_at_ /** @@ -1485,7 +1485,7 @@ extern "C" { * @see rename() */ #ifndef _di_f_file_rename_ - extern f_return_status f_file_rename(const f_string_t source, const f_string_t destination); + extern f_status_t f_file_rename(const f_string_t source, const f_string_t destination); #endif // _di_f_file_rename_ /** @@ -1534,7 +1534,7 @@ extern "C" { * @see renameat() */ #ifndef _di_f_file_rename_at_ - extern f_return_status f_file_rename_at(const int at_id, const int to_id, const f_string_t source, const f_string_t destination); + extern f_status_t f_file_rename_at(const int at_id, const int to_id, const f_string_t source, const f_string_t destination); #endif // _di_f_file_rename_at_ /** @@ -1574,7 +1574,7 @@ extern "C" { * @see lchown() */ #ifndef _di_f_file_role_change_ - extern f_return_status f_file_role_change(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference); + extern f_status_t f_file_role_change(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference); #endif // _di_f_file_role_change_ /** @@ -1615,7 +1615,7 @@ extern "C" { * @see fchownat() */ #ifndef _di_f_file_role_change_at_ - extern f_return_status f_file_role_change_at(const int at_id, const f_string_t path, const uid_t uid, const gid_t gid, const int flag); + extern f_status_t f_file_role_change_at(const int at_id, const f_string_t path, const uid_t uid, const gid_t gid, const int flag); #endif // _di_f_file_role_change_at_ /** @@ -1643,7 +1643,7 @@ extern "C" { * @see lseek */ #ifndef _di_f_file_seek_ - extern f_return_status f_file_seek(const int id, const int whence, const f_string_length_t offset, f_string_length_t *seeked); + extern f_status_t f_file_seek(const int id, const int whence, const f_string_length_t offset, f_string_length_t *seeked); #endif // _di_f_file_seek_ /** @@ -1671,7 +1671,7 @@ extern "C" { * @see f_file_stat() */ #ifndef _di_f_file_size_ - extern f_return_status f_file_size(const f_string_t path, const bool dereference, f_string_length_t *size); + extern f_status_t f_file_size(const f_string_t path, const bool dereference, f_string_length_t *size); #endif // _di_f_file_size_ /** @@ -1701,7 +1701,7 @@ extern "C" { * @see f_file_stat_at() */ #ifndef _di_f_file_size_at_ - extern f_return_status f_file_size_at(const int at_id, const f_string_t path, const bool dereference, f_string_length_t *size); + extern f_status_t f_file_size_at(const int at_id, const f_string_t path, const bool dereference, f_string_length_t *size); #endif // _di_f_file_size_at_ /** @@ -1726,7 +1726,7 @@ extern "C" { * @see f_file_stat_by_id() */ #ifndef _di_f_file_size_by_id_ - extern f_return_status f_file_size_by_id(const int id, f_string_length_t *size); + extern f_status_t f_file_size_by_id(const int id, f_string_length_t *size); #endif // _di_f_file_size_by_id_ /** @@ -1754,7 +1754,7 @@ extern "C" { * @see stat() */ #ifndef _di_f_file_stat_ - extern f_return_status f_file_stat(const f_string_t path, const bool dereference, struct stat *stat_file); + extern f_status_t f_file_stat(const f_string_t path, const bool dereference, struct stat *stat_file); #endif // _di_f_file_stat_ /** @@ -1783,7 +1783,7 @@ extern "C" { * @see fstatat() */ #ifndef _di_f_file_stat_at_ - extern f_return_status f_file_stat_at(const int at_id, const f_string_t path, const int flag, struct stat *stat_file); + extern f_status_t f_file_stat_at(const int at_id, const f_string_t path, const int flag, struct stat *stat_file); #endif // _di_f_file_stat_at_ /** @@ -1808,7 +1808,7 @@ extern "C" { * @see fstat() */ #ifndef _di_f_file_stat_by_id_ - extern f_return_status f_file_stat_by_id(const int id, struct stat *stat_file); + extern f_status_t f_file_stat_by_id(const int id, struct stat *stat_file); #endif // _di_f_file_stat_by_id_ /** @@ -1843,7 +1843,7 @@ extern "C" { * @see fclose() */ #ifndef _di_f_file_stream_close_ - extern f_return_status f_file_stream_close(const bool complete, f_file_t *file); + extern f_status_t f_file_stream_close(const bool complete, f_file_t *file); #endif // _di_f_file_stream_close_ /** @@ -1875,7 +1875,7 @@ extern "C" { * @see fdopen() */ #ifndef _di_f_file_stream_descriptor_ - extern f_return_status f_file_stream_descriptor(const f_string_t mode, f_file_t *file); + extern f_status_t f_file_stream_descriptor(const f_string_t mode, f_file_t *file); #endif // _di_f_file_stream_descriptor_ /** @@ -1919,7 +1919,7 @@ extern "C" { * @see fopen() */ #ifndef _di_f_file_stream_open_ - extern f_return_status f_file_stream_open(const f_string_t path, const f_string_t mode, f_file_t *file); + extern f_status_t f_file_stream_open(const f_string_t path, const f_string_t mode, f_file_t *file); #endif // _di_f_file_stream_open_ /** @@ -1951,7 +1951,7 @@ extern "C" { * @see fread() */ #ifndef _di_f_file_stream_read_ - extern f_return_status f_file_stream_read(const f_file_t file, const f_string_length_t amount, f_string_dynamic_t *buffer); + extern f_status_t f_file_stream_read(const f_file_t file, const f_string_length_t amount, f_string_dynamic_t *buffer); #endif // _di_f_file_stream_read_ /** @@ -1984,7 +1984,7 @@ extern "C" { * @see fread() */ #ifndef _di_f_file_stream_read_block_ - extern f_return_status f_file_stream_read_block(const f_file_t file, const f_string_length_t amount, f_string_dynamic_t *buffer); + extern f_status_t f_file_stream_read_block(const f_file_t file, const f_string_length_t amount, f_string_dynamic_t *buffer); #endif // _di_f_file_stream_read_block_ /** @@ -2023,7 +2023,7 @@ extern "C" { * @see fread() */ #ifndef _di_f_file_stream_read_until_ - extern f_return_status f_file_stream_read_until(const f_file_t file, const f_string_length_t amount, const f_string_length_t total, f_string_dynamic_t *buffer); + extern f_status_t f_file_stream_read_until(const f_file_t file, const f_string_length_t amount, const f_string_length_t total, f_string_dynamic_t *buffer); #endif // _di_f_file_stream_read_until_ /** @@ -2069,7 +2069,7 @@ extern "C" { * @see freopen() */ #ifndef _di_f_file_stream_reopen_ - extern f_return_status f_file_stream_reopen(const f_string_t path, const f_string_t mode, f_file_t *file); + extern f_status_t f_file_stream_reopen(const f_string_t path, const f_string_t mode, f_file_t *file); #endif // _di_f_file_stream_reopen_ /** @@ -2102,7 +2102,7 @@ extern "C" { * @see fwrite() */ #ifndef _di_f_file_stream_write_ - extern f_return_status f_file_stream_write(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, f_string_length_t *written); + extern f_status_t f_file_stream_write(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, f_string_length_t *written); #endif // _di_f_file_stream_write_ /** @@ -2137,7 +2137,7 @@ extern "C" { * @see fwrite() */ #ifndef _di_f_file_stream_write_block_ - extern f_return_status f_file_stream_write_block(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, f_string_length_t *written); + extern f_status_t f_file_stream_write_block(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, f_string_length_t *written); #endif // _di_f_file_stream_write_block_ /** @@ -2173,7 +2173,7 @@ extern "C" { * @see fwrite() */ #ifndef _di_f_file_stream_write_until_ - extern f_return_status f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, const f_string_length_t total, f_string_length_t *written); + extern f_status_t f_file_stream_write_until(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, const f_string_length_t total, f_string_length_t *written); #endif // _di_f_file_stream_write_until_ /** @@ -2208,7 +2208,7 @@ extern "C" { * @see fwrite() */ #ifndef _di_f_file_stream_write_range_ - extern f_return_status f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, const f_string_range_t range, f_string_length_t *written); + extern f_status_t f_file_stream_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_length_t amount, const f_string_range_t range, f_string_length_t *written); #endif // _di_f_file_stream_write_range_ @@ -2250,7 +2250,7 @@ extern "C" { * @see utimensat() */ #ifndef _di_f_file_touch_ - extern f_return_status f_file_touch(const f_string_t path, const mode_t mode, const bool dereference); + extern f_status_t f_file_touch(const f_string_t path, const mode_t mode, const bool dereference); #endif // _di_f_file_touch_ /** @@ -2292,7 +2292,7 @@ extern "C" { * @see utimensat() */ #ifndef _di_f_file_touch_at_ - extern f_return_status f_file_touch_at(const int at_id, const f_string_t path, const mode_t mode, const int flag); + extern f_status_t f_file_touch_at(const int at_id, const f_string_t path, const mode_t mode, const int flag); #endif // _di_f_file_touch_at_ /** @@ -2320,7 +2320,7 @@ extern "C" { * @see stat() */ #ifndef _di_f_file_type_ - extern f_return_status f_file_type(const f_string_t path, int *type); + extern f_status_t f_file_type(const f_string_t path, int *type); #endif // _di_f_file_type_ /** @@ -2349,7 +2349,7 @@ extern "C" { * @see fstatat() */ #ifndef _di_f_file_type_at_ - extern f_return_status f_file_type_at(const int at_id, const f_string_t path, const int flag, int *type); + extern f_status_t f_file_type_at(const int at_id, const f_string_t path, const int flag, int *type); #endif // _di_f_file_type_at_ /** @@ -2379,7 +2379,7 @@ extern "C" { * @see write() */ #ifndef _di_f_file_write_ - extern f_return_status f_file_write(const f_file_t file, const f_string_static_t buffer, f_string_length_t *written); + extern f_status_t f_file_write(const f_file_t file, const f_string_static_t buffer, f_string_length_t *written); #endif // _di_f_file_write_ /** @@ -2411,7 +2411,7 @@ extern "C" { * @see write() */ #ifndef _di_f_file_write_block_ - extern f_return_status f_file_write_block(const f_file_t file, const f_string_static_t buffer, f_string_length_t *written); + extern f_status_t f_file_write_block(const f_file_t file, const f_string_static_t buffer, f_string_length_t *written); #endif // _di_f_file_write_block_ /** @@ -2444,7 +2444,7 @@ extern "C" { * @see write() */ #ifndef _di_f_file_write_until_ - extern f_return_status f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_string_length_t total, f_string_length_t *written); + extern f_status_t f_file_write_until(const f_file_t file, const f_string_static_t buffer, const f_string_length_t total, f_string_length_t *written); #endif // _di_f_file_write_until_ /** @@ -2476,7 +2476,7 @@ extern "C" { * @see write() */ #ifndef _di_f_file_write_range_ - extern f_return_status f_file_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_string_length_t *written); + extern f_status_t f_file_write_range(const f_file_t file, const f_string_static_t buffer, const f_string_range_t range, f_string_length_t *written); #endif // _di_f_file_write_range_ #ifdef __cplusplus diff --git a/level_0/f_file/c/private-file.c b/level_0/f_file/c/private-file.c index 1e3b506..5f68331 100644 --- a/level_0/f_file/c/private-file.c +++ b/level_0/f_file/c/private-file.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_file_close_) || !defined(_di_f_file_copy_) || !defined(_di_f_file_stream_close_) - f_return_status private_f_file_close(int *id) { + f_status_t private_f_file_close(int *id) { if (*id == -1) return F_none; @@ -28,7 +28,7 @@ extern "C" { #endif // !defined(_di_f_file_close_) || !defined(_di_f_file_copy_) || !defined(_di_f_file_stream_close_) #if !defined(_di_f_file_copy_) || !defined(_di_f_file_clone_) - f_return_status private_f_file_copy_content(const f_string_t source, const f_string_t destination, const f_number_unsigned_t size_block) { + f_status_t private_f_file_copy_content(const f_string_t source, const f_string_t destination, const f_number_unsigned_t size_block) { f_file_t file_source = f_file_t_initialize; f_file_t file_destination = f_file_t_initialize; @@ -73,7 +73,7 @@ extern "C" { #endif // !defined(_di_f_file_copy_) || !defined(_di_f_file_clone_) #if !defined(_di_f_file_copy_at_) || !defined(_di_f_file_clone_at_) - f_return_status private_f_file_copy_content_at(const int at_id, const f_string_t source, const f_string_t destination, const f_number_unsigned_t size_block) { + f_status_t private_f_file_copy_content_at(const int at_id, const f_string_t source, const f_string_t destination, const f_number_unsigned_t size_block) { f_file_t file_source = f_file_t_initialize; f_file_t file_destination = f_file_t_initialize; @@ -118,7 +118,7 @@ extern "C" { #endif // !defined(_di_f_file_copy_at_) || !defined(_di_f_file_clone_at_) #if !defined(_di_f_file_create_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_create(const f_string_t path, const mode_t mode, const bool exclusive) { + f_status_t private_f_file_create(const f_string_t path, const mode_t mode, const bool exclusive) { f_file_t file = f_file_t_initialize; file.flag = f_file_flag_close_execute | f_file_flag_create | f_file_flag_write_only; @@ -138,7 +138,7 @@ extern "C" { #endif // !defined(_di_f_file_create_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_create_at_) || !defined(_di_f_file_copy_at_) - f_return_status private_f_file_create_at(const int at_id, const f_string_t path, const mode_t mode, const bool exclusive) { + f_status_t private_f_file_create_at(const int at_id, const f_string_t path, const mode_t mode, const bool exclusive) { f_file_t file = f_file_t_initialize; file.flag = f_file_flag_close_execute | f_file_flag_create | f_file_flag_write_only; @@ -158,7 +158,7 @@ extern "C" { #endif // !defined(_di_f_file_create_at_) || !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_copy_) - f_return_status private_f_file_create_directory(const f_string_t path, const mode_t mode) { + f_status_t private_f_file_create_directory(const f_string_t path, const mode_t mode) { if (mkdir(path, mode) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -184,7 +184,7 @@ extern "C" { #endif // !defined(_di_f_file_copy_) #if !defined(_di_f_file_copy_at_) - f_return_status private_f_file_create_directory_at(const int at_id, const f_string_t path, const mode_t mode) { + f_status_t private_f_file_create_directory_at(const int at_id, const f_string_t path, const mode_t mode) { if (mkdirat(at_id, path, mode) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -211,7 +211,7 @@ extern "C" { #endif // !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_create_fifo_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_create_fifo(const f_string_t path, const mode_t mode) { + f_status_t private_f_file_create_fifo(const f_string_t path, const mode_t mode) { if (mkfifo(path, mode) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -232,7 +232,7 @@ extern "C" { #endif // !defined(_di_f_file_create_fifo_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_create_fifo_at_) || !defined(_di_f_file_copy_at_) - f_return_status private_f_file_create_fifo_at(const int at_id, const f_string_t path, const mode_t mode) { + f_status_t private_f_file_create_fifo_at(const int at_id, const f_string_t path, const mode_t mode) { if (mkfifoat(at_id, path, mode) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -254,7 +254,7 @@ extern "C" { #endif // !defined(_di_f_file_create_fifo_at_) || !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_create_device_) || !defined(_di_f_file_create_node_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_create_node(const f_string_t path, const mode_t mode, const dev_t device) { + f_status_t private_f_file_create_node(const f_string_t path, const mode_t mode, const dev_t device) { if (mknod(path, mode, device) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -280,7 +280,7 @@ extern "C" { #endif // !defined(_di_f_file_create_device_) || !defined(_di_f_file_create_node_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_create_device_at_) || !defined(_di_f_file_create_node_at_) || !defined(_di_f_file_copy_at_) - f_return_status private_f_file_create_node_at(const int at_id, const f_string_t path, const mode_t mode, const dev_t device) { + f_status_t private_f_file_create_node_at(const int at_id, const f_string_t path, const mode_t mode, const dev_t device) { if (mknodat(at_id, path, mode, device) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -307,7 +307,7 @@ extern "C" { #endif // !defined(_di_f_file_create_device_at_) || !defined(_di_f_file_create_node_at_) || !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_flush_) || !defined(_di_f_file_close_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_flush(const int id) { + f_status_t private_f_file_flush(const int id) { if (fsync(id) < 0) { if (errno == EBADF) return F_status_set_error(F_file_descriptor); @@ -324,7 +324,7 @@ extern "C" { #endif // !defined(_di_f_file_flush_) || !defined(_di_f_file_close_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_link_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_link(const f_string_t target, const f_string_t point) { + f_status_t private_f_file_link(const f_string_t target, const f_string_t point) { if (symlink(target, point) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -352,7 +352,7 @@ extern "C" { #endif // !defined(_di_f_file_link_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_link_at_) || !defined(_di_f_file_copy_at_) - f_return_status private_f_file_link_at(const int at_id, const f_string_t target, const f_string_t point) { + f_status_t private_f_file_link_at(const int at_id, const f_string_t target, const f_string_t point) { if (symlinkat(target, at_id, point) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -381,7 +381,7 @@ extern "C" { #endif // !defined(_di_f_file_link_at_) || !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_link_read_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_link_read(const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) { + f_status_t private_f_file_link_read(const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) { // create a NULL terminated string based on file stat. if (link_stat.st_size + 1 > target->size) { if (link_stat.st_size + 1 > f_string_length_t_size) { @@ -417,7 +417,7 @@ extern "C" { #endif // !defined(_di_f_file_link_read_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_link_read_at_) || !defined(_di_f_file_copy_at_) - f_return_status private_f_file_link_read_at(const int at_id, const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) { + f_status_t private_f_file_link_read_at(const int at_id, const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) { // create a NULL terminated string based on file stat. if (link_stat.st_size + 1 > target->size) { if (link_stat.st_size + 1 > f_string_length_t_size) { @@ -454,7 +454,7 @@ extern "C" { #endif // !defined(_di_f_file_link_read_at_) || !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_mode_set_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_mode_set(const f_string_t path, const mode_t mode) { + f_status_t private_f_file_mode_set(const f_string_t path, const mode_t mode) { if (chmod(path, mode) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -476,7 +476,7 @@ extern "C" { #endif // !defined(_di_f_file_mode_set_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_mode_set_at_) || !defined(_di_f_file_copy_at_) - f_return_status private_f_file_mode_set_at(const int at_id, const f_string_t path, const mode_t mode) { + f_status_t private_f_file_mode_set_at(const int at_id, const f_string_t path, const mode_t mode) { if (fchmodat(at_id, path, mode, 0) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -499,7 +499,7 @@ extern "C" { #endif // !defined(_di_f_file_mode_set_at_) || !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_open_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_open(const f_string_t path, const mode_t mode, f_file_t *file) { + f_status_t private_f_file_open(const f_string_t path, const mode_t mode, f_file_t *file) { if (!mode) { file->id = open(path, file->flag); @@ -537,7 +537,7 @@ extern "C" { #endif // !defined(_di_f_file_open_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_open_at_) || !defined(_di_f_file_copy_at_) - f_return_status private_f_file_open_at(const int at_id, const f_string_t path, const mode_t mode, f_file_t *file) { + f_status_t private_f_file_open_at(const int at_id, const f_string_t path, const mode_t mode, f_file_t *file) { if (!mode) { file->id = openat(at_id, path, file->flag); @@ -576,7 +576,7 @@ extern "C" { #endif // !defined(_di_f_file_open_at_) || !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_role_change_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_role_change(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference) { + f_status_t private_f_file_role_change(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference) { int result = 0; if (dereference) { @@ -625,7 +625,7 @@ extern "C" { #endif // !defined(_di_f_file_role_change_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_role_change_at_) || !defined(_di_f_file_copy_at_) - f_return_status private_f_file_role_change_at(const int at_id, const f_string_t path, const uid_t uid, const gid_t gid, const int flag) { + f_status_t private_f_file_role_change_at(const int at_id, const f_string_t path, const uid_t uid, const gid_t gid, const int flag) { int result = 0; if (uid != -1) { @@ -660,7 +660,7 @@ extern "C" { #endif // !defined(_di_f_file_role_change_at_) || !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_stat_) || !defined(_di_f_file_copy_) - f_return_status private_f_file_stat(const f_string_t path, const bool dereference, struct stat *file_stat) { + f_status_t private_f_file_stat(const f_string_t path, const bool dereference, struct stat *file_stat) { if ((dereference ? stat(path, file_stat) : lstat(path, file_stat)) < 0) { if (errno == ENAMETOOLONG) return F_status_set_error(F_name); @@ -680,7 +680,7 @@ extern "C" { #endif // !defined(_di_f_file_stat_) || !defined(_di_f_file_copy_) #if !defined(_di_f_file_stat_at_) || !defined(_di_f_file_copy_at_) - f_return_status private_f_file_stat_at(const int at_id, const f_string_t path, const int flag, struct stat *file_stat) { + f_status_t private_f_file_stat_at(const int at_id, const f_string_t path, const int flag, struct stat *file_stat) { if (fstatat(at_id, path, file_stat, flag) < 0) { if (errno == ENAMETOOLONG) return F_status_set_error(F_name); @@ -702,7 +702,7 @@ extern "C" { #endif // !defined(_di_f_file_stat_at_) || !defined(_di_f_file_copy_at_) #if !defined(_di_f_file_stat_by_id_) || !defined(_di_f_file_size_by_id_) - f_return_status private_f_file_stat_by_id(const int id, struct stat *file_stat) { + f_status_t private_f_file_stat_by_id(const int id, struct stat *file_stat) { const int result = fstat(id, file_stat); if (result < 0) { @@ -751,7 +751,7 @@ extern "C" { #endif // !defined(_di_f_file_stream_descriptor_) || !defined(_di_f_file_stream_open_) || !defined(_di_f_file_stream_reopen_) #if !defined(f_file_stream_write) || !defined(_di_f_file_stream_write_block_) || !defined(f_file_stream_write_until) || !defined(f_file_stream_write_range) - f_return_status private_f_file_stream_write_until(const f_file_t file, const f_string_t string, const f_string_length_t amount, const f_string_length_t total, f_string_length_t *written) { + f_status_t private_f_file_stream_write_until(const f_file_t file, const f_string_t string, const f_string_length_t amount, const f_string_length_t total, f_string_length_t *written) { *written = 0; f_status_t status = F_none; @@ -800,7 +800,7 @@ extern "C" { #endif // !defined(f_file_stream_write) || !defined(_di_f_file_stream_write_block_) || !defined(f_file_stream_write_until) || !defined(f_file_stream_write_range) #if !defined(f_file_write) || !defined(_di_f_file_write_block_) || !defined(f_file_write_until) || !defined(f_file_write_range) - f_return_status private_f_file_write_until(const f_file_t file, const f_string_t string, const f_string_length_t total, f_string_length_t *written) { + f_status_t private_f_file_write_until(const f_file_t file, const f_string_t string, const f_string_length_t total, f_string_length_t *written) { *written = 0; f_status_t status = F_none; diff --git a/level_0/f_file/c/private-file.h b/level_0/f_file/c/private-file.h index 1f0bc91..0150666 100644 --- a/level_0/f_file/c/private-file.h +++ b/level_0/f_file/c/private-file.h @@ -39,7 +39,7 @@ extern "C" { * @see f_file_stream_close() */ #if !defined(_di_f_file_close_) || !defined(_di_f_file_copy_) || !defined(_di_f_file_stream_close_) - extern f_return_status private_f_file_close(int *id) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_close(int *id) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_close_) || !defined(_di_f_file_copy_) || !defined(_di_f_file_stream_close_) /** @@ -87,7 +87,7 @@ extern "C" { * @see f_file_clone() */ #if !defined(_di_f_file_copy_) || !defined(_di_f_file_clone_) - extern f_return_status private_f_file_copy_content(const f_string_t source, const f_string_t destination, const f_number_unsigned_t size_block) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_copy_content(const f_string_t source, const f_string_t destination, const f_number_unsigned_t size_block) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_copy_) || !defined(_di_f_file_clone_) /** @@ -130,7 +130,7 @@ extern "C" { * @see f_file_create() */ #if !defined(_di_f_file_create_) || !defined(_di_f_file_copy_) - extern f_return_status private_f_file_create(const f_string_t path, const mode_t mode, const bool exclusive) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_create(const f_string_t path, const mode_t mode, const bool exclusive) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_create_) || !defined(_di_f_file_copy_) /** @@ -174,7 +174,7 @@ extern "C" { * @see f_file_create_at() */ #if !defined(_di_f_file_create_at_) - extern f_return_status private_f_file_create_at(const int at_id, const f_string_t path, const mode_t mode, const bool exclusive) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_create_at(const int at_id, const f_string_t path, const mode_t mode, const bool exclusive) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_create_at_) /** @@ -208,7 +208,7 @@ extern "C" { * @see f_file_copy() */ #if !defined(_di_f_file_copy_) - extern f_return_status private_f_file_create_directory(const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_create_directory(const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_copy_) /** @@ -245,7 +245,7 @@ extern "C" { * @see f_file_copy_at() */ #if !defined(_di_f_file_copy_at_) - extern f_return_status private_f_file_create_directory_at(const int at_id, const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_create_directory_at(const int at_id, const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_copy_at_) /** @@ -277,7 +277,7 @@ extern "C" { * @see f_file_copy() */ #if !defined(_di_f_file_create_fifo_) || !defined(_di_f_file_copy_) - extern f_return_status private_f_file_create_fifo(const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_create_fifo(const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_create_fifo_) || !defined(_di_f_file_copy_) /** @@ -312,7 +312,7 @@ extern "C" { * @see f_file_copy_at() */ #if !defined(_di_f_file_create_fifo_at_) || !defined(_di_f_file_copy_at_) - extern f_return_status private_f_file_create_fifo_at(const int at_id, const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_create_fifo_at(const int at_id, const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_create_fifo_at_) || !defined(_di_f_file_copy_at_) /** @@ -351,7 +351,7 @@ extern "C" { * @see f_file_create_node() */ #if !defined(_di_f_file_create_device_) || !defined(_di_f_file_create_node_) || !defined(_di_f_file_copy_) - extern f_return_status private_f_file_create_node(const f_string_t path, const mode_t mode, const dev_t device) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_create_node(const f_string_t path, const mode_t mode, const dev_t device) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_create_device_) || !defined(_di_f_file_create_node_) || !defined(_di_f_file_copy_) /** @@ -393,7 +393,7 @@ extern "C" { * @see f_file_create_node_at() */ #if !defined(_di_f_file_create_device_at_) || !defined(_di_f_file_create_node_at_) || !defined(_di_f_file_copy_at_) - extern f_return_status private_f_file_create_node_at(const int at_id, const f_string_t path, const mode_t mode, const dev_t device) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_create_node_at(const int at_id, const f_string_t path, const mode_t mode, const dev_t device) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_create_device_at_) || !defined(_di_f_file_create_node_at_) || !defined(_di_f_file_copy_at_) /** @@ -419,7 +419,7 @@ extern "C" { * @see f_file_flush() */ #if !defined(_di_f_file_flush_) || !defined(_di_f_file_close_) || !defined(_di_f_file_copy_) - extern f_return_status private_f_file_flush(const int id) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_flush(const int id) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_flush_) || !defined(_di_f_file_close_) || !defined(_di_f_file_copy_) /** @@ -455,7 +455,7 @@ extern "C" { * @see f_file_link() */ #if !defined(_di_f_file_link_) || !defined(_di_f_file_copy_) - extern f_return_status private_f_file_link(const f_string_t target, const f_string_t point) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_link(const f_string_t target, const f_string_t point) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_link_) || !defined(_di_f_file_copy_) /** @@ -493,7 +493,7 @@ extern "C" { * @see f_file_link_at() */ #if !defined(_di_f_file_link_at_) - extern f_return_status private_f_file_link_at(const int at_id, const f_string_t target, const f_string_t point) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_link_at(const int at_id, const f_string_t target, const f_string_t point) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_link_at_) /** @@ -527,7 +527,7 @@ extern "C" { * @see f_file_link_read() */ #if !defined(_di_f_file_link_read_) || !defined(_di_f_file_copy_) - extern f_return_status private_f_file_link_read(const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_link_read(const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_link_read_) || !defined(_di_f_file_copy_) /** @@ -564,7 +564,7 @@ extern "C" { * @see f_file_link_read_at() */ #if !defined(_di_f_file_link_read_at_) || !defined(_di_f_file_copy_at_) - extern f_return_status private_f_file_link_read_at(const int at_id, const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_link_read_at(const int at_id, const f_string_t path, const struct stat link_stat, f_string_dynamic_t *target) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_link_read_at_) || !defined(_di_f_file_copy_at_) /** @@ -595,7 +595,7 @@ extern "C" { * @see f_file_mode_set() */ #if !defined(_di_f_file_mode_set_) || !defined(_di_f_file_copy_) - extern f_return_status private_f_file_mode_set(const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_mode_set(const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_mode_set_) || !defined(_di_f_file_copy_) /** @@ -627,7 +627,7 @@ extern "C" { * @see f_file_mode_set_at() */ #if !defined(_di_f_file_mode_set_at_) - extern f_return_status private_f_file_mode_set_at(const int at_id, const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_mode_set_at(const int at_id, const f_string_t path, const mode_t mode) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_mode_set_at_) /** @@ -655,7 +655,7 @@ extern "C" { * @see f_file_open() */ #if !defined(_di_f_file_open_) || !defined(_di_f_file_copy_) - extern f_return_status private_f_file_open(const f_string_t path, const mode_t mode, f_file_t *file) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_open(const f_string_t path, const mode_t mode, f_file_t *file) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_open_) || !defined(_di_f_file_copy_) /** @@ -684,7 +684,7 @@ extern "C" { * @see f_file_open_at() */ #if !defined(_di_f_file_open_at_) - extern f_return_status private_f_file_open_at(const int at_id, const f_string_t path, const mode_t mode, f_file_t *file) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_open_at(const int at_id, const f_string_t path, const mode_t mode, f_file_t *file) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_open_at_) /** @@ -722,7 +722,7 @@ extern "C" { * @see f_file_role_change() */ #if !defined(_di_f_file_role_change_) || !defined(_di_f_file_copy_) - extern f_return_status private_f_file_role_change(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_role_change(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_role_change_) || !defined(_di_f_file_copy_) /** @@ -761,7 +761,7 @@ extern "C" { * @see f_file_role_change_at() */ #if !defined(_di_f_file_role_change_at_) - extern f_return_status private_f_file_role_change_at(const int at_id, const f_string_t path, const uid_t uid, const gid_t gid, const int flag) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_role_change_at(const int at_id, const f_string_t path, const uid_t uid, const gid_t gid, const int flag) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_role_change_at_) /** @@ -795,7 +795,7 @@ extern "C" { * @see f_file_touch() */ #if !defined(_di_f_file_stat_) || !defined(_di_f_file_copy_) || !defined(_di_f_file_exists_) || !defined(_di_f_file_is_) || !defined(_di_f_file_touch_) - extern f_return_status private_f_file_stat(const f_string_t file_name, const bool dereference, struct stat *file_stat) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_stat(const f_string_t file_name, const bool dereference, struct stat *file_stat) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_stat_) || !defined(_di_f_file_copy_) || !defined(_di_f_file_exists_) || !defined(_di_f_file_is_) || !defined(_di_f_file_touch_) /** @@ -828,7 +828,7 @@ extern "C" { * @see f_file_touch_at() */ #if !defined(_di_f_file_stat_at_) || !defined(_di_f_file_exists_at_) || !defined(_di_f_file_touch_at_) - extern f_return_status private_f_file_stat_at(const int at_id, const f_string_t file_name, const int flag, struct stat *file_stat) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_stat_at(const int at_id, const f_string_t file_name, const int flag, struct stat *file_stat) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_stat_at_) || !defined(_di_f_file_exists_at_) || !defined(_di_f_file_touch_at_) /** @@ -856,7 +856,7 @@ extern "C" { * @see f_file_stat_by_id() */ #if !defined(_di_f_file_stat_by_id_) || !defined(_di_f_file_size_by_id_) - extern f_return_status private_f_file_stat_by_id(const int id, struct stat *file_stat) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_stat_by_id(const int id, struct stat *file_stat) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_file_stat_by_id_) || !defined(_di_f_file_size_by_id_) /** @@ -915,7 +915,7 @@ extern "C" { * @see f_file_stream_write_until() */ #if !defined(f_file_stream_write) || !defined(_di_f_file_stream_write_block_) || !defined(f_file_stream_write_until) || !defined(f_file_stream_write_range) - extern f_return_status private_f_file_stream_write_until(const f_file_t file, const f_string_t string, const f_string_length_t amount, const f_string_length_t total, f_string_length_t *written) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_stream_write_until(const f_file_t file, const f_string_t string, const f_string_length_t amount, const f_string_length_t total, f_string_length_t *written) f_gcc_attribute_visibility_internal; #endif // !defined(f_file_stream_write) || !defined(_di_f_file_stream_write_block_) || !defined(f_file_stream_write_until) || !defined(f_file_stream_write_range) /** @@ -952,7 +952,7 @@ extern "C" { * @see f_file_write_until() */ #if !defined(f_file_write) || !defined(_di_f_file_write_block_) || !defined(f_file_write_until) || !defined(f_file_write_range) - extern f_return_status private_f_file_write_until(const f_file_t file, const f_string_t string, const f_string_length_t total, f_string_length_t *written) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_file_write_until(const f_file_t file, const f_string_t string, const f_string_length_t total, f_string_length_t *written) f_gcc_attribute_visibility_internal; #endif // !defined(f_file_write) || !defined(_di_f_file_write_block_) || !defined(f_file_write_until) || !defined(f_file_write_range) #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss-common.h b/level_0/f_fss/c/fss-common.h index 0adfe6c..5106182 100644 --- a/level_0/f_fss/c/fss-common.h +++ b/level_0/f_fss/c/fss-common.h @@ -20,18 +20,18 @@ extern "C" { * FSS-specific types. */ #ifndef _di_f_fss_types_t_ - const static f_string_t f_fss_brace_left_s = "{"; - const static f_string_t f_fss_brace_right_s = "}"; - const static f_string_t f_fss_colon_s = ":"; - const static f_string_t f_fss_dash_s = "-"; - const static f_string_t f_fss_f_s = "f"; - const static f_string_t f_fss_pound_s = "#"; - const static f_string_t f_fss_quote_single_s = "'"; - const static f_string_t f_fss_quote_double_s = "\""; - const static f_string_t f_fss_s_s = "s"; - const static f_string_t f_fss_slash_s = "\\"; - const static f_string_t f_fss_space_s = " "; - const static f_string_t f_fss_underscore_s = "_"; + const extern f_string_t f_fss_brace_left_s; + const extern f_string_t f_fss_brace_right_s; + const extern f_string_t f_fss_colon_s; + const extern f_string_t f_fss_dash_s; + const extern f_string_t f_fss_f_s; + const extern f_string_t f_fss_pound_s; + const extern f_string_t f_fss_quote_single_s; + const extern f_string_t f_fss_quote_double_s; + const extern f_string_t f_fss_s_s; + const extern f_string_t f_fss_slash_s; + const extern f_string_t f_fss_space_s; + const extern f_string_t f_fss_underscore_s; #define f_fss_comment f_fss_pound_s[0] #define f_fss_eol f_string_eol_s[0] diff --git a/level_0/f_fss/c/fss.c b/level_0/f_fss/c/fss.c index 584b1e0..24f85c4 100644 --- a/level_0/f_fss/c/fss.c +++ b/level_0/f_fss/c/fss.c @@ -4,8 +4,23 @@ extern "C" { #endif +#ifndef _di_f_fss_types_t_ + const f_string_t f_fss_brace_left_s = "{"; + const f_string_t f_fss_brace_right_s = "}"; + const f_string_t f_fss_colon_s = ":"; + const f_string_t f_fss_dash_s = "-"; + const f_string_t f_fss_f_s = "f"; + const f_string_t f_fss_pound_s = "#"; + const f_string_t f_fss_quote_single_s = "'"; + const f_string_t f_fss_quote_double_s = "\""; + const f_string_t f_fss_s_s = "s"; + const f_string_t f_fss_slash_s = "\\"; + const f_string_t f_fss_space_s = " "; + const f_string_t f_fss_underscore_s = "_"; +#endif // _di_f_fss_types_t_ + #ifndef _di_fl_fss_apply_delimit_ - f_return_status fl_fss_apply_delimit(const f_fss_delimits_t delimits, f_string_static_t *buffer) { + f_status_t fl_fss_apply_delimit(const f_fss_delimits_t delimits, f_string_static_t *buffer) { #ifndef _di_level_0_parameter_checking_ if (!buffer) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -21,7 +36,7 @@ extern "C" { #endif // _di_fl_fss_apply_delimit_ #ifndef _di_fl_fss_apply_delimit_between_ - f_return_status fl_fss_apply_delimit_between(const f_fss_delimits_t delimits, const f_string_range_t range, f_string_static_t *buffer) { + f_status_t fl_fss_apply_delimit_between(const f_fss_delimits_t delimits, const f_string_range_t range, f_string_static_t *buffer) { #ifndef _di_level_0_parameter_checking_ if (!buffer) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -37,7 +52,7 @@ extern "C" { #endif // _di_fl_fss_apply_delimit_between_ #ifndef _di_f_fss_count_lines_ - f_return_status f_fss_count_lines(const f_string_static_t buffer, const f_string_length_t before, f_string_length_t *line) { + f_status_t f_fss_count_lines(const f_string_static_t buffer, const f_string_length_t before, f_string_length_t *line) { #ifndef _di_level_0_parameter_checking_ if (!line) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -61,7 +76,7 @@ extern "C" { #endif // _di_f_fss_count_lines_ #ifndef _di_f_fss_count_lines_range_ - f_return_status f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, const f_string_length_t before, f_string_length_t *line) { + f_status_t f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, const f_string_length_t before, f_string_length_t *line) { #ifndef _di_level_0_parameter_checking_ if (!line) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -85,7 +100,7 @@ extern "C" { #endif // _di_f_fss_count_lines_range_ #ifndef _di_f_fss_is_graph_ - f_return_status f_fss_is_graph(const f_string_static_t buffer, const f_string_range_t range) { + f_status_t f_fss_is_graph(const f_string_static_t buffer, const f_string_range_t range) { if (range.stop < range.start || range.start >= buffer.used || !buffer.used) { return F_false; @@ -102,7 +117,7 @@ extern "C" { #endif // _di_f_fss_is_graph_ #ifndef _di_f_fss_is_space_ - f_return_status f_fss_is_space(const f_string_static_t buffer, const f_string_range_t range) { + f_status_t f_fss_is_space(const f_string_static_t buffer, const f_string_range_t range) { if (range.stop < range.start || range.start >= buffer.used || !buffer.used) { return F_false; @@ -135,7 +150,7 @@ extern "C" { #endif // _di_f_fss_is_space_ #ifndef _di_f_fss_is_zero_width_ - f_return_status f_fss_is_zero_width(const f_string_static_t buffer, const f_string_range_t range) { + f_status_t f_fss_is_zero_width(const f_string_static_t buffer, const f_string_range_t range) { if (range.stop < range.start || range.start >= buffer.used || !buffer.used) { return F_false; @@ -152,7 +167,7 @@ extern "C" { #endif // _di_f_fss_is_zero_width_ #ifndef _di_f_fss_seek_to_eol_ - f_return_status f_fss_seek_to_eol(const f_string_dynamic_t buffer, f_string_range_t *range) { + f_status_t f_fss_seek_to_eol(const f_string_dynamic_t buffer, f_string_range_t *range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -168,7 +183,7 @@ extern "C" { #endif // _di_f_fss_seek_to_eol_ #ifndef _di_f_fss_shift_delimit_ - f_return_status f_fss_shift_delimit(const f_string_range_t range, f_string_dynamic_t *buffer) { + f_status_t f_fss_shift_delimit(const f_string_range_t range, f_string_dynamic_t *buffer) { #ifndef _di_level_0_parameter_checking_ if (!buffer) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -238,7 +253,7 @@ extern "C" { #endif // _di_f_fss_shift_delimit_ #ifndef _di_f_fss_skip_past_delimit_ - f_return_status f_fss_skip_past_delimit(const f_string_static_t buffer, f_string_range_t *range) { + f_status_t f_fss_skip_past_delimit(const f_string_static_t buffer, f_string_range_t *range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -254,7 +269,7 @@ extern "C" { #endif // _di_f_fss_skip_past_delimit_ #ifndef _di_f_fss_skip_past_space_ - f_return_status f_fss_skip_past_space(const f_string_static_t buffer, f_string_range_t *range) { + f_status_t f_fss_skip_past_space(const f_string_static_t buffer, f_string_range_t *range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -350,7 +365,7 @@ extern "C" { #endif // _di_f_fss_skip_past_space_ #ifndef _di_f_fss_skip_past_non_graph_ - f_return_status f_fss_skip_past_non_graph(const f_string_static_t buffer, f_string_range_t *range) { + f_status_t f_fss_skip_past_non_graph(const f_string_static_t buffer, f_string_range_t *range) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_fss/c/fss.h b/level_0/f_fss/c/fss.h index 877b590..786520e 100644 --- a/level_0/f_fss/c/fss.h +++ b/level_0/f_fss/c/fss.h @@ -51,7 +51,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_apply_delimit_ - extern f_return_status fl_fss_apply_delimit(const f_fss_delimits_t delimits, f_string_static_t *buffer); + extern f_status_t fl_fss_apply_delimit(const f_fss_delimits_t delimits, f_string_static_t *buffer); #endif // _di_fl_fss_apply_delimit_ /** @@ -71,7 +71,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_fss_apply_delimit_between_ - extern f_return_status fl_fss_apply_delimit_between(const f_fss_delimits_t delimits, const f_string_range_t range, f_string_static_t *buffer); + extern f_status_t fl_fss_apply_delimit_between(const f_fss_delimits_t delimits, const f_string_range_t range, f_string_static_t *buffer); #endif // _di_fl_fss_apply_delimit_between_ /** @@ -93,7 +93,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_count_lines_ - extern f_return_status f_fss_count_lines(const f_string_static_t buffer, const f_string_length_t before, f_string_length_t *line); + extern f_status_t f_fss_count_lines(const f_string_static_t buffer, const f_string_length_t before, f_string_length_t *line); #endif // _di_f_fss_count_lines_ /** @@ -117,7 +117,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_count_lines_range_ - extern f_return_status f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, const f_string_length_t before, f_string_length_t *line); + extern f_status_t f_fss_count_lines_range(const f_string_static_t buffer, const f_string_range_t range, const f_string_length_t before, f_string_length_t *line); #endif // _di_f_fss_count_lines_range_ /** @@ -140,7 +140,7 @@ extern "C" { * @see f_utf_is_graph() */ #ifndef _di_f_fss_is_graph_ - extern f_return_status f_fss_is_graph(const f_string_static_t buffer, const f_string_range_t range); + extern f_status_t f_fss_is_graph(const f_string_static_t buffer, const f_string_range_t range); #endif // _di_f_fss_is_graph_ /** @@ -165,7 +165,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_f_fss_is_space_ - extern f_return_status f_fss_is_space(const f_string_static_t buffer, const f_string_range_t range); + extern f_status_t f_fss_is_space(const f_string_static_t buffer, const f_string_range_t range); #endif // _di_f_fss_is_space_ /** @@ -189,7 +189,7 @@ extern "C" { * @see f_utf_is_zero_width() */ #ifndef _di_f_fss_is_zero_width_ - extern f_return_status f_fss_is_zero_width(const f_string_static_t buffer, const f_string_range_t range); + extern f_status_t f_fss_is_zero_width(const f_string_static_t buffer, const f_string_range_t range); #endif // _di_f_fss_is_zero_width_ /** @@ -208,7 +208,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_seek_to_eol_ - extern f_return_status f_fss_seek_to_eol(const f_string_dynamic_t buffer, f_string_range_t *range); + extern f_status_t f_fss_seek_to_eol(const f_string_dynamic_t buffer, f_string_range_t *range); #endif // _di_f_fss_seek_to_eol_ /** @@ -231,7 +231,7 @@ extern "C" { * F_utf (with error bit) if UTF-8 cannot be fully processed (buffer or range range not long enough). */ #ifndef _di_f_fss_shift_delimit_ - extern f_return_status f_fss_shift_delimit(const f_string_range_t range, f_string_dynamic_t *buffer); + extern f_status_t f_fss_shift_delimit(const f_string_range_t range, f_string_dynamic_t *buffer); #endif // _di_f_fss_shift_delimit_ /** @@ -250,7 +250,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_fss_skip_past_delimit_ - extern f_return_status f_fss_skip_past_delimit(const f_string_static_t buffer, f_string_range_t *range); + extern f_status_t f_fss_skip_past_delimit(const f_string_static_t buffer, f_string_range_t *range); #endif // _di_f_fss_skip_past_delimit_ /** @@ -284,7 +284,7 @@ extern "C" { * @see f_utf_is_zero_width() */ #ifndef _di_f_fss_skip_past_space_ - extern f_return_status f_fss_skip_past_space(const f_string_static_t buffer, f_string_range_t *range); + extern f_status_t f_fss_skip_past_space(const f_string_static_t buffer, f_string_range_t *range); #endif // _di_f_fss_skip_past_space_ /** @@ -316,7 +316,7 @@ extern "C" { * @see f_utf_is_zero_width() */ #ifndef _di_f_fss_skip_past_non_graph_ - extern f_return_status f_fss_skip_past_non_graph(const f_string_static_t buffer, f_string_range_t *range); + extern f_status_t f_fss_skip_past_non_graph(const f_string_static_t buffer, f_string_range_t *range); #endif // _di_f_fss_skip_past_non_graph_ #ifdef __cplusplus diff --git a/level_0/f_fss/c/fss_delimit.h b/level_0/f_fss/c/fss_delimit.h index 3679f50..1ba4fcf 100644 --- a/level_0/f_fss/c/fss_delimit.h +++ b/level_0/f_fss/c/fss_delimit.h @@ -35,18 +35,28 @@ extern "C" { #define f_fss_delimits_t_initialize f_string_lengths_t_initialize - #define f_macro_fss_delimits_t_clear(delimits) f_macro_string_lengths_t_clear(delimits) + #define f_macro_fss_delimits_t_adjust(status, delimits, length) f_macro_memory_structure_t_adjust(status, delimits, f_fss_delimit_t, length) - #define f_macro_fss_delimits_t_new(status, delimits, length) f_macro_string_lengths_t_new(status, delimits, length) + #define f_macro_fss_delimits_t_clear(delimits) f_macro_memory_structure_t_clear(delimits) - #define f_macro_fss_delimits_t_delete(status, delimits) f_macro_string_lengths_t_delete(status, delimits) - #define f_macro_fss_delimits_t_destroy(status, delimits) f_macro_string_lengths_t_destroy(status, delimits) + #define f_macro_fss_delimits_t_decimate(status, delimits) f_macro_memory_structure_decimate(status, delimits, f_fss_delimit_t); + #define f_macro_fss_delimits_t_decimate_by(status, delimits, amount) f_macro_memory_structure_decimate_by(status, delimits, f_fss_delimit_t, amount); - #define f_macro_fss_delimits_t_delete_simple(delimits) f_macro_string_lengths_t_delete_simple(delimits) - #define f_macro_fss_delimits_t_destroy_simple(delimits) f_macro_string_lengths_t_destroy_simple(delimits) + #define f_macro_fss_delimits_t_decrease(status, delimits) f_macro_memory_structure_decrease(status, delimits, f_fss_delimit_t); + #define f_macro_fss_delimits_t_decrease_by(status, delimits, amount) f_macro_memory_structure_decrease_by(status, delimits, f_fss_delimit_t, amount); - #define f_macro_fss_delimits_t_resize(status, delimits, new_length) f_macro_string_lengths_t_resize(status, delimits, new_length) - #define f_macro_fss_delimits_t_adjust(status, delimits, new_length) f_macro_string_lengths_t_adjust(status, delimits, new_length) + #define f_macro_fss_delimits_t_delete(status, delimits) f_macro_memory_structure_t_delete(status, delimits, f_fss_delimit_t) + #define f_macro_fss_delimits_t_delete_simple(delimits) f_macro_memory_structure_t_delete_simple(delimits, f_fss_delimit_t) + + #define f_macro_fss_delimits_t_destroy(status, delimits) f_macro_memory_structure_t_destroy(status, delimits, f_fss_delimit_t) + #define f_macro_fss_delimits_t_destroy_simple(delimits) f_macro_memory_structure_t_destroy_simple(delimits, f_fss_delimit_t) + + #define f_macro_fss_delimits_t_increase(status, delimits) f_macro_memory_structure_increase(status, delimits, f_fss_delimit_t); + #define f_macro_fss_delimits_t_increase_by(status, delimits, amount) f_macro_memory_structure_increase_by(status, delimits, f_fss_delimit_t, amount); + + #define f_macro_fss_delimits_t_new(status, delimits, length) f_macro_memory_structure_t_new(status, delimits, f_fss_delimit_t, length) + + #define f_macro_fss_delimits_t_resize(status, delimits, new_length) f_macro_memory_structure_t_resize(status, delimits, f_fss_delimit_t, new_length) #endif // _di_f_fss_delimits_t_ /** diff --git a/level_0/f_iki/c/iki.c b/level_0/f_iki/c/iki.c index c4db092..457730a 100644 --- a/level_0/f_iki/c/iki.c +++ b/level_0/f_iki/c/iki.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_iki_content_is_ - f_return_status f_iki_content_is(const f_string_static_t content, const uint8_t quote) { + f_status_t f_iki_content_is(const f_string_static_t content, const uint8_t quote) { #ifndef _di_level_0_parameter_checking_ if (content.used > content.size) return F_status_set_error(F_parameter); if (quote != f_iki_syntax_quote_single && quote != f_iki_syntax_quote_double) return F_status_set_error(F_parameter); @@ -19,7 +19,7 @@ extern "C" { #endif // _di_f_iki_content_is_ #ifndef _di_f_iki_content_partial_is_ - f_return_status f_iki_content_partial_is(const f_string_static_t content, const f_string_range_t range, const uint8_t quote) { + f_status_t f_iki_content_partial_is(const f_string_static_t content, const f_string_range_t range, const uint8_t quote) { #ifndef _di_level_0_parameter_checking_ if (content.used > content.size) return F_status_set_error(F_parameter); if (range.start > range.stop) return F_status_set_error(F_parameter); @@ -32,7 +32,7 @@ extern "C" { #endif // _di_f_iki_content_partial_is_ #ifndef _di_f_iki_object_is_ - f_return_status f_iki_object_is(const f_string_static_t object) { + f_status_t f_iki_object_is(const f_string_static_t object) { #ifndef _di_level_0_parameter_checking_ if (object.used > object.size) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -44,7 +44,7 @@ extern "C" { #endif // _di_f_iki_object_is_ #ifndef _di_f_iki_object_partial_is_ - f_return_status f_iki_object_partial_is(const f_string_static_t object, const f_string_range_t range) { + f_status_t f_iki_object_partial_is(const f_string_static_t object, const f_string_range_t range) { #ifndef _di_level_0_parameter_checking_ if (object.used > object.size) return F_status_set_error(F_parameter); if (range.start > range.stop) return F_status_set_error(F_parameter); @@ -56,7 +56,7 @@ extern "C" { #endif // _di_f_iki_object_partial_is_ #ifndef _di_f_iki_read_ - f_return_status f_iki_read(f_string_static_t *buffer, f_string_range_t *range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content) { + f_status_t f_iki_read(f_string_static_t *buffer, f_string_range_t *range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content) { #ifndef _di_level_0_parameter_checking_ if (!buffer) return F_status_set_error(F_parameter); if (!range) return F_status_set_error(F_parameter); diff --git a/level_0/f_iki/c/iki.h b/level_0/f_iki/c/iki.h index 4f7475a..eb2063c 100644 --- a/level_0/f_iki/c/iki.h +++ b/level_0/f_iki/c/iki.h @@ -46,7 +46,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_iki_content_is_ - extern f_return_status f_iki_content_is(const f_string_static_t content, const uint8_t quote); + extern f_status_t f_iki_content_is(const f_string_static_t content, const uint8_t quote); #endif // _di_f_iki_content_is_ /** @@ -66,7 +66,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_iki_content_partial_is_ - extern f_return_status f_iki_content_partial_is(const f_string_static_t content, const f_string_range_t range, const uint8_t quote); + extern f_status_t f_iki_content_partial_is(const f_string_static_t content, const f_string_range_t range, const uint8_t quote); #endif // _di_f_iki_content_partial_is_ /** @@ -83,7 +83,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_word(). */ #ifndef _di_f_iki_object_is_ - extern f_return_status f_iki_object_is(const f_string_static_t object); + extern f_status_t f_iki_object_is(const f_string_static_t object); #endif // _di_f_iki_object_is_ /** @@ -102,7 +102,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_word(). */ #ifndef _di_f_iki_object_partial_is_ - extern f_return_status f_iki_object_partial_is(const f_string_static_t object, const f_string_range_t range); + extern f_status_t f_iki_object_partial_is(const f_string_static_t object, const f_string_range_t range); #endif // _di_f_iki_object_partial_is_ /** @@ -142,7 +142,7 @@ extern "C" { * F_string_too_large (with error bit) if a string length is too large to store in the buffer. */ #ifndef _di_f_iki_read_ - extern f_return_status f_iki_read(f_string_static_t *buffer, f_string_range_t *range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content); + extern f_status_t f_iki_read(f_string_static_t *buffer, f_string_range_t *range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content); #endif // _di_f_iki_read_ #ifdef __cplusplus diff --git a/level_0/f_iki/c/private-iki.c b/level_0/f_iki/c/private-iki.c index d45ea1d..118247b 100644 --- a/level_0/f_iki/c/private-iki.c +++ b/level_0/f_iki/c/private-iki.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_iki_content_is_) || !defined(_di_f_iki_content_partial_is_) - f_return_status private_f_iki_content_partial_is(const f_string_static_t buffer, const f_string_range_t range, const uint8_t quote) { + f_status_t private_f_iki_content_partial_is(const f_string_static_t buffer, const f_string_range_t range, const uint8_t quote) { f_string_length_t delimits = 0; for (f_string_length_t i = 0; i < buffer.used; i++) { @@ -32,7 +32,7 @@ extern "C" { #endif // !defined(_di_f_iki_content_is_) || !defined(_di_f_iki_content_partial_is_) #if !defined(_di_f_iki_object_is_) || !defined(_di_f_iki_object_partial_is_) - f_return_status private_f_iki_object_partial_is(const f_string_static_t buffer, const f_string_range_t range) { + f_status_t private_f_iki_object_partial_is(const f_string_static_t buffer, const f_string_range_t range) { f_status_t status = F_none; for (f_string_length_t i = 0; i < buffer.used; i++) { diff --git a/level_0/f_iki/c/private-iki.h b/level_0/f_iki/c/private-iki.h index bba6738..d283a84 100644 --- a/level_0/f_iki/c/private-iki.h +++ b/level_0/f_iki/c/private-iki.h @@ -37,7 +37,7 @@ extern "C" { * @see f_iki_content_partial_is() */ #if !defined(_di_f_iki_content_is_) || !defined(_di_f_iki_content_partial_is_) - extern f_return_status private_f_iki_content_partial_is(const f_string_static_t buffer, const f_string_range_t range, const uint8_t quote) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_iki_content_partial_is(const f_string_static_t buffer, const f_string_range_t range, const uint8_t quote) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_iki_content_is_) || !defined(_di_f_iki_content_partial_is_) /** @@ -59,7 +59,7 @@ extern "C" { * @see f_iki_object_partial_is() */ #if !defined(_di_f_iki_object_is_) || !defined(_di_f_iki_object_partial_is_) - extern f_return_status private_f_iki_object_partial_is(const f_string_static_t buffer, const f_string_range_t range) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_iki_object_partial_is(const f_string_static_t buffer, const f_string_range_t range) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_iki_object_is_) || !defined(_di_f_iki_object_partial_is_) #ifdef __cplusplus diff --git a/level_0/f_limit/c/limit-common.h b/level_0/f_limit/c/limit-common.h index e5d631d..4a9d6dd 100644 --- a/level_0/f_limit/c/limit-common.h +++ b/level_0/f_limit/c/limit-common.h @@ -49,18 +49,28 @@ extern "C" { #define f_limit_values_t_initialize { 0, 0, 0 } + #define f_macro_limit_values_t_adjust(status, values, new_length) f_macro_memory_structure_t_adjust(status, values, f_limit_value_t, new_length) + #define f_macro_limit_values_t_clear(values) f_macro_memory_structure_t_clear(values) - #define f_macro_limit_values_t_new(status, values, length) f_macro_memory_structure_t_new(status, values, f_limit_value_t, length) + #define f_macro_limit_values_t_decimate(status, values) f_macro_memory_structure_decimate(status, values, sizeof(f_limit_value_t)); + #define f_macro_limit_values_t_decimate_by(status, values, amount) f_macro_memory_structure_decimate_by(status, values, sizeof(f_limit_value_t), amount); - #define f_macro_limit_values_t_delete(status, values) f_macro_memory_structure_t_delete(status, values, f_limit_value_t) - #define f_macro_limit_values_t_destroy(status, values) f_macro_memory_structure_t_destroy(status, values, f_limit_value_t) + #define f_macro_limit_values_t_decrease(status, values) f_macro_memory_structure_decrease(status, values, sizeof(f_limit_value_t)); + #define f_macro_limit_values_t_decrease_by(status, values, amount) f_macro_memory_structure_decrease_by(status, values, sizeof(f_limit_value_t), amount); + #define f_macro_limit_values_t_delete(status, values) f_macro_memory_structure_t_delete(status, values, f_limit_value_t) #define f_macro_limit_values_t_delete_simple(values) f_macro_memory_structure_t_delete_simple(values, f_limit_value_t) + + #define f_macro_limit_values_t_destroy(status, values) f_macro_memory_structure_t_destroy(status, values, f_limit_value_t) #define f_macro_limit_values_t_destroy_simple(values) f_macro_memory_structure_t_destroy_simple(values, f_limit_value_t) + #define f_macro_limit_values_t_increase(status, values) f_macro_memory_structure_increase(status, values, sizeof(f_limit_value_t)); + #define f_macro_limit_values_t_increase_by(status, values, amount) f_macro_memory_structure_increase_by(status, values, sizeof(f_limit_value_t), amount); + + #define f_macro_limit_values_t_new(status, values, length) f_macro_memory_structure_t_new(status, values, f_limit_value_t, length) + #define f_macro_limit_values_t_resize(status, values, new_length) f_macro_memory_structure_t_resize(status, values, f_limit_value_t, new_length) - #define f_macro_limit_values_t_adjust(status, values, new_length) f_macro_memory_structure_t_adjust(status, values, f_limit_value_t, new_length) #endif // _di_f_limit_values_t_ /** @@ -99,18 +109,28 @@ extern "C" { #define f_limit_sets_t_initialize { 0, 0, 0 } + #define f_macro_limit_sets_t_adjust(status, sets, length) f_macro_memory_structure_t_adjust(status, sets, f_limit_set_t, length) + #define f_macro_limit_sets_t_clear(sets) f_macro_memory_structure_t_clear(sets) - #define f_macro_limit_sets_t_new(status, sets, length) f_macro_memory_structure_t_new(status, sets, f_limit_set_t, length) + #define f_macro_limit_sets_t_decimate(status, sets) f_macro_memory_structure_decimate(status, sets, f_limit_set_t); + #define f_macro_limit_sets_t_decimate_by(status, sets, amount) f_macro_memory_structure_decimate_by(status, sets, f_limit_set_t, amount); - #define f_macro_limit_sets_t_delete(status, sets) f_macro_memory_structure_t_delete(status, sets, f_limit_set_t) - #define f_macro_limit_sets_t_destroy(status, sets) f_macro_memory_structure_t_destroy(status, sets, f_limit_set_t) + #define f_macro_limit_sets_t_decrease(status, sets) f_macro_memory_structure_decrease(status, sets, f_limit_set_t); + #define f_macro_limit_sets_t_decrease_by(status, sets, amount) f_macro_memory_structure_decrease_by(status, sets, f_limit_set_t, amount); + #define f_macro_limit_sets_t_delete(status, sets) f_macro_memory_structure_t_delete(status, sets, f_limit_set_t) #define f_macro_limit_sets_t_delete_simple(sets) f_macro_memory_structure_t_delete_simple(sets, f_limit_set_t) - #define f_macro_limit_sets_t_destroy_simple(sets) f_macro_memory_structure_t_destroy_simple(sets, f_limit_set_t) + + #define f_macro_limit_sets_t_destroy(status, sets) f_macro_memory_structure_t_destroy(status, sets, f_limit_set_t) + #define f_macro_limit_sets_t_destroy_simple(sets) f_macro_memory_structure_t_destroy_simple(sets, f_limit_set_t) + + #define f_macro_limit_sets_t_increase(status, sets) f_macro_memory_structure_increase(status, sets, f_limit_set_t); + #define f_macro_limit_sets_t_increase_by(status, sets, amount) f_macro_memory_structure_increase_by(status, sets, f_limit_set_t, amount); + + #define f_macro_limit_sets_t_new(status, sets, length) f_macro_memory_structure_t_new(status, sets, f_limit_set_t, length) #define f_macro_limit_sets_t_resize(status, sets, new_length) f_macro_memory_structure_t_resize(status, sets, f_limit_set_t, new_length) - #define f_macro_limit_sets_t_adjust(status, sets, new_length) f_macro_memory_structure_t_adjust(status, sets, f_limit_set_t, new_length) #endif // _di_f_limit_sets_t_ #ifdef __cplusplus diff --git a/level_0/f_limit/c/limit.c b/level_0/f_limit/c/limit.c index 26247a8..e048fc0 100644 --- a/level_0/f_limit/c/limit.c +++ b/level_0/f_limit/c/limit.c @@ -1,12 +1,11 @@ #include "limit.h" -#include "private-limit.h" #ifdef __cplusplus extern "C" { #endif #ifndef _di_f_limit_process_ - f_return_status f_limit_process(const pid_t id, const int type, const f_limit_value_t *value_next, f_limit_value_t *value_current) { + f_status_t f_limit_process(const pid_t id, const int type, const f_limit_value_t *value_next, f_limit_value_t *value_current) { #ifndef _di_level_0_parameter_checking_ if (!value_next && !value_current) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -24,169 +23,6 @@ extern "C" { } #endif // _di_f_limit_process_ -#ifndef _di_f_limit_sets_decrease_ - f_return_status f_limit_sets_decrease(f_limit_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (sets->size > 1) { - return private_f_limit_sets_resize(sets->size - 1, sets); - } - - return private_f_limit_sets_delete(sets); - } -#endif // _di_f_limit_sets_decrease_ - -#ifndef _di_f_limit_sets_decrease_by_ - f_return_status f_limit_sets_decrease_by(const f_array_length_t amount, f_limit_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (sets->size - amount > 0) { - return private_f_limit_sets_resize(sets->size - amount, sets); - } - - return private_f_limit_sets_delete(sets); - } -#endif // _di_f_limit_sets_decrease_by_ - -#ifndef _di_f_limit_sets_delete_ - f_return_status f_limit_sets_delete(f_limit_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_limit_sets_delete(sets); - } -#endif // _di_f_limit_sets_delete_ - -#ifndef _di_f_limit_sets_increase_ - f_return_status f_limit_sets_increase(f_limit_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (sets->used + 1 > sets->size) { - f_array_length_t size = sets->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (sets->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_limit_sets_resize(size, sets); - } - - return F_none; - } -#endif // _di_f_limit_sets_increase_ - -#ifndef _di_f_limit_sets_increase_by_ - f_return_status f_limit_sets_increase_by(const f_array_length_t amount, f_limit_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (sets->used + amount > sets->size) { - if (sets->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_limit_sets_resize(sets->used + amount, sets); - } - - return F_none; - } -#endif // _di_f_limit_sets_increase_by_ - -#ifndef _di_f_limit_values_decrease_ - f_return_status f_limit_values_decrease(f_limit_values_t *values) { - #ifndef _di_level_0_parameter_checking_ - if (!values) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (values->size > 1) { - return private_f_limit_values_resize(values->size - 1, values); - } - - return private_f_limit_values_delete(values); - } -#endif // _di_f_limit_values_decrease_ - -#ifndef _di_f_limit_values_decrease_by_ - f_return_status f_limit_values_decrease_by(const f_array_length_t amount, f_limit_values_t *values) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!values) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (values->size - amount > 0) { - return private_f_limit_values_resize(values->size - amount, values); - } - - return private_f_limit_values_delete(values); - } -#endif // _di_f_limit_values_decrease_by_ - -#ifndef _di_f_limit_values_delete_ - f_return_status f_limit_values_delete(f_limit_values_t *values) { - #ifndef _di_level_0_parameter_checking_ - if (!values) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_limit_values_delete(values); - } -#endif // _di_f_limit_values_delete_ - -#ifndef _di_f_limit_values_increase_ - f_return_status f_limit_values_increase(f_limit_values_t *values) { - #ifndef _di_level_0_parameter_checking_ - if (!values) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (values->used + 1 > values->size) { - f_array_length_t size = values->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (values->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_limit_values_resize(size, values); - } - - return F_none; - } -#endif // _di_f_limit_values_increase_ - -#ifndef _di_f_limit_values_increase_by_ - f_return_status f_limit_values_increase_by(const f_array_length_t amount, f_limit_values_t *values) { - #ifndef _di_level_0_parameter_checking_ - if (!values) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (values->used + amount > values->size) { - if (values->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_limit_values_resize(values->used + amount, values); - } - - return F_none; - } -#endif // _di_f_limit_values_increase_by_ - - #ifdef __cplusplus } // extern "C" #endif diff --git a/level_0/f_limit/c/limit.h b/level_0/f_limit/c/limit.h index 5a17766..ff4253e 100644 --- a/level_0/f_limit/c/limit.h +++ b/level_0/f_limit/c/limit.h @@ -22,7 +22,7 @@ #include #include -// fll-1 control includes +// fll-0 control includes #include #ifdef __cplusplus @@ -56,205 +56,9 @@ extern "C" { * @see prlimit() */ #ifndef _di_f_limit_process_ - extern f_return_status f_limit_process(const pid_t id, const int type, const f_limit_value_t *value_next, f_limit_value_t *value_current); + extern f_status_t f_limit_process(const pid_t id, const int type, const f_limit_value_t *value_next, f_limit_value_t *value_current); #endif // _di_f_limit_process_ -/** - * Resize the sets array 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 sets - * The string array 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_f_limit_sets_decrease_ - extern f_return_status f_limit_sets_decrease(f_limit_sets_t *sets); -#endif // _di_f_limit_sets_decrease_ - -/** - * Resize the sets array to a smaller size. - * - * This will resize making the array 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 sets - * The string array 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_f_limit_sets_decrease_by_ - extern f_return_status f_limit_sets_decrease_by(const f_array_length_t amount, f_limit_sets_t *sets); -#endif // _di_f_limit_sets_decrease_by_ - -/** - * Delete the sets array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_limit_sets_delete_ - extern f_return_status f_limit_sets_delete(f_limit_sets_t *sets); -#endif // _di_f_limit_sets_delete_ - -/** - * Increase the size of the sets 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param sets - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_limit_sets_increase_ - extern f_return_status f_limit_sets_increase(f_limit_sets_t *sets); -#endif // _di_f_limit_sets_increase_ - -/** - * Resize the sets array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param sets - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_limit_sets_increase_by_ - extern f_return_status f_limit_sets_increase_by(const f_array_length_t amount, f_limit_sets_t *sets); -#endif // _di_f_limit_sets_increase_by_ - -/** - * Resize the values array 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 values - * The string array 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_f_limit_values_decrease_ - extern f_return_status f_limit_values_decrease(f_limit_values_t *values); -#endif // _di_f_limit_values_decrease_ - -/** - * Resize the values array to a smaller size. - * - * This will resize making the array 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 values - * The string array 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_f_limit_values_decrease_by_ - extern f_return_status f_limit_values_decrease_by(const f_array_length_t amount, f_limit_values_t *values); -#endif // _di_f_limit_values_decrease_by_ - -/** - * Delete the values array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_limit_values_delete_ - extern f_return_status f_limit_values_delete(f_limit_values_t *values); -#endif // _di_f_limit_values_delete_ - -/** - * Increase the size of the values 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param values - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_limit_values_increase_ - extern f_return_status f_limit_values_increase(f_limit_values_t *values); -#endif // _di_f_limit_values_increase_ - -/** - * Resize the values array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param values - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_limit_values_increase_by_ - extern f_return_status f_limit_values_increase_by(const f_array_length_t amount, f_limit_values_t *values); -#endif // _di_f_limit_values_increase_by_ - #ifdef __cplusplus } // extern "C" #endif diff --git a/level_0/f_limit/c/private-limit.c b/level_0/f_limit/c/private-limit.c deleted file mode 100644 index 8a48b18..0000000 --- a/level_0/f_limit/c/private-limit.c +++ /dev/null @@ -1,50 +0,0 @@ -#include "limit.h" -#include "private-limit.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#if !defined(_di_f_limit_sets_decrease_) || !defined(_di_f_limit_sets_decrease_by_) || !defined(_di_f_limit_sets_delete_) - f_return_status private_f_limit_sets_delete(f_limit_sets_t *sets) { - f_status_t status = F_none; - - f_macro_limit_sets_t_delete(status, (*sets)); - - return status; - } -#endif // !defined(_di_f_limit_sets_decrease_) || !defined(_di_f_limit_sets_decrease_by_) || !defined(_di_f_limit_sets_delete_) - -#if !defined(_di_f_limit_sets_decrease_) || !defined(_di_f_limit_sets_decrease_by_) || !defined(_di_f_limit_sets_increase_) || !defined(_di_f_limit_sets_increase_by_) - f_return_status private_f_limit_sets_resize(const f_array_length_t length, f_limit_sets_t *sets) { - f_status_t status = F_none; - - f_macro_limit_sets_t_resize(status, (*sets), length); - - return status; - } -#endif // !defined(_di_f_limit_sets_decrease_) || !defined(_di_f_limit_sets_decrease_by_) || !defined(_di_f_limit_sets_increase_) || !defined(_di_f_limit_sets_increase_by_) - -#if !defined(_di_f_limit_values_decrease_) || !defined(_di_f_limit_values_decrease_by_) || !defined(_di_f_limit_values_delete_) - f_return_status private_f_limit_values_delete(f_limit_values_t *values) { - f_status_t status = F_none; - - f_macro_limit_values_t_delete(status, (*values)); - - return status; - } -#endif // !defined(_di_f_limit_values_decrease_) || !defined(_di_f_limit_values_decrease_by_) || !defined(_di_f_limit_values_delete_) - -#if !defined(_di_f_limit_values_decrease_) || !defined(_di_f_limit_values_decrease_by_) || !defined(_di_f_limit_values_increase_) || !defined(_di_f_limit_values_increase_by_) - f_return_status private_f_limit_values_resize(const f_array_length_t length, f_limit_values_t *values) { - f_status_t status = F_none; - - f_macro_limit_values_t_resize(status, (*values), length); - - return status; - } -#endif // !defined(_di_f_limit_values_decrease_) || !defined(_di_f_limit_values_decrease_by_) || !defined(_di_f_limit_values_increase_) || !defined(_di_f_limit_values_increase_by_) - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_limit/c/private-limit.h b/level_0/f_limit/c/private-limit.h deleted file mode 100644 index b60b7a5..0000000 --- a/level_0/f_limit/c/private-limit.h +++ /dev/null @@ -1,116 +0,0 @@ -/** - * FLL - Level 0 - * - * Project: Limit - * 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_F_limit_h -#define _PRIVATE_F_limit_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Private implementation of f_limit_sets_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param sets - * The sets to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_limit_sets_t_delete(). - * - * @see f_macro_limit_sets_t_delete() - * @see f_limit_sets_decrease() - * @see f_limit_sets_decrease_by() - * @see f_limit_sets_delete() - */ -#if !defined(_di_f_limit_sets_decrease_) || !defined(_di_f_limit_sets_decrease_by_) || !defined(_di_f_limit_sets_delete_) - extern f_return_status private_f_limit_sets_delete(f_limit_sets_t *sets) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_limit_sets_decrease_) || !defined(_di_f_limit_sets_decrease_by_) || !defined(_di_f_limit_sets_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param sets - * The sets to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_limit_sets_t_resize(). - * - * @see f_macro_limit_sets_t_resize() - * @see f_limit_sets_decrease() - * @see f_limit_sets_decrease_by() - * @see f_limit_sets_increase() - * @see f_limit_sets_increase_by() - */ -#if !defined(_di_f_limit_sets_decrease_) || !defined(_di_f_limit_sets_decrease_by_) || !defined(_di_f_limit_sets_increase_) || !defined(_di_f_limit_sets_increase_by_) - extern f_return_status private_f_limit_sets_resize(const f_array_length_t length, f_limit_sets_t *sets) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_limit_sets_decrease_) || !defined(_di_f_limit_sets_decrease_by_) || !defined(_di_f_limit_sets_increase_) || !defined(_di_f_limit_sets_increase_by_) - -/** - * Private implementation of f_limit_values_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param values - * The values to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_limit_values_t_delete(). - * - * @see f_macro_limit_values_t_delete() - * @see f_limit_values_decrease() - * @see f_limit_values_decrease_by() - * @see f_limit_values_delete() - */ -#if !defined(_di_f_limit_values_decrease_) || !defined(_di_f_limit_values_decrease_by_) || !defined(_di_f_limit_values_delete_) - extern f_return_status private_f_limit_values_delete(f_limit_values_t *values) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_limit_values_decrease_) || !defined(_di_f_limit_values_decrease_by_) || !defined(_di_f_limit_values_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param values - * The values to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_limit_values_t_resize(). - * - * @see f_macro_limit_values_t_resize() - * @see f_limit_values_decrease() - * @see f_limit_values_decrease_by() - * @see f_limit_values_increase() - * @see f_limit_values_increase_by() - */ -#if !defined(_di_f_limit_values_decrease_) || !defined(_di_f_limit_values_decrease_by_) || !defined(_di_f_limit_values_increase_) || !defined(_di_f_limit_values_increase_by_) - extern f_return_status private_f_limit_values_resize(const f_array_length_t length, f_limit_values_t *values) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_limit_values_decrease_) || !defined(_di_f_limit_values_decrease_by_) || !defined(_di_f_limit_values_increase_) || !defined(_di_f_limit_values_increase_by_) - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _PRIVATE_F_limit_h diff --git a/level_0/f_limit/data/build/settings b/level_0/f_limit/data/build/settings index 5e95afa..19d24d3 100644 --- a/level_0/f_limit/data/build/settings +++ b/level_0/f_limit/data/build/settings @@ -20,7 +20,7 @@ build_indexer ar build_language c build_libraries -lc build_libraries-individual -lf_memory -build_sources_library limit.c private-limit.c +build_sources_library limit.c build_sources_program build_sources_headers limit.h limit-common.h build_sources_script diff --git a/level_0/f_memory/c/memory-common.h b/level_0/f_memory/c/memory-common.h new file mode 100644 index 0000000..3d8f9ce --- /dev/null +++ b/level_0/f_memory/c/memory-common.h @@ -0,0 +1,433 @@ +/** + * FLL - Level 0 + * + * Project: Memory + * API Version: 0.5 + * Licenses: lgplv2.1 + * + * Defines iki common data. + * + * This is auto-included by memory.h and should not need to be explicitly included. + */ +#ifndef _F_memory_common_h +#define _F_memory_common_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Provide defines to alter compile time uses of certain memory functions. + * + * These are not intended as macros but are instead intended as a tool to automatically replace one function call with another (via the macro). + * + * If _f_memory_FORCE_secure_memory_ is defined, then all to-be removed address spaces are set to 0 before freeing or resizing. + * If _f_memory_FORCE_fast_memory_ is defined, then all to-be removed address spaces remain unchanged before freeing or resizing. + */ +#ifdef _f_memory_FORCE_secure_memory_ + #define f_memory_delete(the_pointer, the_size, the_length) f_memory_destroy(the_pointer, the_size, the_length) + #define f_memory_resize(the_pointer, the_size, the_old_length, the_new_length) f_memory_adjust(the_pointer, the_size, the_old_length, the_new_length) + + #ifdef _f_memory_FORCE_fast_memory_ + #error You cannot define both _f_memory_FORCE_fast_memory_ and _f_memory_FORCE_secure_memory_ at the same time + #endif // _f_memory_FORCE_fast_memory_ +#endif // _f_memory_FORCE_secure_memory_ + +#ifdef _f_memory_FORCE_fast_memory_ + #define f_memory_destroy(the_pointer, the_size, the_length) f_memory_delete(the_pointer, the_size, the_length) + #define f_memory_adjust(the_pointer, the_size, the_old_length, the_new_length) f_memory_resize(the_pointer, the_size, the_old_length, the_new_length) +#endif // _f_memory_FORCE_fast_memory_ + +/** + * Default allocation step. + * + * Everytime some array needs a single new element, reallocated by this amount. + * + * Normally, this should be small, but when a large number of singular allocations are made, the overhead can be reduced by not having to reallocate space as often. + * The problem then is that the more space allocated beyond what is initially needed will waste precious memory. + * Change this if you know your application can afford to reduce the allocation overhead at the cost of more memory. + * + * Other projects may provide their own values. + */ +#ifndef _di_f_memory_default_allocation_step_ + #define f_memory_default_allocation_step 4 +#endif // _di_f_memory_default_allocation_step_ + +/** + * Adjust a generic memory structure. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + * length: the new size of the array. + */ +#ifndef _di_f_macro_memory_structure_t_adjust_ + #define f_macro_memory_structure_t_adjust(status, structure, type, length) \ + status = f_memory_structure_adjust(length, sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_t_adjust_ + +/** + * Reset a generic memory stucture to 0 (clear all values). + * + * This does not deallocate memory, be certain that memory is not allocated before calling this to avoid potential memory leaks. + * + * structure: the structure to operate on. + */ +#ifndef _di_f_macro_memory_structure_t_clear_ + #define f_macro_memory_structure_t_clear(structure) \ + structure.array = 0; \ + structure.size = 0; \ + structure.used = 0; +#endif // _di_f_macro_memory_structure_t_clear_ + +/** + * Decimate a generic memory structure. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + */ +#ifndef _di_f_macro_memory_structure_decimate_ + #define f_macro_memory_structure_decimate(status, structure, type) \ + status = f_memory_structure_decimate(sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_decimate_ + +/** + * Decimate a generic memory structure by some amount. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + * amount: the amount to decimate the size of the array by. + */ +#ifndef _di_f_macro_memory_structure_decimate_by_ + #define f_macro_memory_structure_decimate_by(status, structure, type, amount) \ + status = f_memory_structure_decimate_by(amount, sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_decimate_by_ + +/** + * Decrease a generic memory structure. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + */ +#ifndef _di_f_macro_memory_structure_decrease_ + #define f_macro_memory_structure_decrease(status, structure, type) \ + status = f_memory_structure_decrease(sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_decrease_ + +/** + * Decrease a generic memory structure by some amount. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + * amount: the amount to decrease the size of the array by. + */ +#ifndef _di_f_macro_memory_structure_decrease_by_ + #define f_macro_memory_structure_decrease_by(status, structure, type, amount) \ + status = f_memory_structure_decrease_by(amount, sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_decrease_by_ + +/** + * Delete a generic memory structure. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + */ +#ifndef _di_f_macro_memory_structure_t_delete_ + #define f_macro_memory_structure_t_delete(status, structure, type) \ + status = f_memory_structure_delete(sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_t_delete_ + +/** + * Delete a generic memory structure. + * + * structure: the structure to operate on. + * type: the structure type. + */ +#ifndef _di_f_macro_memory_structure_t_delete_simple_ + #define f_macro_memory_structure_t_delete_simple(structure, type) \ + f_memory_structure_delete(sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_t_delete_simple_ + +/** + * Destroy a generic memory structure. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + */ +#ifndef _di_f_macro_memory_structure_destroy_ + #define f_macro_memory_structure_t_destroy(status, structure, type) \ + status = f_memory_structure_destroy(sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_destroy_ + +/** + * Destroy a generic memory structure. + * + * structure: the structure to operate on. + * type: the structure type. + */ +#ifndef _di_f_macro_memory_structure_t_destroy_simple_ + #define f_macro_memory_structure_t_destroy_simple(structure, type) \ + f_memory_structure_destroy(sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_t_destroy_simple_ + +/** + * Increase a generic memory structure. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + */ +#ifndef _di_f_macro_memory_structure_increase_ + #define f_macro_memory_structure_increase(status, structure, type) \ + status = f_memory_structure_increase(sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_increase_ + +/** + * Increase a generic memory structure by some amount. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + * amount: the amount to increase the size of the array by. + */ +#ifndef _di_f_macro_memory_structure_increase_by_ + #define f_macro_memory_structure_increase_by(status, structure, type, amount) \ + status = f_memory_structure_increase_by(amount, sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_increase_by_ + +/** + * Create a new generic memory structure. + * + * This does not deallocate memory, be certain that memory is not allocated before calling this to avoid potential memory leaks. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + * length: the new size of the array. + */ +#ifndef _di_f_macro_memory_structure_t_new_ + #define f_macro_memory_structure_t_new(status, structure, type, length) \ + status = f_memory_structure_new(length, sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_t_new_ + +/** + * Resize a generic memory structure. + * + * status: the status to return. + * structure: the structure to operate on. + * type: the structure type. + * length: the new size of the array. + */ +#ifndef _di_f_macro_memory_structure_t_resize_ + #define f_macro_memory_structure_t_resize(status, structure, type, length) \ + status = f_memory_structure_resize(length, sizeof(type), (void **) &structure.array, &structure.used, &structure.size); +#endif // _di_f_macro_memory_structure_t_resize_ + +/** + * Reset a generic memory stuctures to 0 (clear all values). + * + * This does not deallocate memory, be certain that memory is not allocated before calling this to avoid potential memory leaks. + * + * structures: the structures to operate on. + */ +#ifndef _di_f_macro_memory_structures_clear_ + #define f_macro_memory_structures_t_clear(structures) \ + structures.array = 0; \ + structures.size = 0; \ + structures.used = 0; +#endif // _di_f_macro_memory_structures_clear_ + +/** + * Create a new generic memory structures. + * + * This does not deallocate memory, be certain that memory is not allocated before calling this to avoid potential memory leaks. + * + * status: the status to return. + * structures: the structures to operate on. + * type_stuctures: the structures type. + * length: the new size of the array. + */ +#ifndef _di_f_macro_memory_structures_new_ + #define f_macro_memory_structures_t_new(status, structures, type_structures, length) \ + f_macro_memory_structures_t_clear(structures) \ + status = f_memory_new((void **) & structures.array, sizeof(type_structures), length); \ + if (status == F_none) { \ + structures.size = length; \ + structures.used = 0; \ + } +#endif // _di_f_macro_memory_structures_new_ + +/** + * Delete a generic memory structures. + * + * status: the status to return. + * structures: the structures to operate on. + * type_stucture: the structure type. + * type_stuctures: the structures type. + */ +#ifndef _di_f_macro_memory_structures_delete_ + #define f_macro_memory_structures_t_delete(status, structures, type_structure, type_structures) \ + status = F_none; \ + structures.used = structures.size; \ + while (structures.used) { \ + structures.used--; \ + f_macro_memory_structure_t_delete(status, structures.array[structures.used], type_structure); \ + if (status != F_none) break; \ + } \ + if (status == F_none) status = f_memory_delete((void **) & structures.array, sizeof(type_structures), structures.size); \ + if (status == F_none) structures.size = 0; +#endif // _di_f_macro_memory_structures_delete_ + +/** + * Destroy a generic memory structures. + * + * status: the status to return. + * structures: the structures to operate on. + * type_stucture: the structure type. + * type_stuctures: the structures type. + */ +#ifndef _di_f_macro_memory_structures_destroy_ + #define f_macro_memory_structures_t_destroy(status, structures, type_structure, type_structures) \ + status = F_none; \ + structures.used = structures.size; \ + while (structures.used) { \ + structures.used--; \ + f_macro_memory_structure_t_destroy(status, structures.array[structures.used], type_structure); \ + if (status != F_none) break; \ + } \ + if (status == F_none) status = f_memory_destroy((void **) & structures.array, sizeof(type_structures), structures.size); \ + if (status == F_none) structures.size = 0; +#endif // _di_f_macro_memory_structures_destroy_ + +/** + * Delete a generic memory structures. + * + * structures: the structures to operate on. + * type_stucture: the structure type. + * type_stuctures: the structures type. + */ +#ifndef _di_f_macro_memory_structures_delete_simple_ + #define f_macro_memory_structures_t_delete_simple(structures, type_structure, type_structures) \ + structures.used = structures.size; \ + while (structures.used) { \ + structures.used--; \ + f_macro_memory_structure_t_delete_simple(structures.array[structures.used], type_structure); \ + } \ + f_memory_delete((void **) & structures.array, sizeof(type_structures), structures.size); \ + structures.size = 0; +#endif // _di_f_macro_memory_structures_delete_simple_ + +/** + * Destroy a generic memory structures. + * + * structures: the structures to operate on. + * type_stucture: the structure type. + * type_stuctures: the structures type. + */ +#ifndef _di_f_macro_memory_structures_destroy_simple_ + #define f_macro_memory_structures_t_destroy_simple(structures, type_structure, type_structures) \ + structures.used = structures.size; \ + while (structures.used) { \ + structures.used--; \ + f_macro_memory_structure_t_destroy_simple(structures.array[structures.used], type_structure); \ + } \ + f_memory_destroy((void **) & structures.array, sizeof(type_structures), structures.size); \ + structures.size = 0; +#endif // _di_f_macro_memory_structures_destroy_simple_ + +/** + * Resize a generic memory structures. + * + * status: the status to return. + * structures: the structures to operate on. + * type_stucture: the structure type. + * type_stuctures: the structures type. + * new_length: the new size of the array. + * length_variable: the data type of the length variable. + */ +#ifndef _di_f_macro_memory_structures_resize_ + #define f_macro_memory_structures_t_resize(status, structures, type_structure, type_structures, new_length, length_variable) \ + status = F_none; \ + if (new_length < structures.size) { \ + for (length_variable _macro__i = structures.size - new_length; _macro__i < structures.size; _macro__i++) { \ + f_macro_memory_structure_t_delete(status, structures.array[_macro__i], type_structure); \ + if (status != F_none) break; \ + } \ + } \ + if (status == F_none) status = f_memory_resize((void **) & structures.array, sizeof(type_structures), structures.size, new_length); \ + if (status == F_none) { \ + structures.size = new_length; \ + if (structures.used > structures.size) structures.used = new_length; \ + } +#endif // _di_f_macro_memory_structures_resize_ + +/** + * Adjust a generic memory structures. + * + * status: the status to return. + * structures: the structures to operate on. + * type_stucture: the structure type. + * type_stuctures: the structures type. + * new_length: the new size of the array. + * length_variable: the data type of the length variable. + */ +#ifndef _di_f_macro_memory_structures_adjust_ + #define f_macro_memory_structures_t_adjust(status, structures, type_structure, type_structures, new_length, length_variable) \ + status = F_none; \ + if (new_length < structures.size) { \ + for (length_variable _macro__i = structures.size - new_length; _macro__i < structures.size; _macro__i++) { \ + f_macro_memory_structure_t_destroy(status, structures.array[_macro__i], type_structure); \ + if (status != F_none) break; \ + } \ + } \ + if (status == F_none) status = f_memory_adjust((void **) & structures.array, sizeof(type_structures), structures.size, new_length); \ + if (status == F_none) { \ + structures.size = new_length; \ + if (structures.used > structures.size) structures.used = new_length; \ + } +#endif // _di_f_macro_memory_structures_adjust_ + +/** + * Provide a macro for calling other macros for incrementing a buffer. + * + * If the used + step is greater than size, then increase by step_default. + * If step_default exceeds f_array_length_t_size, then attempt to increment by step. + * If step exceeds f_array_length_t_size, set status to error_too_large. + * + * Be sure to check size for error after calling this. + * + * status: the status to return. + * structures: the structures to operate on. + * step: the step to increase by, must be less than or equal to step_default. + * step_default: the default step to increase by if memory allows. + * macro_resize: the resize structure macro to call that excepts the exact arguments: (status, structure, new_length). + * error_too_large: the error status to return when f_array_length_t_size would be exceeded. + */ +#ifndef _di_f_macro_memory_structure_macro_increment_ + #define f_macro_memory_structure_macro_increment(status, structure, step, step_default, macro_resize, error_too_large) \ + if (structure.used + step > structure.size) { \ + if (structure.used + step_default > f_array_length_t_size) { \ + if (structure.used + step > f_array_length_t_size) { \ + status = F_status_set_error(error_too_large); \ + } \ + else { \ + macro_resize(status, structure, structure.used + step); \ + } \ + } \ + else { \ + macro_resize(status, structure, structure.size + step_default); \ + } \ + } +#endif // _di_f_macro_memory_structure_macro_increment_ + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _F_memory_common_h diff --git a/level_0/f_memory/c/memory.c b/level_0/f_memory/c/memory.c index ccd5915..7495ff1 100644 --- a/level_0/f_memory/c/memory.c +++ b/level_0/f_memory/c/memory.c @@ -1,39 +1,29 @@ #include "memory.h" +#include "private-memory.h" #ifdef __cplusplus extern "C" { #endif -#ifndef _di_f_memory_new_ - f_return_status f_memory_new(void **pointer, const size_t size, const size_t length) { +#ifndef _di_f_memory_adjust_ + f_status_t f_memory_adjust(void **pointer, const size_t size, const size_t old_length, const size_t new_length) { #ifndef _di_level_0_parameter_checking_ if (size <= 0) return F_status_set_error(F_parameter); - if (length <= 0) return F_status_set_error(F_parameter); + if (old_length < 0) return F_status_set_error(F_parameter); + if (new_length < 0) return F_status_set_error(F_parameter); if (!pointer) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - // prevent double-allocations. - if (*pointer || length == 0) return F_none; - - // Some people use malloc(size * length) to produce the same results. - // This has been observed to sometimes causes an increase in L1/L2 cache misses (0.02% L1 increase, 0.01% L2 increase). - *pointer = calloc(length, size); - - if (*pointer) { - - // uint8_t * is of a data size size of 1, casting it to uint8_t should result in a single-length increment. - // this is done to avoid problems with (void *) having arithmetic issues. - memset(((uint8_t *) *pointer), 0, size * length); - - return F_none; - } - - return F_status_set_error(F_memory_allocation); + #ifdef _f_memory_FORCE_fast_memory_ + return private_f_memory_resize(old_length, new_length, size, pointer); + #else // _f_memory_FORCE_fast_memory_ + return private_f_memory_adjust(old_length, new_length, size, pointer); + #endif // _f_memory_FORCE_fast_memory_ } -#endif // _di_f_memory_new_ +#endif // _di_f_memory_adjust_ #ifndef _di_f_memory_new_aligned_ - f_return_status f_memory_new_aligned(void **pointer, const size_t alignment, const size_t length) { + f_status_t f_memory_new_aligned(void **pointer, const size_t alignment, const size_t length) { #ifndef _di_level_0_parameter_checking_ if (alignment <= 0) return F_status_set_error(F_parameter); if (length <= 0) return F_status_set_error(F_parameter); @@ -59,8 +49,8 @@ extern "C" { } #endif // _di_f_memory_new_aligned_ -#if !(defined(_di_f_memory_delete_) || defined(_f_memory_FORCE_secure_memory_)) - f_return_status f_memory_delete(void **pointer, const size_t size, const size_t length) { +#ifndef _di_f_memory_delete_ + f_status_t f_memory_delete(void **pointer, const size_t size, const size_t length) { #ifndef _di_level_0_parameter_checking_ if (!pointer) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -68,6 +58,12 @@ extern "C" { // prevent double-frees. if (!*pointer || !size || !length) return F_none; + #ifdef _f_memory_FORCE_secure_memory_ + if (length > 0) { + memset(*pointer, 0, size * length); + } + #endif // _f_memory_FORCE_secure_memory_ + free(*pointer); // it has been deallocated, so reset the pointer. @@ -75,10 +71,10 @@ extern "C" { return F_none; } -#endif // !(defined(_di_f_memory_delete_) || defined(_f_memory_FORCE_secure_memory_)) +#endif // _di_f_memory_delete_ -#if !(defined(_di_f_memory_destroy_) || defined(_f_memory_FORCE_fast_memory_)) - f_return_status f_memory_destroy(void **pointer, const size_t size, const size_t length) { +#ifndef _di_f_memory_destroy_ + f_status_t f_memory_destroy(void **pointer, const size_t size, const size_t length) { #ifndef _di_level_0_parameter_checking_ if (length < 0) return F_status_set_error(F_parameter); if (size <= 0) return F_status_set_error(F_parameter); @@ -88,9 +84,11 @@ extern "C" { // prevent double-frees. if (!*pointer || !length) return F_none; - if (length > 0) { - memset(*pointer, 0, size * length); - } + #ifndef _f_memory_FORCE_fast_memory_ + if (length > 0) { + memset(*pointer, 0, size * length); + } + #endif // _f_memory_FORCE_fast_memory_ free(*pointer); @@ -99,67 +97,38 @@ extern "C" { return F_none; } -#endif // !(defined(_di_f_memory_destroy_) || defined(_f_memory_FORCE_fast_memory_)) +#endif // _di_f_memory_destroy_ -#if !(defined(_di_f_memory_resize_) || defined(_f_memory_FORCE_secure_memory_)) - f_return_status f_memory_resize(void **pointer, const size_t size, const size_t old_length, const size_t new_length) { +#ifndef _di_f_memory_new_ + f_status_t f_memory_new(void **pointer, const size_t size, const size_t length) { #ifndef _di_level_0_parameter_checking_ if (size <= 0) return F_status_set_error(F_parameter); - if (old_length < 0) return F_status_set_error(F_parameter); - if (new_length < 0) return F_status_set_error(F_parameter); + if (length <= 0) return F_status_set_error(F_parameter); if (!pointer) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - // don't be wasteful. - if (old_length == new_length) return F_none; - - if (*pointer) { - void *new_pointer = 0; - - // allocate new space - if (new_length > 0) { - new_pointer = realloc(*pointer, size * new_length); - } - else { - free(*pointer); - - // it has been deallocated, so reset the pointer - *pointer = 0; - - return F_none; - } + // prevent double-allocations. + if (*pointer || length == 0) return F_none; - if (new_pointer) { - if (new_pointer != *pointer) { - if (new_length > old_length) { - // uint8_t * is of a data size size of 1, casting it to uint8_t should result in a single-length increment. - // this is done to avoid problems with (void *) having arithmetic issues. - memset(((uint8_t *) new_pointer) + (size * old_length), 0, size * (new_length - old_length)); - } + // Some people use malloc(size * length) to produce the same results. + // This has been observed to sometimes causes an increase in L1/L2 cache misses (0.02% L1 increase, 0.01% L2 increase). + *pointer = calloc(length, size); - *pointer = new_pointer; - } + if (*pointer) { - return F_none; - } - } - else if (new_length > 0) { - *pointer = calloc(size, new_length); + // uint8_t * is of a data size size of 1, casting it to uint8_t should result in a single-length increment. + // this is done to avoid problems with (void *) having arithmetic issues. + memset(((uint8_t *) *pointer), 0, size * length); - if (*pointer) { - return F_none; - } - } - else { return F_none; } - return F_status_set_error(F_memory_reallocation); + return F_status_set_error(F_memory_allocation); } -#endif // !(defined(_di_f_memory_resize_) || defined(_f_memory_FORCE_secure_memory_)) +#endif // _di_f_memory_new_ -#if !(defined(_di_f_memory_adjust_) || defined(_f_memory_FORCE_fast_memory_)) - f_return_status f_memory_adjust(void **pointer, const size_t size, const size_t old_length, const size_t new_length) { +#ifndef _di_f_memory_resize_ + f_status_t f_memory_resize(void **pointer, const size_t size, const size_t old_length, const size_t new_length) { #ifndef _di_level_0_parameter_checking_ if (size <= 0) return F_status_set_error(F_parameter); if (old_length < 0) return F_status_set_error(F_parameter); @@ -167,61 +136,13 @@ extern "C" { if (!pointer) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ - // don't be wasteful - if (old_length == new_length) return F_none; - - if (*pointer) { - void *new_pointer = 0; - - if (old_length > 0) { - if (new_length < old_length) { - // uint8_t * is of a data size size of 1, casting it to uint8_t should result in a single-length increment. - // this is done to avoid problems with (void *) having arithmetic issues. - memset(((uint8_t *) *pointer) + new_length, 0, size * (old_length - new_length)); - } - } - - // allocate new space. - if (new_length > 0) { - new_pointer = realloc(*pointer, size * new_length); - } - else { - free(*pointer); - - // it has been deallocated, so reset the pointer - *pointer = 0; - - return F_none; - } - - if (new_pointer) { - if (new_pointer != *pointer) { - if (new_length > old_length) { - // uint8_t * is of a data size size of 1, casting it to bool should result in a single-length increment. - // this is done to avoid problems with (void *) having arithmetic issues. - memset(((uint8_t *) new_pointer) + (size * old_length), 0, size * (new_length - old_length)); - } - - *pointer = new_pointer; - } - - return F_none; - } - } - else if (new_length > 0) { - *pointer = calloc(size, new_length); - - if (*pointer) { - return F_none; - } - } - else { - return F_none; - } - - return F_status_set_error(F_memory_reallocation); + #ifdef _f_memory_FORCE_secure_memory_ + return private_f_memory_adjust(old_length, new_length, size, pointer); + #else // _f_memory_FORCE_secure_memory_ + return private_f_memory_resize(old_length, new_length, size, pointer); + #endif // _f_memory_FORCE_secure_memory_ } -#endif // !(defined(_di_f_memory_adjust_) || defined(_f_memory_FORCE_fast_memory_)) +#endif // _di_f_memory_resize_ #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_memory/c/memory.h b/level_0/f_memory/c/memory.h index 37f95b9..dc938f0 100644 --- a/level_0/f_memory/c/memory.h +++ b/level_0/f_memory/c/memory.h @@ -21,9 +21,11 @@ // fll-0 includes #include +#include #include // fll-0 memory includes +#include #include #ifdef __cplusplus @@ -31,65 +33,31 @@ extern "C" { #endif /** - * Provide defines to alter compile time uses of certain memory functions. - * - * These are not intended as macros but are instead intended as a tool to automatically replace one function call with another (via the macro). - * - * If _f_memory_FORCE_secure_memory_ is defined, then memory operations are all set to be removed address spaces to 0 before freeing or resizing. - * If _f_memory_FORCE_fast_memory_ is defined, then memory operations are all set to not set to be removed address spaces to 0 before freeing or resizing. - */ -#ifdef _f_memory_FORCE_secure_memory_ - #define f_memory_delete(the_pointer, the_type, the_length) f_memory_destroy(the_pointer, the_type, the_length) - #define f_memory_resize(the_pointer, the_type, the_old_length, the_new_length) f_memory_adjust(the_pointer, the_type, the_old_length, the_new_length) - - #ifdef _f_memory_FORCE_fast_memory_ - #error You cannot define both _f_memory_FORCE_fast_memory_ and _f_memory_FORCE_secure_memory_ at the same time - #endif // _f_memory_FORCE_fast_memory_ -#endif // _f_memory_FORCE_secure_memory_ - -#ifdef _f_memory_FORCE_fast_memory_ - #define f_memory_destroy(the_pointer, the_type, the_length) f_memory_delete(the_pointer, the_type, the_length) - #define f_memory_adjust(the_pointer, the_type, the_old_length, the_new_length) f_memory_resize(the_pointer, the_type, the_old_length, the_new_length) -#endif // _f_memory_FORCE_fast_memory_ - -/** - * Default allocation step. - * - * Everytime some array needs a single new element, reallocated by this amount. - * - * Normally, this should be small, but when a large number of singular allocations are made, the overhead can be reduced by not having to reallocate space as often. - * The problem then is that the more space allocated beyond what is initially needed will waste precious memory. - * Change this if you know your application can afford to reduce the allocation overhead at the cost of more memory. + * Securely resize dynamically allocated data. * - * Other projects may provide their own values. - */ -#ifndef _di_f_memory_default_allocation_step_ - #define f_memory_default_allocation_step 4 -#endif // _di_f_memory_default_allocation_step_ - -/** - * Create some dynamically allocated array of some length. + * Will change all data to 0 prior to deallocation. * * @param pointer - * A pointer that will be updated to the address of the newly allocated memory. + * A pointer to the address that will be resized. * @param size * The block size, in bytes (size * length = allocated size). - * Must be greater than 0. - * @param length - * The total number of blocks to be allocated. - * Must be greater than 0. + * @param old_length + * The total number of blocks representing the length to be resized from. + * @param new_length + * The total number of blocks representing the length to be resized to. * * @return * F_none on success. - * F_memory_allocation (with error bit) on allocation error. + * F_memory_reallocation (with error bit) on reallocation error. * F_parameter (with error bit) if a parameter is invalid. * * @see calloc() * @see memset() + * @see realloc() */ -#ifndef _di_f_memory_new_ - extern f_return_status f_memory_new(void **pointer, const size_t size, const size_t length); -#endif // _di_f_memory_new_ +#ifndef _di_f_memory_adjust_ + extern f_status_t f_memory_adjust(void **pointer, const size_t size, const size_t old_length, const size_t new_length); +#endif // _di_f_memory_adjust_ /** * Create some dynamically allocated array of some length, guaranteeing aligned memory. @@ -113,7 +81,7 @@ extern "C" { * @see memset() */ #ifndef _di_f_memory_new_aligned_ - extern f_return_status f_memory_new_aligned(void **pointer, const size_t alignment, const size_t length); + extern f_status_t f_memory_new_aligned(void **pointer, const size_t alignment, const size_t length); #endif // _di_f_memory_new_aligned_ /** @@ -138,9 +106,9 @@ extern "C" { * * @see free() */ -#if !(defined(_di_f_memory_delete_) || defined(_f_memory_FORCE_secure_memory_)) - extern f_return_status f_memory_delete(void **pointer, const size_t size, const size_t length); -#endif // !(defined(_di_f_memory_delete_) || defined(_f_memory_FORCE_secure_memory_)) +#ifndef _di_f_memory_delete_ + extern f_status_t f_memory_delete(void **pointer, const size_t size, const size_t length); +#endif // _di_f_memory_delete_ /** * Securely deletes some dynamically allocated data. @@ -163,41 +131,38 @@ extern "C" { * @see free() * @see memset() */ -#if !(defined(_di_f_memory_destroy_) || defined(_f_memory_FORCE_fast_memory_)) - extern f_return_status f_memory_destroy(void **pointer, const size_t size, const size_t length); -#endif // !(defined(_di_f_memory_destroy_) || defined(_f_memory_FORCE_fast_memory_)) +#ifndef _di_f_memory_destroy_ + extern f_status_t f_memory_destroy(void **pointer, const size_t size, const size_t length); +#endif // _di_f_memory_destroy_ /** - * Resize dynamically allocated data. - * - * Will not change any of the data prior to deallocation. + * Create some dynamically allocated array of some length. * * @param pointer - * A pointer to the address that will be resized. + * A pointer that will be updated to the address of the newly allocated memory. * @param size * The block size, in bytes (size * length = allocated size). - * @param old_length - * The total number of blocks representing the length to be resized from. - * @param new_length - * The total number of blocks representing the length to be resized to. + * Must be greater than 0. + * @param length + * The total number of blocks to be allocated. + * Must be greater than 0. * * @return * F_none on success. - * F_memory_reallocation (with error bit) on reallocation error. + * F_memory_allocation (with error bit) on allocation error. * F_parameter (with error bit) if a parameter is invalid. * * @see calloc() * @see memset() - * @see realloc() */ -#if !(defined(_di_f_memory_resize_) || defined(_f_memory_FORCE_secure_memory_)) - extern f_return_status f_memory_resize(void **pointer, const size_t size, const size_t old_length, const size_t new_length); -#endif // !(defined(_di_f_memory_resize_) || defined(_f_memory_FORCE_secure_memory_)) +#ifndef _di_f_memory_new_ + extern f_status_t f_memory_new(void **pointer, const size_t size, const size_t length); +#endif // _di_f_memory_new_ /** - * Securely resize dynamically allocated data. + * Resize dynamically allocated data. * - * Will change all data to 0 prior to deallocation. + * Will not change any of the data prior to deallocation. * * @param pointer * A pointer to the address that will be resized. @@ -217,9 +182,9 @@ extern "C" { * @see memset() * @see realloc() */ -#if !(defined(_di_f_memory_adjust_) || defined(_f_memory_FORCE_fast_memory_)) - extern f_return_status f_memory_adjust(void **pointer, const size_t size, const size_t old_length, const size_t new_length); -#endif // _di_f_memory_adjust_ +#ifndef _di_f_memory_resize_ + extern f_status_t f_memory_resize(void **pointer, const size_t size, const size_t old_length, const size_t new_length); +#endif // _di_f_memory_resize_ #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_memory/c/memory_structure.c b/level_0/f_memory/c/memory_structure.c new file mode 100644 index 0000000..73b1028 --- /dev/null +++ b/level_0/f_memory/c/memory_structure.c @@ -0,0 +1,200 @@ +#include "memory.h" +#include "private-memory.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _di_f_memory_structure_adjust_ + f_status_t f_memory_structure_adjust(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + return private_f_memory_structure_adjust(length_new, type_size, structure, used, size); + } +#endif // _di_f_memory_structure_adjust_ + +#ifndef _di_f_memory_structure_decimate_ + f_status_t f_memory_structure_decimate(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (*size) { + return private_f_memory_structure_adjust(*size - 1, type_size, structure, used, size); + } + + return F_data_not; + } +#endif // _di_f_memory_structure_decimate_ + +#ifndef _di_f_memory_structure_decimate_by_ + f_status_t f_memory_structure_decimate_by(const f_array_length_t amount, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (amount) { + return private_f_memory_structure_adjust(amount <= *size ? *size - amount : 0, type_size, structure, used, size); + } + + return F_data_not; + } +#endif // _di_f_memory_structure_decimate_by_ + +#ifndef _di_f_memory_structure_decrease_ + f_status_t f_memory_structure_decrease(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (*size) { + return private_f_memory_structure_resize(*size - 1, type_size, structure, used, size); + } + + return F_data_not; + } +#endif // _di_f_memory_structure_decrease_ + +#ifndef _di_f_memory_structure_decrease_by_ + f_status_t f_memory_structure_decrease_by(const f_array_length_t amount, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (amount) { + return private_f_memory_structure_resize(amount <= *size ? *size - amount : 0, type_size, structure, used, size); + } + + return F_data_not; + } +#endif // _di_f_memory_structure_decrease_by_ + +#ifndef _di_f_memory_structure_delete_ + f_status_t f_memory_structure_delete(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + return private_f_memory_structure_resize(0, type_size, structure, used, size); + } +#endif // _di_f_memory_structure_delete_ + +#ifndef _di_f_memory_structure_destroy_ + f_status_t f_memory_structure_destroy(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + return private_f_memory_structure_adjust(0, type_size, structure, used, size); + } +#endif // _di_f_memory_structure_destroy_ + +#ifndef _di_f_memory_structure_increase_ + f_status_t f_memory_structure_increase(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (*used + 1 > *size) { + f_array_length_t length_new = *used + f_memory_default_allocation_step; + + if (length_new > f_array_length_t_size) { + if (*used + 1 > f_array_length_t_size) { + return F_status_set_error(F_array_too_large); + } + + length_new = f_array_length_t_size; + } + + return private_f_memory_structure_resize(length_new, type_size, structure, used, size); + } + + return F_none; + } +#endif // _di_f_memory_structure_increase_ + +#ifndef _di_f_memory_structure_increase_by_ + f_status_t f_memory_structure_increase_by(const f_array_length_t amount, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + if (!amount) { + return F_data_not; + } + + if (*used + amount > *size) { + if (*used + amount > f_array_length_t_size) { + return F_status_set_error(F_array_too_large); + } + + return private_f_memory_structure_resize(*used + amount, type_size, structure, used, size); + } + + return F_none; + } +#endif // _di_f_memory_structure_increase_by_ + +#ifndef _di_f_memory_structure_new_ + f_status_t f_memory_structure_new(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!length_new) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + *structure = 0; + *size = 0; + *used = 0; + + return private_f_memory_structure_resize(length_new, type_size, structure, used, size); + } +#endif // _di_f_memory_structure_new_ + +#ifndef _di_f_memory_structure_resize_ + f_status_t f_memory_structure_resize(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + #ifndef _di_level_0_parameter_checking_ + if (!type_size) return F_status_set_error(F_parameter); + if (!structure) return F_status_set_error(F_parameter); + if (!used) return F_status_set_error(F_parameter); + if (!size) return F_status_set_error(F_parameter); + #endif // _di_level_0_parameter_checking_ + + return private_f_memory_structure_resize(length_new, type_size, structure, used, size); + } +#endif // _di_f_memory_structure_resize_ + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_memory/c/memory_structure.h b/level_0/f_memory/c/memory_structure.h index 97f2b8e..4ef8831 100644 --- a/level_0/f_memory/c/memory_structure.h +++ b/level_0/f_memory/c/memory_structure.h @@ -17,327 +17,341 @@ extern "C" { #endif /** - * Reset a generic memory stucture to 0 (clear all values). + * Resize the structure. * - * This does not deallocate memory, be certain that memory is not allocated before calling this to avoid potential memory leaks. + * Memory being deleted will be wiped. * - * structure: the structure to operate on. - */ -#ifndef _di_f_macro_memory_structure_clear_ - #define f_macro_memory_structure_t_clear(structure) \ - structure.array = 0; \ - structure.size = 0; \ - structure.used = 0; -#endif // _di_f_macro_memory_structure_clear_ - -/** - * Create a new generic memory structure. + * @param length_new + * The new size of the structure array. + * Setting a length of 0 will result in the deletion (freeing) of the structure. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. * - * This does not deallocate memory, be certain that memory is not allocated before calling this to avoid potential memory leaks. + * @return + * F_none on success. * - * status: the status to return. - * structure: the structure to operate on. - * type: the structure type. - * length: the new size of the array. - */ -#ifndef _di_f_macro_memory_structure_new_ - #define f_macro_memory_structure_t_new(status, structure, type, length) \ - f_macro_memory_structure_t_clear(structure) \ - status = f_memory_new((void **) & structure.array, sizeof(type), length); \ - if (status == F_none) { \ - structure.size = length; \ - structure.used = 0; \ - } -#endif // _di_f_macro_memory_structure_new_ - -/** - * Delete a generic memory structure. + * F_memory_not (with error bit) on allocation error. * - * status: the status to return. - * structure: the structure to operate on. - * type: the structure type. + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structure_delete_ - #define f_macro_memory_structure_t_delete(status, structure, type) \ - status = f_memory_delete((void **) & structure.array, sizeof(type), structure.size); \ - if (status == F_none) { \ - structure.size = 0; \ - structure.used = 0; \ - } -#endif // _di_f_macro_memory_structure_delete_ +#ifndef _di_f_memory_structure_adjust_ + extern f_status_t f_memory_structure_adjust(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_adjust_ /** - * Destroy a generic memory structure. + * Resize the structure to a smaller size, by 1. * - * status: the status to return. - * structure: the structure to operate on. - * type: the structure type. - */ -#ifndef _di_f_macro_memory_structure_destroy_ - #define f_macro_memory_structure_t_destroy(status, structure, type) \ - status = f_memory_destroy((void **) & structure.array, sizeof(type), structure.size); \ - if (status == F_none) { \ - structure.size = 0; \ - structure.used = 0; \ - } -#endif // _di_f_macro_memory_structure_destroy_ - -/** - * Delete a generic memory structure. + * This will not shrink the size to less than 0. + * Memory being deleted will be wiped. * - * structure: the structure to operate on. - * type: the structure type. - */ -#ifndef _di_f_macro_memory_structure_delete_simple_ - #define f_macro_memory_structure_t_delete_simple(structure, type) \ - f_memory_delete((void **) & structure.array, sizeof(type), structure.size); \ - structure.size = 0; \ - structure.used = 0; -#endif // _di_f_macro_memory_structure_delete_simple_ - -/** - * Destroy a generic memory structure. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. * - * structure: the structure to operate on. - * type: the structure type. - */ -#ifndef _di_f_macro_memory_structure_destroy_simple_ - #define f_macro_memory_structure_t_destroy_simple(structure, type) \ - f_memory_destroy((void **) & structure.array, sizeof(type), structure.size); \ - structure.size = 0; \ - structure.used = 0; -#endif // _di_f_macro_memory_structure_destroy_simple_ - -/** - * Resize a generic memory structure. + * @return + * F_none on success. + * F_data_not on success, but size is already 0 so there is nothing to do. * - * status: the status to return. - * structure: the structure to operate on. - * type: the structure type. - * new_length: the new size of the array. - */ -#ifndef _di_f_macro_memory_structure_resize_ - #define f_macro_memory_structure_t_resize(status, structure, type, new_length) \ - status = f_memory_resize((void **) & structure.array, sizeof(type), structure.size, new_length); \ - if (status == F_none) { \ - structure.size = new_length; \ - if (structure.used > structure.size) structure.used = new_length; \ - } -#endif // _di_f_macro_memory_structure_resize_ - -/** - * Adjust a generic memory structure. + * F_memory_reallocation (with error bit) on allocation error. * - * status: the status to return. - * structure: the structure to operate on. - * type: the structure type. - * new_length: the new size of the array. + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structure_adjust_ - #define f_macro_memory_structure_t_adjust(status, structure, type, new_length) \ - status = f_memory_adjust((void **) & structure.array, sizeof(type), structure.size, new_length); \ - if (status == F_none) { \ - structure.size = new_length; \ - if (structure.used > structure.size) structure.used = new_length; \ - } -#endif // _di_f_macro_memory_structure_adjust_ +#ifndef _di_f_memory_structure_decimate_ + extern f_status_t f_memory_structure_decimate(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_decimate_ /** - * Reset a generic memory stuctures to 0 (clear all values). + * Resize the structure to a smaller size, by the given amount. + * + * This will not shrink the size to less than 0. + * Memory being deleted will be wiped. + * + * @param amount + * A positive number representing how much to decimate the size by. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. * - * This does not deallocate memory, be certain that memory is not allocated before calling this to avoid potential memory leaks. + * @return + * F_none on success. + * F_data_not on success, but amount is 0 so there is nothing to do. * - * structures: the structures to operate on. + * F_memory_reallocation (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structures_clear_ - #define f_macro_memory_structures_t_clear(structures) \ - structures.array = 0; \ - structures.size = 0; \ - structures.used = 0; -#endif // _di_f_macro_memory_structures_clear_ +#ifndef _di_f_memory_structure_decimate_by_ + extern f_status_t f_memory_structure_decimate_by(const f_array_length_t amount, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_decimate_by_ /** - * Create a new generic memory structures. + * Resize the structure to a smaller size, by 1. + * + * This will not shrink the size to less than 0. + * Memory being deleted will not be wiped. + * + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. * - * This does not deallocate memory, be certain that memory is not allocated before calling this to avoid potential memory leaks. + * @return + * F_none on success. + * F_data_not on success, but size is already 0 so there is nothing to do. * - * status: the status to return. - * structures: the structures to operate on. - * type_stuctures: the structures type. - * new_length: the new size of the array. + * F_memory_not (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structures_new_ - #define f_macro_memory_structures_t_new(status, structures, type_structures, new_length) \ - f_macro_memory_structures_t_clear(structures) \ - status = f_memory_new((void **) & structures.array, sizeof(type_structures), new_length); \ - if (status == F_none) { \ - structures.size = new_length; \ - structures.used = 0; \ - } -#endif // _di_f_macro_memory_structures_new_ +#ifndef _di_f_memory_structure_decrease_ + extern f_status_t f_memory_structure_decrease(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_decrease_ /** - * Delete a generic memory structures. + * Resize the structure to a smaller size, by the given amount. + * + * This will not shrink the size to less than 0. + * Memory being deleted will not be wiped. + * + * @param amount + * A positive number representing how much to decrease by. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. * - * status: the status to return. - * structures: the structures to operate on. - * type_stucture: the structure type. - * type_stuctures: the structures type. + * @return + * F_none on success. + * F_data_not on success, but amount is 0 so there is nothing to do. + * + * F_memory_not (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structures_delete_ - #define f_macro_memory_structures_t_delete(status, structures, type_structure, type_structures) \ - status = F_none; \ - structures.used = structures.size; \ - while (structures.used) { \ - structures.used--; \ - f_macro_memory_structure_t_delete(status, structures.array[structures.used], type_structure); \ - if (status != F_none) break; \ - } \ - if (status == F_none) status = f_memory_delete((void **) & structures.array, sizeof(type_structures), structures.size); \ - if (status == F_none) structures.size = 0; -#endif // _di_f_macro_memory_structures_delete_ +#ifndef _di_f_memory_structure_decrease_by_ + extern f_status_t f_memory_structure_decrease_by(const f_array_length_t amount, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_decrease_by_ /** - * Destroy a generic memory structures. + * Delete the structure. + * + * Memory being deleted will not be wiped. + * + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. * - * status: the status to return. - * structures: the structures to operate on. - * type_stucture: the structure type. - * type_stuctures: the structures type. + * @return + * F_none on success. + * F_data_not on success, but amount is 0 so there is nothing to do. + * + * F_memory_not (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structures_destroy_ - #define f_macro_memory_structures_t_destroy(status, structures, type_structure, type_structures) \ - status = F_none; \ - structures.used = structures.size; \ - while (structures.used) { \ - structures.used--; \ - f_macro_memory_structure_t_destroy(status, structures.array[structures.used], type_structure); \ - if (status != F_none) break; \ - } \ - if (status == F_none) status = f_memory_destroy((void **) & structures.array, sizeof(type_structures), structures.size); \ - if (status == F_none) structures.size = 0; -#endif // _di_f_macro_memory_structures_destroy_ +#ifndef _di_f_memory_structure_delete_ + extern f_status_t f_memory_structure_delete(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_delete_ /** - * Delete a generic memory structures. + * Destroy the structure. + * + * Memory being deleted will be wiped. * - * structures: the structures to operate on. - * type_stucture: the structure type. - * type_stuctures: the structures type. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. + * + * @return + * F_none on success. + * F_data_not on success, but amount is 0 so there is nothing to do. + * + * F_memory_not (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structures_delete_simple_ - #define f_macro_memory_structures_t_delete_simple(structures, type_structure, type_structures) \ - structures.used = structures.size; \ - while (structures.used) { \ - structures.used--; \ - f_macro_memory_structure_t_delete_simple(structures.array[structures.used], type_structure); \ - } \ - f_memory_delete((void **) & structures.array, sizeof(type_structures), structures.size); \ - structures.size = 0; -#endif // _di_f_macro_memory_structures_delete_simple_ +#ifndef _di_f_memory_structure_destroy_ + extern f_status_t f_memory_structure_destroy(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_destroy_ /** - * Destroy a generic memory structures. + * Increase the size of the structure, 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). + * If already set to the maximum buffer size, then the resize will fail. + * + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. + * + * @return + * F_none on success. * - * structures: the structures to operate on. - * type_stucture: the structure type. - * type_stuctures: the structures type. + * F_memory_not (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structures_destroy_simple_ - #define f_macro_memory_structures_t_destroy_simple(structures, type_structure, type_structures) \ - structures.used = structures.size; \ - while (structures.used) { \ - structures.used--; \ - f_macro_memory_structure_t_destroy_simple(structures.array[structures.used], type_structure); \ - } \ - f_memory_destroy((void **) & structures.array, sizeof(type_structures), structures.size); \ - structures.size = 0; -#endif // _di_f_macro_memory_structures_destroy_simple_ +#ifndef _di_f_memory_structure_increase_ + extern f_status_t f_memory_structure_increase(const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_increase_ /** - * Resize a generic memory structures. - * - * status: the status to return. - * structures: the structures to operate on. - * type_stucture: the structure type. - * type_stuctures: the structures type. - * new_length: the new size of the array. - * length_variable: the data type of the length variable. + * Resize the structure to a larger size. + * + * This will resize making the array larger based on the given length. + * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). + * If already set to the maximum buffer size, then the resize will fail. + * + * @param amount + * A positive number representing how much to increase the size by. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. + * + * @return + * F_none on success. + * F_data_not on success, but amount is 0 so there is nothing to do. + * + * F_memory_not (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structures_resize_ - #define f_macro_memory_structures_t_resize(status, structures, type_structure, type_structures, new_length, length_variable) \ - status = F_none; \ - if (new_length < structures.size) { \ - for (length_variable _macro__i = structures.size - new_length; _macro__i < structures.size; _macro__i++) { \ - f_macro_memory_structure_t_delete(status, structures.array[_macro__i], type_structure); \ - if (status != F_none) break; \ - } \ - } \ - if (status == F_none) status = f_memory_resize((void **) & structures.array, sizeof(type_structures), structures.size, new_length); \ - if (status == F_none) { \ - structures.size = new_length; \ - if (structures.used > structures.size) structures.used = new_length; \ - } -#endif // _di_f_macro_memory_structures_resize_ +#ifndef _di_f_memory_structure_increase_by_ + extern f_status_t f_memory_structure_increase_by(const f_array_length_t amount, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_increase_by_ /** - * Adjust a generic memory structures. - * - * status: the status to return. - * structures: the structures to operate on. - * type_stucture: the structure type. - * type_stuctures: the structures type. - * new_length: the new size of the array. - * length_variable: the data type of the length variable. + * Initialize a new structure. + * + * The structure will be cleared before making changes. + * Be sure any existing data is deallocation as necessary. + * + * @param length_new + * The new size of the structure array. + * Must be greater than 0. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * Must be greater than 0. + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. + * + * @return + * F_none on success. + * + * F_memory_not (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structures_adjust_ - #define f_macro_memory_structures_t_adjust(status, structures, type_structure, type_structures, new_length, length_variable) \ - status = F_none; \ - if (new_length < structures.size) { \ - for (length_variable _macro__i = structures.size - new_length; _macro__i < structures.size; _macro__i++) { \ - f_macro_memory_structure_t_destroy(status, structures.array[_macro__i], type_structure); \ - if (status != F_none) break; \ - } \ - } \ - if (status == F_none) status = f_memory_adjust((void **) & structures.array, sizeof(type_structures), structures.size, new_length); \ - if (status == F_none) { \ - structures.size = new_length; \ - if (structures.used > structures.size) structures.used = new_length; \ - } -#endif // _di_f_macro_memory_structures_adjust_ +#ifndef _di_f_memory_structure_new_ + extern f_status_t f_memory_structure_new(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_new_ /** - * Provide a macro for calling other macros for incrementing a buffer. + * Resize the structure. + * + * Memory being deleted will not be wiped. + * + * @param length_new + * The new size of the structure array. + * Setting a length of 0 will result in the deletion (freeing) of the structure. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. * - * If the used + step is greater than size, then increase by step_default. - * If step_default exceeds f_array_length_t_size, then attempt to increment by step. - * If step exceeds f_array_length_t_size, set status to error_too_large. + * @return + * F_none on success. * - * Be sure to check size for error after calling this. + * F_memory_not (with error bit) on allocation error. * - * status: the status to return. - * structures: the structures to operate on. - * step: the step to increase by, must be less than or equal to step_default. - * step_default: the default step to increase by if memory allows. - * macro_resize: the resize structure macro to call that excepts the exact arguments: (status, structure, new_length). - * error_too_large: the error status to return when f_array_length_t_size would be exceeded. + * @see calloc() + * @see free() + * @see memset() */ -#ifndef _di_f_macro_memory_structure_macro_increment_ - #define f_macro_memory_structure_macro_increment(status, structure, step, step_default, macro_resize, error_too_large) \ - if (structure.used + step > structure.size) { \ - if (structure.used + step_default > f_array_length_t_size) { \ - if (structure.used + step > f_array_length_t_size) { \ - status = F_status_set_error(error_too_large); \ - } \ - else { \ - macro_resize(status, structure, structure.used + step); \ - } \ - } \ - else { \ - macro_resize(status, structure, structure.size + step_default); \ - } \ - } -#endif // _di_f_macro_memory_structure_macro_increment_ +#ifndef _di_f_memory_structure_resize_ + extern f_status_t f_memory_structure_resize(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size); +#endif // _di_f_memory_structure_resize_ #ifdef __cplusplus } // extern "C" diff --git a/level_0/f_memory/c/private-memory.c b/level_0/f_memory/c/private-memory.c new file mode 100644 index 0000000..515db9a --- /dev/null +++ b/level_0/f_memory/c/private-memory.c @@ -0,0 +1,157 @@ +#include "memory.h" +#include "private-memory.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#if !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) + f_status_t private_f_memory_adjust(const size_t length_old, const size_t length_new, const size_t type_size, void **pointer) { + + if (length_old == length_new) { + return F_none; + } + + if (*pointer) { + void *new_pointer = 0; + + if (length_old > 0) { + if (length_new < length_old) { + + // uint8_t * is of a data size size of 1, casting it to uint8_t should result in a single-length increment. + // this is done to avoid problems with (void *) having arithmetic issues. + memset(((uint8_t *) *pointer) + length_new, 0, type_size * (length_old - length_new)); + } + } + + if (length_new) { + new_pointer = realloc(*pointer, type_size * length_new); + } + else { + free(*pointer); + + // assure that the pointer is always 0 after deallocation. + *pointer = 0; + + return F_none; + } + + if (new_pointer) { + if (new_pointer != *pointer) { + if (length_new > length_old) { + + // uint8_t * is of a data size size of 1, casting it to bool should result in a single-length increment. + // this is done to avoid problems with (void *) having arithmetic issues. + memset(((uint8_t *) new_pointer) + (type_size * length_old), 0, type_size * (length_new - length_old)); + } + + *pointer = new_pointer; + } + + return F_none; + } + } + else if (length_new > 0) { + *pointer = calloc(type_size, length_new); + + if (*pointer) { + return F_none; + } + } + else { + return F_none; + } + + return F_status_set_error(F_memory_not); + } +#endif // !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) + +#if !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) + f_status_t private_f_memory_resize(const size_t length_old, const size_t length_new, const size_t type_size, void **pointer) { + + if (length_old == length_new) { + return F_none; + } + + if (*pointer) { + void *new_pointer = 0; + + if (length_new) { + new_pointer = realloc(*pointer, type_size * length_new); + } + else { + free(*pointer); + + // assure that the pointer is always 0 after deallocation. + *pointer = 0; + + return F_none; + } + + if (new_pointer) { + if (new_pointer != *pointer) { + if (length_new > length_old) { + + // uint8_t * is of a data size size of 1, casting it to bool should result in a single-length increment. + // this is done to avoid problems with (void *) having arithmetic issues. + memset(((uint8_t *) new_pointer) + (type_size * length_old), 0, type_size * (length_new - length_old)); + } + + *pointer = new_pointer; + } + + return F_none; + } + } + else if (length_new > 0) { + *pointer = calloc(type_size, length_new); + + if (*pointer) { + return F_none; + } + } + else { + return F_none; + } + + return F_status_set_error(F_memory_not); + } +#endif // !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) + +#if !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) + f_status_t private_f_memory_structure_adjust(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + + const f_status_t status = private_f_memory_adjust(*size, length_new, type_size, structure); + + if (status == F_none) { + *size = length_new; + + if (*used > *size) { + *used = *size; + } + } + + return status; + } +#endif // !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) + +#if !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) + f_status_t private_f_memory_structure_resize(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) { + + const f_status_t status = private_f_memory_resize(*size, length_new, type_size, structure); + + if (status == F_none) { + *size = length_new; + + if (*used > *size) { + *used = *size; + } + } + + return status; + } +#endif // !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/level_0/f_memory/c/private-memory.h b/level_0/f_memory/c/private-memory.h new file mode 100644 index 0000000..7917e2c --- /dev/null +++ b/level_0/f_memory/c/private-memory.h @@ -0,0 +1,164 @@ +/** + * FLL - Level 0 + * + * Project: Memory + * 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_F_memory_h +#define _PRIVATE_F_memory_h + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Private implementation for adjusting. + * + * Intended to be shared to each of the different implementation variations. + * + * @param length_old + * The old size of the structure array. + * This is used to determine if and when to call memset(). + * @param length_new + * The new size of the structure array. + * Setting a length of 0 will result in the deletion (freeing) of the structure. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * @param pointer + * The pointer to the memory to delete. + * + * @return + * F_none on success. + * + * F_memory_not (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() + * + * @see f_memory_structure_adjust() + * @see f_memory_structure_decimate() + * @see f_memory_structure_decimate_by() + * @see f_memory_structure_destroy() + */ +#if !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) + extern f_status_t private_f_memory_adjust(const size_t length_old, const size_t length_new, const size_t type_size, void **pointer) f_gcc_attribute_visibility_internal; +#endif // !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) + +/** + * Private implementation for resizing. + * + * Intended to be shared to each of the different implementation variations. + * + * @param length_old + * The old size of the structure array. + * This is used to determine if and when to call memset(). + * @param length_new + * The new size of the structure array. + * Setting a length of 0 will result in the deletion (freeing) of the structure. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * @param pointer + * The pointer to the memory to delete. + * + * @return + * F_none on success. + * + * F_memory_not (with error bit) on allocation error. + * + * @see calloc() + * @see free() + * @see memset() + * + * @see f_memory_structure_decrease() + * @see f_memory_structure_decrease_by() + * @see f_memory_structure_delete() + * @see f_memory_structure_increase() + * @see f_memory_structure_increase_by() + * @see f_memory_structure_new() + * @see f_memory_structure_resize() + * + * @see private_f_memory_structure_resize() + */ +#if !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) + extern f_status_t private_f_memory_resize(const size_t length_old, const size_t length_new, const size_t type_size, void **pointer) f_gcc_attribute_visibility_internal; +#endif // !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) + +/** + * Private implementation for resizing a structure. + * + * Intended to be shared to each of the different implementation variations. + * + * @param length_new + * The new size of the structure array. + * Setting a length of 0 will result in the deletion (freeing) of the structure. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. + * + * @return + * Return from: private_f_memory_adjust(). + * + * Errors (with error bit) from: private_f_memory_adjust(). + * + * @see f_memory_structure_adjust() + * @see f_memory_structure_decimate() + * @see f_memory_structure_decimate_by() + * @see f_memory_structure_destroy() + * + * @see private_f_memory_adjust() + */ +#if !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) + f_status_t private_f_memory_structure_adjust(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) f_gcc_attribute_visibility_internal; +#endif // !defined(_di_f_memory_structure_adjust_) || !defined(_di_f_memory_structure_decimate_) || !defined(_di_f_memory_structure_decimate_by_) || !defined(_di_f_memory_structure_destroy_) + +/** + * Private implementation for resizing a structure. + * + * Intended to be shared to each of the different implementation variations. + * + * @param length_new + * The new size of the structure array. + * Setting a length of 0 will result in the deletion (freeing) of the structure. + * @param type_size + * The size of the structure type (such as: sizeof(structure_size)). + * @param structure + * The structure to delete. + * @param used + * The amount of data used by the structure. + * @param size + * The amount of data allocated to the structure. + * + * @return + * Return from: private_f_memory_resize(). + * + * Errors (with error bit) from: private_f_memory_structure_resize(). + * + * @see f_memory_structure_decrease() + * @see f_memory_structure_decrease_by() + * @see f_memory_structure_delete() + * @see f_memory_structure_increase() + * @see f_memory_structure_increase_by() + * @see f_memory_structure_new() + * @see f_memory_structure_resize() + * + * @see private_f_memory_resize() + */ +#if !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) + f_status_t private_f_memory_structure_resize(const size_t length_new, const size_t type_size, void **structure, f_array_length_t *used, f_array_length_t *size) f_gcc_attribute_visibility_internal; +#endif // !defined(_di_memory_structure_decrease_) || !defined(_di_memory_structure_decrease_by_) || !defined(_di_memory_structure_delete_by_) || !defined(_di_memory_structure_increase_) || !defined(_di_memory_structure_increase_by_) || !defined(_di_f_memory_structure_new_) || !defined(_di_f_memory_structure_resize_) + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // _PRIVATE_F_memory_h diff --git a/level_0/f_memory/data/build/defines b/level_0/f_memory/data/build/defines index c665317..13ab9ee 100644 --- a/level_0/f_memory/data/build/defines +++ b/level_0/f_memory/data/build/defines @@ -1,2 +1,3 @@ # fss-0000 - +_f_memory_FORCE_secure_memory_ all to-be removed address spaces are set to 0 before freeing or resizing. +_f_memory_FORCE_fast_memory_ all to-be removed address spaces remain unchanged before freeing or resizing. diff --git a/level_0/f_memory/data/build/settings b/level_0/f_memory/data/build/settings index ff3d867..c029d46 100644 --- a/level_0/f_memory/data/build/settings +++ b/level_0/f_memory/data/build/settings @@ -20,9 +20,9 @@ build_indexer ar build_language c build_libraries -lc build_libraries-individual -build_sources_library memory.c +build_sources_library memory.c memory_structure.c private-memory.c build_sources_program -build_sources_headers memory.h memory_structure.h +build_sources_headers memory.h memory_structure.h memory-common.h build_sources_script build_sources_setting build_script yes diff --git a/level_0/f_path/c/path.c b/level_0/f_path/c/path.c index 1429263..474a3ce 100644 --- a/level_0/f_path/c/path.c +++ b/level_0/f_path/c/path.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_path_change_ - f_return_status f_path_change(const f_string_t path) { + f_status_t f_path_change(const f_string_t path) { if (chdir(path) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -26,7 +26,7 @@ extern "C" { #endif // _di_f_path_change_ #ifndef _di_f_path_change_at_ - f_return_status f_path_change_at(const int at_id) { + f_status_t f_path_change_at(const int at_id) { #ifndef _di_level_0_parameter_checking_ if (at_id <= 0) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -50,7 +50,7 @@ extern "C" { #endif // _di_f_path_change_at_ #ifndef _di_f_path_current_ - f_return_status f_path_current(const bool real, f_string_dynamic_t *path) { + f_status_t f_path_current(const bool real, f_string_dynamic_t *path) { #ifndef _di_level_0_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -92,7 +92,7 @@ extern "C" { #endif // _di_f_path_current_ #ifndef _di_f_path_is_ - f_return_status f_path_is(const f_string_t path, const f_string_length_t length) { + f_status_t f_path_is(const f_string_t path, const f_string_length_t length) { if (!path || !length) { return F_false; } @@ -109,7 +109,7 @@ extern "C" { #endif // _di_f_path_is_ #ifndef _di_f_path_real_ - f_return_status f_path_real(const f_string_t path, f_string_dynamic_t *real) { + f_status_t f_path_real(const f_string_t path, f_string_dynamic_t *real) { #ifndef _di_level_0_parameter_checking_ if (!real) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_path/c/path.h b/level_0/f_path/c/path.h index 0cf5914..5246acb 100644 --- a/level_0/f_path/c/path.h +++ b/level_0/f_path/c/path.h @@ -51,7 +51,7 @@ extern "C" { * @see chdir() */ #ifndef _di_f_path_change_ - extern f_return_status f_path_change(const f_string_t path); + extern f_status_t f_path_change(const f_string_t path); #endif // _di_f_path_change_ /** @@ -77,7 +77,7 @@ extern "C" { * @see fchdir() */ #ifndef _di_f_path_change_at_ - extern f_return_status f_path_change_at(const int at_id); + extern f_status_t f_path_change_at(const int at_id); #endif // _di_f_path_change_at_ /** @@ -109,7 +109,7 @@ extern "C" { * @see getcwd() */ #ifndef _di_f_path_current_ - extern f_return_status f_path_current(const bool real, f_string_dynamic_t *path); + extern f_status_t f_path_current(const bool real, f_string_dynamic_t *path); #endif // _di_f_path_current_ /** @@ -128,7 +128,7 @@ extern "C" { * F_false if this string is not a path string. */ #ifndef _di_f_path_is_ - extern f_return_status f_path_is(const f_string_t path, const f_string_length_t length); + extern f_status_t f_path_is(const f_string_t path, const f_string_length_t length); #endif // _di_f_path_is_ /** @@ -165,7 +165,7 @@ extern "C" { * @see realpath() */ #ifndef _di_f_path_real_ - extern f_return_status f_path_real(const f_string_t path, f_string_dynamic_t *real); + extern f_status_t f_path_real(const f_string_t path, f_string_dynamic_t *real); #endif // _di_f_path_real_ #ifdef __cplusplus diff --git a/level_0/f_path/c/private-path.c b/level_0/f_path/c/private-path.c index 77418cf..191d0ba 100644 --- a/level_0/f_path/c/private-path.c +++ b/level_0/f_path/c/private-path.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_path_current_) || !defined(_di_f_path_real_) - f_return_status private_f_path_real(const f_string_t path, f_string_dynamic_t *real) { + f_status_t private_f_path_real(const f_string_t path, f_string_dynamic_t *real) { char buffer[f_path_max]; if (!realpath(path, buffer)) { diff --git a/level_0/f_path/c/private-path.h b/level_0/f_path/c/private-path.h index 9073e08..508ed68 100644 --- a/level_0/f_path/c/private-path.h +++ b/level_0/f_path/c/private-path.h @@ -42,7 +42,7 @@ extern "C" { * @see f_path_real() */ #if !defined(_di_f_path_current_) || !defined(_di_f_path_real_) - extern f_return_status private_f_path_real(const f_string_t path, f_string_dynamic_t *real) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_path_real(const f_string_t path, f_string_dynamic_t *real) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_path_current_) || !defined(_di_f_path_real_) #ifdef __cplusplus diff --git a/level_0/f_pipe/c/pipe.c b/level_0/f_pipe/c/pipe.c index 3ce7d8e..adf26f6 100644 --- a/level_0/f_pipe/c/pipe.c +++ b/level_0/f_pipe/c/pipe.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_f_pipe_input_exists_ - f_return_status f_pipe_input_exists() { + f_status_t f_pipe_input_exists() { struct stat st_info; if (fstat(f_type_descriptor_input, &st_info) != 0) { @@ -21,7 +21,7 @@ extern "C" { #endif // _di_f_pipe_input_exists_ #ifndef _di_f_pipe_warning_exists_ - f_return_status f_pipe_warning_exists() { + f_status_t f_pipe_warning_exists() { struct stat st_info; if (fstat(f_type_descriptor_warning, &st_info) != 0) { @@ -37,7 +37,7 @@ extern "C" { #endif // _di_f_pipe_warning_exists_ #ifndef _di_f_pipe_error_exists_ - f_return_status f_pipe_error_exists() { + f_status_t f_pipe_error_exists() { struct stat st_info; if (fstat(f_type_descriptor_error, &st_info) != 0) { @@ -53,7 +53,7 @@ extern "C" { #endif // _di_f_pipe_error_exists_ #ifndef _di_f_pipe_debug_exists_ - f_return_status f_pipe_debug_exists() { + f_status_t f_pipe_debug_exists() { struct stat st_info; if (fstat(f_type_descriptor_debug, &st_info) != 0) { diff --git a/level_0/f_pipe/c/pipe.h b/level_0/f_pipe/c/pipe.h index f472790..d28e98a 100644 --- a/level_0/f_pipe/c/pipe.h +++ b/level_0/f_pipe/c/pipe.h @@ -35,7 +35,7 @@ extern "C" { * @see fstat() */ #ifndef _di_f_pipe_input_exists_ - extern f_return_status f_pipe_input_exists(); + extern f_status_t f_pipe_input_exists(); #endif // _di_f_pipe_input_exists_ /** @@ -51,7 +51,7 @@ extern "C" { * @see fstat() */ #ifndef _di_f_pipe_warning_exists_ - extern f_return_status f_pipe_warning_exists(); + extern f_status_t f_pipe_warning_exists(); #endif // _di_f_pipe_warning_exists_ /** @@ -65,7 +65,7 @@ extern "C" { * @see fstat() */ #ifndef _di_f_pipe_error_exists_ - extern f_return_status f_pipe_error_exists(); + extern f_status_t f_pipe_error_exists(); #endif // _di_f_pipe_error_exists_ /** @@ -81,7 +81,7 @@ extern "C" { * @see fstat() */ #ifndef _di_f_pipe_debug_exists_ - extern f_return_status f_pipe_debug_exists(); + extern f_status_t f_pipe_debug_exists(); #endif // _di_f_pipe_debug_exists_ #ifdef __cplusplus diff --git a/level_0/f_print/c/print.c b/level_0/f_print/c/print.c index 2499ae6..2230c8a 100644 --- a/level_0/f_print/c/print.c +++ b/level_0/f_print/c/print.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_print_ - f_return_status f_print(FILE *output, const f_string_t string, const f_string_length_t length) { + f_status_t f_print(FILE *output, const f_string_t string, const f_string_length_t length) { #ifndef _di_level_0_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -18,7 +18,7 @@ extern "C" { #endif // _di_f_print_ #ifndef _di_f_print_dynamic_ - f_return_status f_print_dynamic(FILE *output, const f_string_static_t buffer) { + f_status_t f_print_dynamic(FILE *output, const f_string_static_t buffer) { #ifndef _di_level_0_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -30,7 +30,7 @@ extern "C" { #endif // _di_f_print_dynamic_ #ifndef _di_f_print_dynamic_partial_ - f_return_status f_print_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range) { + f_status_t f_print_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range) { #ifndef _di_level_0_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -48,7 +48,7 @@ extern "C" { #endif // _di_f_print_dynamic_partial_ #ifndef _di_f_print_except_ - f_return_status f_print_except(FILE *output, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except) { + f_status_t f_print_except(FILE *output, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except) { #ifndef _di_level_0_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -60,7 +60,7 @@ extern "C" { #endif // _di_f_print_except_ #ifndef _di_f_print_except_dynamic_ - f_return_status f_print_except_dynamic(FILE *output, const f_string_static_t buffer, const f_string_lengths_t except) { + f_status_t f_print_except_dynamic(FILE *output, const f_string_static_t buffer, const f_string_lengths_t except) { #ifndef _di_level_0_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -72,7 +72,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_ #ifndef _di_f_print_except_dynamic_partial_ - f_return_status f_print_except_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except) { + f_status_t f_print_except_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except) { #ifndef _di_level_0_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -90,7 +90,7 @@ extern "C" { #endif // _di_f_print_except_dynamic_partial_ #ifndef _di_f_print_to_ - f_return_status f_print_to(const int id, const f_string_t string, const f_string_length_t length) { + f_status_t f_print_to(const int id, const f_string_t string, const f_string_length_t length) { #ifndef _di_level_0_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -102,7 +102,7 @@ extern "C" { #endif // _di_f_print_to_ #ifndef _di_f_print_to_dynamic_ - f_return_status f_print_to_dynamic(const int id, const f_string_static_t buffer) { + f_status_t f_print_to_dynamic(const int id, const f_string_static_t buffer) { #ifndef _di_level_0_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -114,7 +114,7 @@ extern "C" { #endif // _di_f_print_to_dynamic_ #ifndef _di_f_print_to_dynamic_partial_ - f_return_status f_print_to_dynamic_partial(const int id, const f_string_static_t buffer, const f_string_range_t range) { + f_status_t f_print_to_dynamic_partial(const int id, const f_string_static_t buffer, const f_string_range_t range) { #ifndef _di_level_0_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -132,7 +132,7 @@ extern "C" { #endif // _di_f_print_to_dynamic_partial_ #ifndef _di_f_print_to_except_ - f_return_status f_print_to_except(const int id, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except) { + f_status_t f_print_to_except(const int id, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except) { #ifndef _di_level_0_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -144,7 +144,7 @@ extern "C" { #endif // _di_f_print_to_except_ #ifndef _di_f_print_to_except_dynamic_ - f_return_status f_print_to_except_dynamic(const int id, const f_string_static_t buffer, const f_string_lengths_t except) { + f_status_t f_print_to_except_dynamic(const int id, const f_string_static_t buffer, const f_string_lengths_t except) { #ifndef _di_level_0_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -156,7 +156,7 @@ extern "C" { #endif // _di_f_print_to_except_dynamic_ #ifndef _di_f_print_to_except_dynamic_partial_ - f_return_status f_print_to_except_dynamic_partial(const int id, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except) { + f_status_t f_print_to_except_dynamic_partial(const int id, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except) { #ifndef _di_level_0_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_print/c/print.h b/level_0/f_print/c/print.h index 993434b..86b5d60 100644 --- a/level_0/f_print/c/print.h +++ b/level_0/f_print/c/print.h @@ -52,7 +52,7 @@ extern "C" { * @see fputc() */ #ifndef _di_f_print_ - extern f_return_status f_print(FILE *output, const f_string_t string, const f_string_length_t length); + extern f_status_t f_print(FILE *output, const f_string_t string, const f_string_length_t length); #endif // _di_f_print_ /** @@ -76,7 +76,7 @@ extern "C" { * @see fputc() */ #ifndef _di_f_print_dynamic_ - extern f_return_status f_print_dynamic(FILE *output, const f_string_static_t buffer); + extern f_status_t f_print_dynamic(FILE *output, const f_string_static_t buffer); #endif // _di_f_print_dynamic_ /** @@ -102,7 +102,7 @@ extern "C" { * @see fputc() */ #ifndef _di_f_print_dynamic_partial_ - extern f_return_status f_print_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range); + extern f_status_t f_print_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range); #endif // _di_f_print_dynamic_partial_ /** @@ -132,7 +132,7 @@ extern "C" { * @see fputc() */ #ifndef _di_f_print_except_ - extern f_return_status f_print_except(FILE *output, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except); + extern f_status_t f_print_except(FILE *output, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except); #endif // _di_f_print_except_ /** @@ -160,7 +160,7 @@ extern "C" { * @see fputc() */ #ifndef _di_f_print_except_dynamic_ - extern f_return_status f_print_except_dynamic(FILE *output, const f_string_static_t buffer, const f_string_lengths_t except); + extern f_status_t f_print_except_dynamic(FILE *output, const f_string_static_t buffer, const f_string_lengths_t except); #endif // _di_f_print_except_dynamic_ /** @@ -190,7 +190,7 @@ extern "C" { * @see fputc() */ #ifndef _di_f_print_dynamic_except_partial_ - extern f_return_status f_print_except_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except); + extern f_status_t f_print_except_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except); #endif // _di_f_print_except_dynamic_partial_ @@ -223,7 +223,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_ - extern f_return_status f_print_to(const int id, const f_string_t string, const f_string_length_t length); + extern f_status_t f_print_to(const int id, const f_string_t string, const f_string_length_t length); #endif // _di_f_print_to_ /** @@ -253,7 +253,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_dynamic_ - extern f_return_status f_print_to_dynamic(const int id, const f_string_static_t buffer); + extern f_status_t f_print_to_dynamic(const int id, const f_string_static_t buffer); #endif // _di_f_print_to_dynamic_ /** @@ -285,7 +285,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_dynamic_partial_ - extern f_return_status f_print_to_dynamic_partial(const int id, const f_string_static_t buffer, const f_string_range_t range); + extern f_status_t f_print_to_dynamic_partial(const int id, const f_string_static_t buffer, const f_string_range_t range); #endif // _di_f_print_to_dynamic_partial_ /** @@ -323,7 +323,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_ - extern f_return_status f_print_to_except(const int id, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except); + extern f_status_t f_print_to_except(const int id, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except); #endif // _di_f_print_to_except_ /** @@ -359,7 +359,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_ - extern f_return_status f_print_to_except_dynamic(const int id, const f_string_static_t buffer, const f_string_lengths_t except); + extern f_status_t f_print_to_except_dynamic(const int id, const f_string_static_t buffer, const f_string_lengths_t except); #endif // _di_f_print_to_except_dynamic_ /** @@ -397,7 +397,7 @@ extern "C" { * @see write() */ #ifndef _di_f_print_to_except_dynamic_partial_ - extern f_return_status f_print_to_except_dynamic_partial(const int id, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except); + extern f_status_t f_print_to_except_dynamic_partial(const int id, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except); #endif // _di_f_print_to_except_dynamic_partial_ #ifdef __cplusplus diff --git a/level_0/f_print/c/private-print.c b/level_0/f_print/c/private-print.c index f3e41a7..938bfcc 100644 --- a/level_0/f_print/c/private-print.c +++ b/level_0/f_print/c/private-print.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_) - f_return_status private_f_print(FILE *output, const f_string_t string, const f_string_length_t length) { + f_status_t private_f_print(FILE *output, const f_string_t string, const f_string_length_t length) { for (register f_string_length_t i = 0; i < length; ++i) { if (string[i]) { @@ -21,7 +21,7 @@ extern "C" { #endif // !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_) #if !defined(_di_f_print_except_) || !defined(_di_f_print_except_dynamic_) || !defined(_di_f_print_except_dynamic_partial_) - f_return_status private_f_print_except(FILE *output, const f_string_t string, const f_string_length_t offset, const f_string_length_t stop, const f_string_lengths_t except) { + f_status_t private_f_print_except(FILE *output, const f_string_t string, const f_string_length_t offset, const f_string_length_t stop, const f_string_lengths_t except) { f_string_length_t j = 0; for (register f_string_length_t i = offset; i < stop; ++i) { @@ -44,7 +44,7 @@ extern "C" { #endif // !defined(_di_f_print_except_) || !defined(_di_f_print_except_dynamic_) || !defined(_di_f_print_except_dynamic_partial_) #if !defined(_di_f_print_to_) || !defined(_di_f_print_dynamic_to_) || !defined(_di_f_print_dynamic_partial_to_) - f_return_status private_f_print_to(const int id, const f_string_t string, const f_string_length_t length) { + f_status_t private_f_print_to(const int id, const f_string_t string, const f_string_length_t length) { register f_string_length_t i = 0; f_string_length_t start = 0; @@ -94,7 +94,7 @@ extern "C" { #endif // !defined(_di_f_print_to_) || !defined(_di_f_print_dynamic_to_) || !defined(_di_f_print_dynamic_partial_to_) #if !defined(_di_f_print_to_except_) || !defined(_di_f_print_to_except_dynamic_) || !defined(_di_f_print_to_except_dynamic_partial_) - f_return_status private_f_print_to_except(const int id, const f_string_t string, const f_string_length_t offset, const f_string_length_t stop, const f_string_lengths_t except) { + f_status_t private_f_print_to_except(const int id, const f_string_t string, const f_string_length_t offset, const f_string_length_t stop, const f_string_lengths_t except) { register f_string_length_t i = offset; f_string_length_t j = 0; diff --git a/level_0/f_print/c/private-print.h b/level_0/f_print/c/private-print.h index 6ea2a3c..0e6305d 100644 --- a/level_0/f_print/c/private-print.h +++ b/level_0/f_print/c/private-print.h @@ -38,7 +38,7 @@ extern "C" { * @see f_print_dynamic_partial() */ #if !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_) - extern f_return_status private_f_print(FILE *output, const f_string_t string, const f_string_length_t length) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_print(FILE *output, const f_string_t string, const f_string_length_t length) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_print_) || !defined(_di_f_print_dynamic_) || !defined(_di_f_print_dynamic_partial_) /** @@ -69,7 +69,7 @@ extern "C" { * @see f_print_except_dynamic_partial() */ #if !defined(_di_f_print_except_) || !defined(_di_f_print_except_dynamic_) || !defined(_di_f_print_except_dynamic_partial_) - extern f_return_status private_f_print_except(FILE *output, const f_string_t string, const f_string_length_t offset, const f_string_length_t stop, const f_string_lengths_t except) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_print_except(FILE *output, const f_string_t string, const f_string_length_t offset, const f_string_length_t stop, const f_string_lengths_t except) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_print_except_) || !defined(_di_f_print_except_dynamic_) || !defined(_di_f_print_except_dynamic_partial_) /** @@ -101,7 +101,7 @@ extern "C" { * @see f_print_to_dynamic_partial() */ #if !defined(_di_f_print_to_) || !defined(_di_f_print_to_dynamic_) || !defined(_di_f_print_to_dynamic_partial_) - extern f_return_status private_f_print_to(const int id, const f_string_t string, const f_string_length_t length) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_print_to(const int id, const f_string_t string, const f_string_length_t length) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_print_to_) || !defined(_di_f_print_to_dynamic_) || !defined(_di_f_print_to_dynamic_partial_) /** @@ -138,7 +138,7 @@ extern "C" { * @see f_print_to_except_dynamic_partial() */ #if !defined(_di_f_print_to_except_) || !defined(_di_f_print_to_except_dynamic_) || !defined(_di_f_print_to_except_dynamic_partial_) - extern f_return_status private_f_print_to_except(const int id, const f_string_t string, const f_string_length_t offset, const f_string_length_t stop, const f_string_lengths_t except) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_print_to_except(const int id, const f_string_t string, const f_string_length_t offset, const f_string_length_t stop, const f_string_lengths_t except) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_print_to_except_) || !defined(_di_f_print_to_except_dynamic_) || !defined(_di_f_print_to_except_dynamic_partial_) #ifdef __cplusplus diff --git a/level_0/f_serialize/c/private-serialize.c b/level_0/f_serialize/c/private-serialize.c index 436d57c..9ead0b6 100644 --- a/level_0/f_serialize/c/private-serialize.c +++ b/level_0/f_serialize/c/private-serialize.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_serialize_un_simple_find_) || !defined(_di_f_serialize_un_simple_get_) - f_return_status private_f_serialize_un_simple_find(const f_string_static_t serialize, const f_array_length_t index, f_string_range_t *location) { + f_status_t private_f_serialize_un_simple_find(const f_string_static_t serialize, const f_array_length_t index, f_string_range_t *location) { f_status_t status = F_none; f_array_length_t i = 0; diff --git a/level_0/f_serialize/c/private-serialize.h b/level_0/f_serialize/c/private-serialize.h index 3b15f23..88a5d15 100644 --- a/level_0/f_serialize/c/private-serialize.h +++ b/level_0/f_serialize/c/private-serialize.h @@ -35,7 +35,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #if !defined(_di_f_serialize_un_simple_find_) || !defined(_di_f_serialize_un_simple_get_) - extern f_return_status private_f_serialize_un_simple_find(const f_string_static_t serialize, const f_array_length_t index, f_string_range_t *location) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_serialize_un_simple_find(const f_string_static_t serialize, const f_array_length_t index, f_string_range_t *location) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_serialize_un_simple_find_) || !defined(_di_f_serialize_un_simple_get_) #ifdef __cplusplus diff --git a/level_0/f_serialize/c/serialize.c b/level_0/f_serialize/c/serialize.c index 05847be..97bc994 100644 --- a/level_0/f_serialize/c/serialize.c +++ b/level_0/f_serialize/c/serialize.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_serialize_simple_ - f_return_status f_serialize_simple(const f_string_static_t value, f_string_dynamic_t *serialize) { + f_status_t f_serialize_simple(const f_string_static_t value, f_string_dynamic_t *serialize) { #ifndef _di_level_0_parameter_checking_ if (!serialize) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -33,7 +33,7 @@ extern "C" { #endif // _di_f_serialize_simple_ #ifndef _di_f_serialize_un_simple_ - f_return_status f_serialize_un_simple(const f_string_static_t serialize, f_string_dynamics_t *strings) { + f_status_t f_serialize_un_simple(const f_string_static_t serialize, f_string_dynamics_t *strings) { #ifndef _di_level_0_parameter_checking_ if (!serialize.used) return F_status_set_error(F_parameter); if (!strings) return F_status_set_error(F_parameter); @@ -99,7 +99,7 @@ extern "C" { #endif // _di_f_serialize_un_simple_ #ifndef _di_f_serialize_un_simple_map_ - f_return_status f_serialize_un_simple_map(const f_string_static_t serialize, f_string_ranges_t *locations) { + f_status_t f_serialize_un_simple_map(const f_string_static_t serialize, f_string_ranges_t *locations) { #ifndef _di_level_0_parameter_checking_ if (!serialize.used) return F_status_set_error(F_parameter); if (!locations) return F_status_set_error(F_parameter); @@ -152,7 +152,7 @@ extern "C" { #endif // _di_f_serialize_un_simple_map_ #ifndef _di_f_serialize_un_simple_find_ - f_return_status f_serialize_un_simple_find(const f_string_static_t serialize, const f_array_length_t index, f_string_range_t *range) { + f_status_t f_serialize_un_simple_find(const f_string_static_t serialize, const f_array_length_t index, f_string_range_t *range) { #ifndef _di_level_0_parameter_checking_ if (!serialize.used) return F_status_set_error(F_parameter); if (!range) return F_status_set_error(F_parameter); @@ -163,7 +163,7 @@ extern "C" { #endif // _di_f_serialize_un_simple_find_ #ifndef _di_f_serialize_un_simple_get_ - f_return_status f_serialize_un_simple_get(const f_string_static_t serialize, const f_array_length_t index, f_string_dynamic_t *dynamic) { + f_status_t f_serialize_un_simple_get(const f_string_static_t serialize, const f_array_length_t index, f_string_dynamic_t *dynamic) { #ifndef _di_level_0_parameter_checking_ if (!serialize.used) return F_status_set_error(F_parameter); if (!dynamic) return F_status_set_error(F_parameter); diff --git a/level_0/f_serialize/c/serialize.h b/level_0/f_serialize/c/serialize.h index 77e7596..a2a494c 100644 --- a/level_0/f_serialize/c/serialize.h +++ b/level_0/f_serialize/c/serialize.h @@ -50,7 +50,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_serialize_simple_ - extern f_return_status f_serialize_simple(const f_string_static_t value, f_string_dynamic_t *serialize); + extern f_status_t f_serialize_simple(const f_string_static_t value, f_string_dynamic_t *serialize); #endif // _di_f_serialize_simple_ /** @@ -76,7 +76,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_serialize_un_simple_ - extern f_return_status f_serialize_un_simple(const f_string_static_t serialize, f_string_dynamics_t *strings); + extern f_status_t f_serialize_un_simple(const f_string_static_t serialize, f_string_dynamics_t *strings); #endif // _di_f_serialize_un_simple_ /** @@ -102,7 +102,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_serialize_un_simple_map_ - extern f_return_status f_serialize_un_simple_map(const f_string_static_t serialize, f_string_ranges_t *locations); + extern f_status_t f_serialize_un_simple_map(const f_string_static_t serialize, f_string_ranges_t *locations); #endif // _di_f_serialize_un_simple_map_ /** @@ -130,7 +130,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_serialize_un_simple_find_ - extern f_return_status f_serialize_un_simple_find(const f_string_static_t serialize, const f_array_length_t index, f_string_range_t *location); + extern f_status_t f_serialize_un_simple_find(const f_string_static_t serialize, const f_array_length_t index, f_string_range_t *location); #endif // _di_f_serialize_un_simple_find_ /** @@ -159,7 +159,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_serialize_un_simple_get_ - extern f_return_status f_serialize_un_simple_get(const f_string_static_t serialize, const f_array_length_t index, f_string_dynamic_t *dynamic); + extern f_status_t f_serialize_un_simple_get(const f_string_static_t serialize, const f_array_length_t index, f_string_dynamic_t *dynamic); #endif // _di_f_serialize_un_simple_get_ #ifdef __cplusplus diff --git a/level_0/f_signal/c/signal.c b/level_0/f_signal/c/signal.c index c3fea93..76609c6 100644 --- a/level_0/f_signal/c/signal.c +++ b/level_0/f_signal/c/signal.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_f_signal_close_ - f_return_status f_signal_close(f_signal_t *signal) { + f_status_t f_signal_close(f_signal_t *signal) { #ifndef _di_level_0_parameter_checking_ if (!signal) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -30,7 +30,7 @@ extern "C" { #endif // _di_f_signal_close_ #ifndef _di_f_signal_open_ - f_return_status f_signal_open(f_signal_t *signal) { + f_status_t f_signal_open(f_signal_t *signal) { #ifndef _di_level_0_parameter_checking_ if (!signal) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -53,7 +53,7 @@ extern "C" { #endif // _di_f_signal_open_ #ifndef _di_f_signal_read_ - f_return_status f_signal_read(const f_signal_t signal, struct signalfd_siginfo *information) { + f_status_t f_signal_read(const f_signal_t signal, struct signalfd_siginfo *information) { if (!signal.id) { return F_data_not; @@ -100,7 +100,7 @@ extern "C" { #endif // _di_f_signal_read_ #ifndef _di_f_signal_set_add_ - f_return_status f_signal_set_add(const int signal, sigset_t *set) { + f_status_t f_signal_set_add(const int signal, sigset_t *set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -118,7 +118,7 @@ extern "C" { #endif // _di_f_signal_set_add_ #ifndef _di_f_signal_set_delete_ - f_return_status f_signal_set_delete(const int signal, sigset_t *set) { + f_status_t f_signal_set_delete(const int signal, sigset_t *set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -136,7 +136,7 @@ extern "C" { #endif // _di_f_signal_set_delete_ #ifndef _di_f_signal_set_empty_ - f_return_status f_signal_set_empty(sigset_t *set) { + f_status_t f_signal_set_empty(sigset_t *set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -154,7 +154,7 @@ extern "C" { #endif // _di_f_signal_set_empty_ #ifndef _di_f_signal_set_fill_ - f_return_status f_signal_set_fill(sigset_t *set) { + f_status_t f_signal_set_fill(sigset_t *set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -171,7 +171,7 @@ extern "C" { #endif // _di_f_signal_set_fill_ #ifndef _di_f_signal_mask_ - f_return_status f_signal_mask(const int how, const sigset_t *next, sigset_t *current) { + f_status_t f_signal_mask(const int how, const sigset_t *next, sigset_t *current) { #ifndef _di_level_0_parameter_checking_ if (!next && !current) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -188,7 +188,7 @@ extern "C" { #endif // _di_f_signal_mask_ #ifndef _di_f_signal_queue_ - f_return_status f_signal_queue(const pid_t id, const int signal, const union sigval value) { + f_status_t f_signal_queue(const pid_t id, const int signal, const union sigval value) { if (sigqueue(id, signal, value) < 0) { if (errno == EAGAIN) return F_status_set_error(F_resource_not); @@ -204,7 +204,7 @@ extern "C" { #endif // _di_f_signal_queue_ #ifndef _di_f_signal_set_has_ - f_return_status f_signal_set_has(const int signal, const sigset_t *set) { + f_status_t f_signal_set_has(const int signal, const sigset_t *set) { #ifndef _di_level_0_parameter_checking_ if (!set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ diff --git a/level_0/f_signal/c/signal.h b/level_0/f_signal/c/signal.h index d3e8e61..625bbff 100644 --- a/level_0/f_signal/c/signal.h +++ b/level_0/f_signal/c/signal.h @@ -49,7 +49,7 @@ extern "C" { * @see close() */ #ifndef _di_f_signal_close_ - extern f_return_status f_signal_close(f_signal_t *signal); + extern f_status_t f_signal_close(f_signal_t *signal); #endif // _di_f_signal_close_ /** @@ -71,7 +71,7 @@ extern "C" { * @see signalfd() */ #ifndef _di_f_signal_open_ - extern f_return_status f_signal_open(f_signal_t *signal); + extern f_status_t f_signal_open(f_signal_t *signal); #endif // _di_f_signal_open_ /** @@ -100,7 +100,7 @@ extern "C" { * @see read() */ #ifndef _di_f_signal_read_ - extern f_return_status f_signal_read(const f_signal_t signal, struct signalfd_siginfo *information); + extern f_status_t f_signal_read(const f_signal_t signal, struct signalfd_siginfo *information); #endif // _di_f_signal_read_ /** @@ -119,7 +119,7 @@ extern "C" { * @see sigaddset() */ #ifndef _di_f_signal_set_add_ - extern f_return_status f_signal_set_add(const int signal, sigset_t *set); + extern f_status_t f_signal_set_add(const int signal, sigset_t *set); #endif // _di_f_signal_set_add_ /** @@ -138,7 +138,7 @@ extern "C" { * @see sigdelset() */ #ifndef _di_f_signal_set_delete_ - extern f_return_status f_signal_set_delete(const int signal, sigset_t *set); + extern f_status_t f_signal_set_delete(const int signal, sigset_t *set); #endif // _di_f_signal_set_delete_ /** @@ -155,7 +155,7 @@ extern "C" { * @see sigemptyset() */ #ifndef _di_f_signal_set_empty_ - extern f_return_status f_signal_set_empty(sigset_t *set); + extern f_status_t f_signal_set_empty(sigset_t *set); #endif // _di_f_signal_set_empty_ /** @@ -172,7 +172,7 @@ extern "C" { * @see sigfillset() */ #ifndef _di_f_signal_set_fill_ - extern f_return_status f_signal_set_fill(sigset_t *set); + extern f_status_t f_signal_set_fill(sigset_t *set); #endif // _di_f_signal_set_fill_ /** @@ -198,7 +198,7 @@ extern "C" { * @see sigprocmask() */ #ifndef _di_f_signal_mask_ - extern f_return_status f_signal_mask(const int how, const sigset_t *next, sigset_t *current); + extern f_status_t f_signal_mask(const int how, const sigset_t *next, sigset_t *current); #endif // _di_f_signal_mask_ /** @@ -222,7 +222,7 @@ extern "C" { * @see sigqueue() */ #ifndef _di_f_signal_queue_ - extern f_return_status f_signal_queue(const pid_t id, const int signal, const union sigval value); + extern f_status_t f_signal_queue(const pid_t id, const int signal, const union sigval value); #endif // _di_f_signal_queue_ /** @@ -242,7 +242,7 @@ extern "C" { * @see sigismember() */ #ifndef _di_f_signal_set_has_ - extern f_return_status f_signal_set_has(const int signal, const sigset_t *set); + extern f_status_t f_signal_set_has(const int signal, const sigset_t *set); #endif // _di_f_signal_set_has_ #ifdef __cplusplus diff --git a/level_0/f_socket/c/socket.c b/level_0/f_socket/c/socket.c index b6661d7..af2863a 100644 --- a/level_0/f_socket/c/socket.c +++ b/level_0/f_socket/c/socket.c @@ -5,7 +5,7 @@ extern "C"{ #endif #ifndef _di_f_socket_file_bind_ - f_return_status f_socket_file_bind(const f_string_t path, const int id, struct sockaddr_un *address) { + f_status_t f_socket_file_bind(const f_string_t path, const int id, struct sockaddr_un *address) { memset(&address, 0, sizeof(struct sockaddr_un)); address->sun_family = AF_UNIX; @@ -33,7 +33,7 @@ extern "C"{ #endif // _di_f_socket_file_bind_ #ifndef _di_f_socket_listen_ - f_return_status f_socket_listen(const int id, const unsigned int max_backlog) { + f_status_t f_socket_listen(const int id, const unsigned int max_backlog) { if (listen(id, max_backlog) < 0) { if (errno == EADDRINUSE) return F_status_set_error(F_busy_address); @@ -49,7 +49,7 @@ extern "C"{ #endif // _di_f_socket_listen_ #ifndef _di_f_socket_close_client_ - f_return_status f_socket_close_client(const int id, const unsigned short action) { + f_status_t f_socket_close_client(const int id, const unsigned short action) { int result = 0; if (action == f_socket_close_fast) { diff --git a/level_0/f_socket/c/socket.h b/level_0/f_socket/c/socket.h index 6361843..ca44c6c 100644 --- a/level_0/f_socket/c/socket.h +++ b/level_0/f_socket/c/socket.h @@ -60,7 +60,7 @@ extern "C"{ * @see bind() */ #ifndef _di_f_socket_file_bind_ - extern f_return_status f_socket_file_bind(const f_string_t path, const int id, struct sockaddr_un *address); + extern f_status_t f_socket_file_bind(const f_string_t path, const int id, struct sockaddr_un *address); #endif // _di_f_socket_file_bind_ /** @@ -83,7 +83,7 @@ extern "C"{ * @see listen() */ #ifndef _di_f_socket_listen_ - extern f_return_status f_socket_listen(const int id, const unsigned int max_backlog); + extern f_status_t f_socket_listen(const int id, const unsigned int max_backlog); #endif // _di_f_socket_listen_ /** @@ -113,7 +113,7 @@ extern "C"{ * @see shutdown() */ #ifndef _di_f_socket_close_client_ - extern f_return_status f_socket_close_client(const int id, const unsigned short action); + extern f_status_t f_socket_close_client(const int id, const unsigned short action); #endif // _di_f_socket_close_client_ #ifdef __cplusplus diff --git a/level_0/f_string/c/string-common.h b/level_0/f_string/c/string-common.h index eb61ade..4ded583 100644 --- a/level_0/f_string/c/string-common.h +++ b/level_0/f_string/c/string-common.h @@ -118,18 +118,28 @@ extern "C" { #define f_string_lengths_t_initialize { 0, 0, 0 } + #define f_macro_string_lengths_t_adjust(status, lengths, length) f_macro_memory_structure_t_adjust(status, lengths, f_string_length_t, length) + #define f_macro_string_lengths_t_clear(lengths) f_macro_memory_structure_t_clear(lengths) - #define f_macro_string_lengths_t_new(status, lengths, length) f_macro_memory_structure_t_new(status, lengths, f_string_length_t, length) + #define f_macro_string_lengths_t_decimate(status, lengths) f_macro_memory_structure_decimate(status, lengths, f_string_length_t); + #define f_macro_string_lengths_t_decimate_by(status, lengths, amount) f_macro_memory_structure_decimate_by(status, lengths, f_string_length_t, amount); - #define f_macro_string_lengths_t_delete(status, lengths) f_macro_memory_structure_t_delete(status, lengths, f_string_length_t) - #define f_macro_string_lengths_t_destroy(status, lengths) f_macro_memory_structure_t_destroy(status, lengths, f_string_length_t) + #define f_macro_string_lengths_t_decrease(status, lengths) f_macro_memory_structure_decrease(status, lengths, f_string_length_t); + #define f_macro_string_lengths_t_decrease_by(status, lengths, amount) f_macro_memory_structure_decrease_by(status, lengths, f_string_length_t, amount); + #define f_macro_string_lengths_t_delete(status, lengths) f_macro_memory_structure_t_delete(status, lengths, f_string_length_t) #define f_macro_string_lengths_t_delete_simple(lengths) f_macro_memory_structure_t_delete_simple(lengths, f_string_length_t) - #define f_macro_string_lengths_t_destroy_simple(lengths) f_macro_memory_structure_t_destroy_simple(lengths, f_string_length_t) + + #define f_macro_string_lengths_t_destroy(status, lengths) f_macro_memory_structure_t_destroy(status, lengths, f_string_length_t) + #define f_macro_string_lengths_t_destroy_simple(lengths) f_macro_memory_structure_t_destroy_simple(lengths, f_string_length_t) + + #define f_macro_string_lengths_t_increase(status, lengths) f_macro_memory_structure_increase(status, lengths, f_string_length_t); + #define f_macro_string_lengths_t_increase_by(status, lengths, amount) f_macro_memory_structure_increase_by(status, lengths, f_string_length_t, amount); + + #define f_macro_string_lengths_t_new(status, lengths, length) f_macro_memory_structure_t_new(status, lengths, f_string_length_t, length) #define f_macro_string_lengths_t_resize(status, lengths, new_length) f_macro_memory_structure_t_resize(status, lengths, f_string_length_t, new_length) - #define f_macro_string_lengths_t_adjust(status, lengths, new_length) f_macro_memory_structure_t_adjust(status, lengths, f_string_length_t, new_length) #endif // _di_f_string_lengths_t_ /** diff --git a/level_0/f_string/c/string_quantity.h b/level_0/f_string/c/string_quantity.h index cf7d2c2..fe4cda3 100644 --- a/level_0/f_string/c/string_quantity.h +++ b/level_0/f_string/c/string_quantity.h @@ -54,18 +54,28 @@ extern "C" { #define f_string_quantitys_t_initialize {0, 0, 0} + #define f_macro_string_quantitys_t_adjust(status, quantitys, length) f_macro_memory_structure_t_adjust(status, quantitys, f_string_quantity_t, length) + #define f_macro_string_quantitys_t_clear(quantitys) f_macro_memory_structure_t_clear(quantitys) - #define f_macro_string_quantitys_t_new(status, quantitys, length) f_macro_memory_structure_t_new(status, quantitys, f_string_quantity_t, length) + #define f_macro_string_quantitys_t_decimate(status, quantitys) f_macro_memory_structure_decimate(status, quantitys, f_string_quantity_t); + #define f_macro_string_quantitys_t_decimate_by(status, quantitys, amount) f_macro_memory_structure_decimate_by(status, quantitys, f_string_quantity_t, amount); - #define f_macro_string_quantitys_t_delete(status, quantitys) f_macro_memory_structure_t_delete(status, quantitys, f_string_quantity_t) - #define f_macro_string_quantitys_t_destroy(status, quantitys) f_macro_memory_structure_t_destroy(status, quantitys, f_string_quantity_t) + #define f_macro_string_quantitys_t_decrease(status, quantitys) f_macro_memory_structure_decrease(status, quantitys, f_string_quantity_t); + #define f_macro_string_quantitys_t_decrease_by(status, quantitys, amount) f_macro_memory_structure_decrease_by(status, quantitys, f_string_quantity_t, amount); + #define f_macro_string_quantitys_t_delete(status, quantitys) f_macro_memory_structure_t_delete(status, quantitys, f_string_quantity_t) #define f_macro_string_quantitys_t_delete_simple(quantitys) f_macro_memory_structure_t_delete_simple(quantitys, f_string_quantity_t) - #define f_macro_string_quantitys_t_destroy_simple(quantitys) f_macro_memory_structure_t_destroy_simple(quantitys, f_string_quantity_t) + + #define f_macro_string_quantitys_t_destroy(status, quantitys) f_macro_memory_structure_t_destroy(status, quantitys, f_string_quantity_t) + #define f_macro_string_quantitys_t_destroy_simple(quantitys) f_macro_memory_structure_t_destroy_simple(quantitys, f_string_quantity_t) + + #define f_macro_string_quantitys_t_increase(status, quantitys) f_macro_memory_structure_increase(status, quantitys, f_string_quantity_t); + #define f_macro_string_quantitys_t_increase_by(status, quantitys, amount) f_macro_memory_structure_increase_by(status, quantitys, f_string_quantity_t, amount); + + #define f_macro_string_quantitys_t_new(status, quantitys, length) f_macro_memory_structure_t_new(status, quantitys, f_string_quantity_t, length) #define f_macro_string_quantitys_t_resize(status, quantitys, new_length) f_macro_memory_structure_t_resize(status, quantitys, f_string_quantity_t, new_length) - #define f_macro_string_quantitys_t_adjust(status, quantitys, new_length) f_macro_memory_structure_t_adjust(status, quantitys, f_string_quantity_t, new_length) #endif // _di_f_string_quantitys_t_ /** diff --git a/level_0/f_string/c/string_range.h b/level_0/f_string/c/string_range.h index 5881fbc..2750353 100644 --- a/level_0/f_string/c/string_range.h +++ b/level_0/f_string/c/string_range.h @@ -60,18 +60,28 @@ extern "C" { #define f_string_ranges_t_initialize {0, 0, 0} + #define f_macro_string_ranges_t_adjust(status, ranges, length) f_macro_memory_structure_t_adjust(status, ranges, f_string_range_t, length) + #define f_macro_string_ranges_t_clear(ranges) f_macro_memory_structure_t_clear(ranges) - #define f_macro_string_ranges_t_new(status, ranges, length) f_macro_memory_structure_t_new(status, ranges, f_string_range_t, length) + #define f_macro_string_ranges_t_decimate(status, ranges) f_macro_memory_structure_decimate(status, ranges, f_string_range_t); + #define f_macro_string_ranges_t_decimate_by(status, ranges, amount) f_macro_memory_structure_decimate_by(status, ranges, f_string_range_t, amount); - #define f_macro_string_ranges_t_delete(status, ranges) f_macro_memory_structure_t_delete(status, ranges, f_string_range_t) - #define f_macro_string_ranges_t_destroy(status, ranges) f_macro_memory_structure_t_destroy(status, ranges, f_string_range_t) + #define f_macro_string_ranges_t_decrease(status, ranges) f_macro_memory_structure_decrease(status, ranges, f_string_range_t); + #define f_macro_string_ranges_t_decrease_by(status, ranges, amount) f_macro_memory_structure_decrease_by(status, ranges, f_string_range_t, amount); + #define f_macro_string_ranges_t_delete(status, ranges) f_macro_memory_structure_t_delete(status, ranges, f_string_range_t) #define f_macro_string_ranges_t_delete_simple(ranges) f_macro_memory_structure_t_delete_simple(ranges, f_string_range_t) - #define f_macro_string_ranges_t_destroy_simple(ranges) f_macro_memory_structure_t_destroy_simple(ranges, f_string_range_t) + + #define f_macro_string_ranges_t_destroy(status, ranges) f_macro_memory_structure_t_destroy(status, ranges, f_string_range_t) + #define f_macro_string_ranges_t_destroy_simple(ranges) f_macro_memory_structure_t_destroy_simple(ranges, f_string_range_t) + + #define f_macro_string_ranges_t_increase(status, ranges) f_macro_memory_structure_increase(status, ranges, f_string_range_t); + #define f_macro_string_ranges_t_increase_by(status, ranges, amount) f_macro_memory_structure_increase_by(status, ranges, f_string_range_t, amount); + + #define f_macro_string_ranges_t_new(status, ranges, length) f_macro_memory_structure_t_new(status, ranges, f_string_range_t, length) #define f_macro_string_ranges_t_resize(status, ranges, new_length) f_macro_memory_structure_t_resize(status, ranges, f_string_range_t, new_length) - #define f_macro_string_ranges_t_adjust(status, ranges, new_length) f_macro_memory_structure_t_adjust(status, ranges, f_string_range_t, new_length) #endif // _di_f_string_ranges_t_ /** diff --git a/level_0/f_thread/c/private-thread.c b/level_0/f_thread/c/private-thread.c deleted file mode 100644 index 1b8152d..0000000 --- a/level_0/f_thread/c/private-thread.c +++ /dev/null @@ -1,190 +0,0 @@ -#include "thread.h" -#include "private-thread.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#if !defined(_di_f_thread_attributes_decrease_) || !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_delete_) - f_return_status private_f_thread_attributes_delete(f_thread_attributes_t *attributes) { - f_status_t status = F_none; - - f_macro_thread_attributes_t_delete(status, (*attributes)); - - return status; - } -#endif // !defined(_di_f_thread_attributes_decrease_) || !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_delete_) - -#if !defined(_di_f_thread_attributes_decrease_) || !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_increase_) || !defined(_di_f_thread_attributes_increase_by_) - f_return_status private_f_thread_attributes_resize(const f_array_length_t length, f_thread_attributes_t *attributes) { - f_status_t status = F_none; - - f_macro_thread_attributes_t_resize(status, (*attributes), length); - - return status; - } -#endif // !defined(_di_f_thread_attributes_decrease_) || !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_increase_) || !defined(_di_f_thread_attributes_increase_by_) - -#if !defined(_di_f_thread_conditions_decrease_) || !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_delete_) - f_return_status private_f_thread_conditions_delete(f_thread_conditions_t *conditions) { - f_status_t status = F_none; - - f_macro_thread_conditions_t_delete(status, (*conditions)); - - return status; - } -#endif // !defined(_di_f_thread_conditions_decrease_) || !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_delete_) - -#if !defined(_di_f_thread_conditions_decrease_) || !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_increase_) || !defined(_di_f_thread_conditions_increase_by_) - f_return_status private_f_thread_conditions_resize(const f_array_length_t length, f_thread_conditions_t *conditions) { - f_status_t status = F_none; - - f_macro_thread_conditions_t_resize(status, (*conditions), length); - - return status; - } -#endif // !defined(_di_f_thread_conditions_decrease_) || !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_increase_) || !defined(_di_f_thread_conditions_increase_by_) - -#if !defined(_di_f_thread_ids_decrease_) || !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_delete_) - f_return_status private_f_thread_ids_delete(f_thread_ids_t *ids) { - f_status_t status = F_none; - - f_macro_thread_ids_t_delete(status, (*ids)); - - return status; - } -#endif // !defined(_di_f_thread_ids_decrease_) || !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_delete_) - -#if !defined(_di_f_thread_ids_decrease_) || !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_increase_) || !defined(_di_f_thread_ids_increase_by_) - f_return_status private_f_thread_ids_resize(const f_array_length_t length, f_thread_ids_t *ids) { - f_status_t status = F_none; - - f_macro_thread_ids_t_resize(status, (*ids), length); - - return status; - } -#endif // !defined(_di_f_thread_ids_decrease_) || !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_increase_) || !defined(_di_f_thread_ids_increase_by_) - -#if !defined(_di_f_thread_keys_decrease_) || !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_delete_) - f_return_status private_f_thread_keys_delete(f_thread_keys_t *keys) { - f_status_t status = F_none; - - f_macro_thread_keys_t_delete(status, (*keys)); - - return status; - } -#endif // !defined(_di_f_thread_keys_decrease_) || !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_delete_) - -#if !defined(_di_f_thread_keys_decrease_) || !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_increase_) || !defined(_di_f_thread_keys_increase_by_) - f_return_status private_f_thread_keys_resize(const f_array_length_t length, f_thread_keys_t *keys) { - f_status_t status = F_none; - - f_macro_thread_keys_t_resize(status, (*keys), length); - - return status; - } -#endif // !defined(_di_f_thread_keys_decrease_) || !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_increase_) || !defined(_di_f_thread_keys_increase_by_) - -#if !defined(_di_f_thread_locks_decrease_) || !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_delete_) - f_return_status private_f_thread_locks_delete(f_thread_locks_t *locks) { - f_status_t status = F_none; - - f_macro_thread_locks_t_delete(status, (*locks)); - - return status; - } -#endif // !defined(_di_f_thread_locks_decrease_) || !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_delete_) - -#if !defined(_di_f_thread_locks_decrease_) || !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_increase_) || !defined(_di_f_thread_locks_increase_by_) - f_return_status private_f_thread_locks_resize(const f_array_length_t length, f_thread_locks_t *locks) { - f_status_t status = F_none; - - f_macro_thread_locks_t_resize(status, (*locks), length); - - return status; - } -#endif // !defined(_di_f_thread_locks_decrease_) || !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_increase_) || !defined(_di_f_thread_locks_increase_by_) - -#if !defined(_di_f_thread_mutexs_decrease_) || !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_delete_) - f_return_status private_f_thread_mutexs_delete(f_thread_mutexs_t *mutexs) { - f_status_t status = F_none; - - f_macro_thread_mutexs_t_delete(status, (*mutexs)); - - return status; - } -#endif // !defined(_di_f_thread_mutexs_decrease_) || !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_delete_) - -#if !defined(_di_f_thread_mutexs_decrease_) || !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_increase_) || !defined(_di_f_thread_mutexs_increase_by_) - f_return_status private_f_thread_mutexs_resize(const f_array_length_t length, f_thread_mutexs_t *mutexs) { - f_status_t status = F_none; - - f_macro_thread_mutexs_t_resize(status, (*mutexs), length); - - return status; - } -#endif // !defined(_di_f_thread_mutexs_decrease_) || !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_increase_) || !defined(_di_f_thread_mutexs_increase_by_) - -#if !defined(_di_f_thread_mutex_attributes_decrease_) || !defined(_di_f_thread_mutex_attributes_decrease_by_) || !defined(_di_f_thread_mutex_attributes_delete_) - f_return_status private_f_thread_mutex_attributes_delete(f_thread_mutex_attributes_t *mutex_attributes) { - f_status_t status = F_none; - - f_macro_thread_mutex_attributes_t_delete(status, (*mutex_attributes)); - - return status; - } -#endif // !defined(_di_f_thread_mutex_attributes_decrease_) || !defined(_di_f_thread_mutex_attributes_decrease_by_) || !defined(_di_f_thread_mutex_attributes_delete_) - -#if !defined(_di_f_thread_mutex_attributes_decrease_) || !defined(_di_f_thread_mutex_attributes_decrease_by_) || !defined(_di_f_thread_mutex_attributes_increase_) || !defined(_di_f_thread_mutex_attributes_increase_by_) - f_return_status private_f_thread_mutex_attributes_resize(const f_array_length_t length, f_thread_mutex_attributes_t *mutex_attributes) { - f_status_t status = F_none; - - f_macro_thread_mutex_attributes_t_resize(status, (*mutex_attributes), length); - - return status; - } -#endif // !defined(_di_f_thread_mutex_attributes_decrease_) || !defined(_di_f_thread_mutex_attributes_decrease_by_) || !defined(_di_f_thread_mutex_attributes_increase_) || !defined(_di_f_thread_mutex_attributes_increase_by_) - -#if !defined(_di_f_thread_onces_decrease_) || !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_delete_) - f_return_status private_f_thread_onces_delete(f_thread_onces_t *onces) { - f_status_t status = F_none; - - f_macro_thread_onces_t_delete(status, (*onces)); - - return status; - } -#endif // !defined(_di_f_thread_onces_decrease_) || !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_delete_) - -#if !defined(_di_f_thread_onces_decrease_) || !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_increase_) || !defined(_di_f_thread_onces_increase_by_) - f_return_status private_f_thread_onces_resize(const f_array_length_t length, f_thread_onces_t *onces) { - f_status_t status = F_none; - - f_macro_thread_onces_t_resize(status, (*onces), length); - - return status; - } -#endif // !defined(_di_f_thread_onces_decrease_) || !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_increase_) || !defined(_di_f_thread_onces_increase_by_) - -#if !defined(_di_f_thread_sets_decrease_) || !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_delete_) - f_return_status private_f_thread_sets_delete(f_thread_sets_t *sets) { - f_status_t status = F_none; - - f_macro_thread_sets_t_delete(status, (*sets)); - - return status; - } -#endif // !defined(_di_f_thread_sets_decrease_) || !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_delete_) - -#if !defined(_di_f_thread_sets_decrease_) || !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_increase_) || !defined(_di_f_thread_sets_increase_by_) - f_return_status private_f_thread_sets_resize(const f_array_length_t length, f_thread_sets_t *sets) { - f_status_t status = F_none; - - f_macro_thread_sets_t_resize(status, (*sets), length); - - return status; - } -#endif // !defined(_di_f_thread_sets_decrease_) || !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_increase_) || !defined(_di_f_thread_sets_increase_by_) - -#ifdef __cplusplus -} // extern "C" -#endif diff --git a/level_0/f_thread/c/private-thread.h b/level_0/f_thread/c/private-thread.h deleted file mode 100644 index e555737..0000000 --- a/level_0/f_thread/c/private-thread.h +++ /dev/null @@ -1,445 +0,0 @@ -/** - * FLL - Level 1 - * - * Project: String - * 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_F_thread_h -#define _PRIVATE_F_thread_h - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Private implementation of f_thread_attributes_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param attributes - * The attributes to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_attributes_t_delete(). - * - * @see f_macro_thread_attributes_t_delete() - * @see f_thread_attributes_decrease() - * @see f_thread_attributes_decrease_by() - * @see f_thread_attributes_delete() - */ -#if !defined(_di_f_thread_attributes_decrease_) || !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_delete_) - extern f_return_status private_f_thread_attributes_delete(f_thread_attributes_t *attributes) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_attributes_decrease_) || !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param attributes - * The attributes to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_attributes_t_resize(). - * - * @see f_macro_thread_attributes_t_resize() - * @see f_thread_attributes_decrease() - * @see f_thread_attributes_decrease_by() - * @see f_thread_attributes_increase() - * @see f_thread_attributes_increase_by() - */ -#if !defined(_di_f_thread_attributes_decrease_) || !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_increase_) || !defined(_di_f_thread_attributes_increase_by_) - extern f_return_status private_f_thread_attributes_resize(const f_array_length_t length, f_thread_attributes_t *attributes) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_attributes_decrease_) || !defined(_di_f_thread_attributes_decrease_by_) || !defined(_di_f_thread_attributes_increase_) || !defined(_di_f_thread_attributes_increase_by_) - -/** - * Private implementation of f_thread_conditions_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param conditions - * The conditions to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_conditions_t_delete(). - * - * @see f_macro_thread_conditions_t_delete() - * @see f_thread_conditions_decrease() - * @see f_thread_conditions_decrease_by() - * @see f_thread_conditions_delete() - */ -#if !defined(_di_f_thread_conditions_decrease_) || !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_delete_) - extern f_return_status private_f_thread_conditions_delete(f_thread_conditions_t *conditions) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_conditions_decrease_) || !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param conditions - * The conditions to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_conditions_t_resize(). - * - * @see f_macro_thread_conditions_t_resize() - * @see f_thread_conditions_decrease() - * @see f_thread_conditions_decrease_by() - * @see f_thread_conditions_increase() - * @see f_thread_conditions_increase_by() - */ -#if !defined(_di_f_thread_conditions_decrease_) || !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_increase_) || !defined(_di_f_thread_conditions_increase_by_) - extern f_return_status private_f_thread_conditions_resize(const f_array_length_t length, f_thread_conditions_t *conditions) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_conditions_decrease_) || !defined(_di_f_thread_conditions_decrease_by_) || !defined(_di_f_thread_conditions_increase_) || !defined(_di_f_thread_conditions_increase_by_) - -/** - * Private implementation of f_thread_ids_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param ids - * The ids to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_ids_t_delete(). - * - * @see f_macro_thread_ids_t_delete() - * @see f_thread_ids_decrease() - * @see f_thread_ids_decrease_by() - * @see f_thread_ids_delete() - */ -#if !defined(_di_f_thread_ids_decrease_) || !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_delete_) - extern f_return_status private_f_thread_ids_delete(f_thread_ids_t *ids) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_ids_decrease_) || !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param ids - * The ids to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_ids_t_resize(). - * - * @see f_macro_thread_ids_t_resize() - * @see f_thread_ids_decrease() - * @see f_thread_ids_decrease_by() - * @see f_thread_ids_increase() - * @see f_thread_ids_increase_by() - */ -#if !defined(_di_f_thread_ids_decrease_) || !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_increase_) || !defined(_di_f_thread_ids_increase_by_) - extern f_return_status private_f_thread_ids_resize(const f_array_length_t length, f_thread_ids_t *ids) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_ids_decrease_) || !defined(_di_f_thread_ids_decrease_by_) || !defined(_di_f_thread_ids_increase_) || !defined(_di_f_thread_ids_increase_by_) - -/** - * Private implementation of f_thread_keys_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param keys - * The keys to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_keys_t_delete(). - * - * @see f_macro_thread_keys_t_delete() - * @see f_thread_keys_decrease() - * @see f_thread_keys_decrease_by() - * @see f_thread_keys_delete() - */ -#if !defined(_di_f_thread_keys_decrease_) || !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_delete_) - extern f_return_status private_f_thread_keys_delete(f_thread_keys_t *keys) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_keys_decrease_) || !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param keys - * The keys to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_keys_t_resize(). - * - * @see f_macro_thread_keys_t_resize() - * @see f_thread_keys_decrease() - * @see f_thread_keys_decrease_by() - * @see f_thread_keys_increase() - * @see f_thread_keys_increase_by() - */ -#if !defined(_di_f_thread_keys_decrease_) || !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_increase_) || !defined(_di_f_thread_keys_increase_by_) - extern f_return_status private_f_thread_keys_resize(const f_array_length_t length, f_thread_keys_t *keys) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_keys_decrease_) || !defined(_di_f_thread_keys_decrease_by_) || !defined(_di_f_thread_keys_increase_) || !defined(_di_f_thread_keys_increase_by_) - -/** - * Private implementation of f_thread_locks_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param locks - * The locks to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_locks_t_delete(). - * - * @see f_macro_thread_locks_t_delete() - * @see f_thread_locks_decrease() - * @see f_thread_locks_decrease_by() - * @see f_thread_locks_delete() - */ -#if !defined(_di_f_thread_locks_decrease_) || !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_delete_) - extern f_return_status private_f_thread_locks_delete(f_thread_locks_t *locks) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_locks_decrease_) || !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param locks - * The locks to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_locks_t_resize(). - * - * @see f_macro_thread_locks_t_resize() - * @see f_thread_locks_decrease() - * @see f_thread_locks_decrease_by() - * @see f_thread_locks_increase() - * @see f_thread_locks_increase_by() - */ -#if !defined(_di_f_thread_locks_decrease_) || !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_increase_) || !defined(_di_f_thread_locks_increase_by_) - extern f_return_status private_f_thread_locks_resize(const f_array_length_t length, f_thread_locks_t *locks) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_locks_decrease_) || !defined(_di_f_thread_locks_decrease_by_) || !defined(_di_f_thread_locks_increase_) || !defined(_di_f_thread_locks_increase_by_) - -/** - * Private implementation of f_thread_mutexs_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param mutexs - * The mutexs to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_mutexs_t_delete(). - * - * @see f_macro_thread_mutexs_t_delete() - * @see f_thread_mutexs_decrease() - * @see f_thread_mutexs_decrease_by() - * @see f_thread_mutexs_delete() - */ -#if !defined(_di_f_thread_mutexs_decrease_) || !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_delete_) - extern f_return_status private_f_thread_mutexs_delete(f_thread_mutexs_t *mutexs) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_mutexs_decrease_) || !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param mutexs - * The mutexs to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_mutexs_t_resize(). - * - * @see f_macro_thread_mutexs_t_resize() - * @see f_thread_mutexs_decrease() - * @see f_thread_mutexs_decrease_by() - * @see f_thread_mutexs_increase() - * @see f_thread_mutexs_increase_by() - */ -#if !defined(_di_f_thread_mutexs_decrease_) || !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_increase_) || !defined(_di_f_thread_mutexs_increase_by_) - extern f_return_status private_f_thread_mutexs_resize(const f_array_length_t length, f_thread_mutexs_t *mutexs) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_mutexs_decrease_) || !defined(_di_f_thread_mutexs_decrease_by_) || !defined(_di_f_thread_mutexs_increase_) || !defined(_di_f_thread_mutexs_increase_by_) - -/** - * Private implementation of f_thread_mutex_attributes_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param mutex_attributes - * The mutex_attributes to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_mutex_attributes_t_delete(). - * - * @see f_macro_thread_mutex_attributes_t_delete() - * @see f_thread_mutex_attributes_decrease() - * @see f_thread_mutex_attributes_decrease_by() - * @see f_thread_mutex_attributes_delete() - */ -#if !defined(_di_f_thread_mutex_attributes_decrease_) || !defined(_di_f_thread_mutex_attributes_decrease_by_) || !defined(_di_f_thread_mutex_attributes_delete_) - extern f_return_status private_f_thread_mutex_attributes_delete(f_thread_mutex_attributes_t *mutex_attributes) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_mutex_attributes_decrease_) || !defined(_di_f_thread_mutex_attributes_decrease_by_) || !defined(_di_f_thread_mutex_attributes_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param mutex_attributes - * The mutex_attributes to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_mutex_attributes_t_resize(). - * - * @see f_macro_thread_mutex_attributes_t_resize() - * @see f_thread_mutex_attributes_decrease() - * @see f_thread_mutex_attributes_decrease_by() - * @see f_thread_mutex_attributes_increase() - * @see f_thread_mutex_attributes_increase_by() - */ -#if !defined(_di_f_thread_mutex_attributes_decrease_) || !defined(_di_f_thread_mutex_attributes_decrease_by_) || !defined(_di_f_thread_mutex_attributes_increase_) || !defined(_di_f_thread_mutex_attributes_increase_by_) - extern f_return_status private_f_thread_mutex_attributes_resize(const f_array_length_t length, f_thread_mutex_attributes_t *mutex_attributes) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_mutex_attributes_decrease_) || !defined(_di_f_thread_mutex_attributes_decrease_by_) || !defined(_di_f_thread_mutex_attributes_increase_) || !defined(_di_f_thread_mutex_attributes_increase_by_) - -/** - * Private implementation of f_thread_onces_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param onces - * The onces to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_onces_t_delete(). - * - * @see f_macro_thread_onces_t_delete() - * @see f_thread_onces_decrease() - * @see f_thread_onces_decrease_by() - * @see f_thread_onces_delete() - */ -#if !defined(_di_f_thread_onces_decrease_) || !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_delete_) - extern f_return_status private_f_thread_onces_delete(f_thread_onces_t *onces) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_onces_decrease_) || !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param onces - * The onces to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_onces_t_resize(). - * - * @see f_macro_thread_onces_t_resize() - * @see f_thread_onces_decrease() - * @see f_thread_onces_decrease_by() - * @see f_thread_onces_increase() - * @see f_thread_onces_increase_by() - */ -#if !defined(_di_f_thread_onces_decrease_) || !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_increase_) || !defined(_di_f_thread_onces_increase_by_) - extern f_return_status private_f_thread_onces_resize(const f_array_length_t length, f_thread_onces_t *onces) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_onces_decrease_) || !defined(_di_f_thread_onces_decrease_by_) || !defined(_di_f_thread_onces_increase_) || !defined(_di_f_thread_onces_increase_by_) - -/** - * Private implementation of f_thread_sets_delete(). - * - * Intended to be shared to each of the different implementation variations. - * - * @param sets - * The sets to delete. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_sets_t_delete(). - * - * @see f_macro_thread_sets_t_delete() - * @see f_thread_sets_decrease() - * @see f_thread_sets_decrease_by() - * @see f_thread_sets_delete() - */ -#if !defined(_di_f_thread_sets_decrease_) || !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_delete_) - extern f_return_status private_f_thread_sets_delete(f_thread_sets_t *sets) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_sets_decrease_) || !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_delete_) - -/** - * Private implementation for resizing. - * - * Intended to be shared to each of the different implementation variations. - * - * @param length - * The new size to use. - * @param sets - * The sets to resize. - * - * @return - * F_none on success. - * - * Errors (with error bit) from: f_macro_thread_sets_t_resize(). - * - * @see f_macro_thread_sets_t_resize() - * @see f_thread_sets_decrease() - * @see f_thread_sets_decrease_by() - * @see f_thread_sets_increase() - * @see f_thread_sets_increase_by() - */ -#if !defined(_di_f_thread_sets_decrease_) || !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_increase_) || !defined(_di_f_thread_sets_increase_by_) - extern f_return_status private_f_thread_sets_resize(const f_array_length_t length, f_thread_sets_t *sets) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_f_thread_sets_decrease_) || !defined(_di_f_thread_sets_decrease_by_) || !defined(_di_f_thread_sets_increase_) || !defined(_di_f_thread_sets_increase_by_) - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // _PRIVATE_F_thread_h diff --git a/level_0/f_thread/c/thread-common.h b/level_0/f_thread/c/thread-common.h index 21be3e9..8e2fcd3 100644 --- a/level_0/f_thread/c/thread-common.h +++ b/level_0/f_thread/c/thread-common.h @@ -45,18 +45,28 @@ extern "C" { #define f_thread_attributes_t_initialize { 0, 0, 0 } + #define f_macro_thread_attributes_t_adjust(status, attributes, length) f_macro_memory_structure_t_adjust(status, attributes, f_thread_attribute_t, length) + #define f_macro_thread_attributes_t_clear(attributes) f_macro_memory_structure_t_clear(attributes) - #define f_macro_thread_attributes_t_new(status, attributes, length) f_macro_memory_structure_t_new(status, attributes, f_thread_attribute_t, length) + #define f_macro_thread_attributes_t_decimate(status, attributes) f_macro_memory_structure_decimate(status, attributes, f_thread_attribute_t); + #define f_macro_thread_attributes_t_decimate_by(status, attributes, amount) f_macro_memory_structure_decimate_by(status, attributes, f_thread_attribute_t, amount); - #define f_macro_thread_attributes_t_delete(status, attributes) f_macro_memory_structure_t_delete(status, attributes, f_thread_attribute_t) - #define f_macro_thread_attributes_t_destroy(status, attributes) f_macro_memory_structure_t_destroy(status, attributes, f_thread_attribute_t) + #define f_macro_thread_attributes_t_decrease(status, attributes) f_macro_memory_structure_decrease(status, attributes, f_thread_attribute_t); + #define f_macro_thread_attributes_t_decrease_by(status, attributes, amount) f_macro_memory_structure_decrease_by(status, attributes, f_thread_attribute_t, amount); + #define f_macro_thread_attributes_t_delete(status, attributes) f_macro_memory_structure_t_delete(status, attributes, f_thread_attribute_t) #define f_macro_thread_attributes_t_delete_simple(attributes) f_macro_memory_structure_t_delete_simple(attributes, f_thread_attribute_t) - #define f_macro_thread_attributes_t_destroy_simple(attributes) f_macro_memory_structure_t_destroy_simple(attributes, f_thread_attribute_t) + + #define f_macro_thread_attributes_t_destroy(status, attributes) f_macro_memory_structure_t_destroy(status, attributes, f_thread_attribute_t) + #define f_macro_thread_attributes_t_destroy_simple(attributes) f_macro_memory_structure_t_destroy_simple(attributes, f_thread_attribute_t) + + #define f_macro_thread_attributes_t_increase(status, attributes) f_macro_memory_structure_increase(status, attributes, f_thread_attribute_t); + #define f_macro_thread_attributes_t_increase_by(status, attributes, amount) f_macro_memory_structure_increase_by(status, attributes, f_thread_attribute_t, amount); + + #define f_macro_thread_attributes_t_new(status, attributes, length) f_macro_memory_structure_t_new(status, attributes, f_thread_attribute_t, length) #define f_macro_thread_attributes_t_resize(status, attributes, new_length) f_macro_memory_structure_t_resize(status, attributes, f_thread_attribute_t, new_length) - #define f_macro_thread_attributes_t_adjust(status, attributes, new_length) f_macro_memory_structure_t_adjust(status, attributes, f_thread_attribute_t, new_length) #endif // _di_f_thread_attributes_t_ /** @@ -87,18 +97,28 @@ extern "C" { #define f_thread_conditions_t_initialize { 0, 0, 0 } + #define f_macro_thread_conditions_t_adjust(status, conditions, length) f_macro_memory_structure_t_adjust(status, conditions, f_thread_condition_t, length) + #define f_macro_thread_conditions_t_clear(conditions) f_macro_memory_structure_t_clear(conditions) - #define f_macro_thread_conditions_t_new(status, conditions, length) f_macro_memory_structure_t_new(status, conditions, f_thread_condition_t, length) + #define f_macro_thread_conditions_t_decimate(status, conditions) f_macro_memory_structure_decimate(status, conditions, f_thread_condition_t); + #define f_macro_thread_conditions_t_decimate_by(status, conditions, amount) f_macro_memory_structure_decimate_by(status, conditions, f_thread_condition_t, amount); - #define f_macro_thread_conditions_t_delete(status, conditions) f_macro_memory_structure_t_delete(status, conditions, f_thread_condition_t) - #define f_macro_thread_conditions_t_destroy(status, conditions) f_macro_memory_structure_t_destroy(status, conditions, f_thread_condition_t) + #define f_macro_thread_conditions_t_decrease(status, conditions) f_macro_memory_structure_decrease(status, conditions, f_thread_condition_t); + #define f_macro_thread_conditions_t_decrease_by(status, conditions, amount) f_macro_memory_structure_decrease_by(status, conditions, f_thread_condition_t, amount); + #define f_macro_thread_conditions_t_delete(status, conditions) f_macro_memory_structure_t_delete(status, conditions, f_thread_condition_t) #define f_macro_thread_conditions_t_delete_simple(conditions) f_macro_memory_structure_t_delete_simple(conditions, f_thread_condition_t) - #define f_macro_thread_conditions_t_destroy_simple(conditions) f_macro_memory_structure_t_destroy_simple(conditions, f_thread_condition_t) + + #define f_macro_thread_conditions_t_destroy(status, conditions) f_macro_memory_structure_t_destroy(status, conditions, f_thread_condition_t) + #define f_macro_thread_conditions_t_destroy_simple(conditions) f_macro_memory_structure_t_destroy_simple(conditions, f_thread_condition_t) + + #define f_macro_thread_conditions_t_increase(status, conditions) f_macro_memory_structure_increase(status, conditions, f_thread_condition_t); + #define f_macro_thread_conditions_t_increase_by(status, conditions, amount) f_macro_memory_structure_increase_by(status, conditions, f_thread_condition_t, amount); + + #define f_macro_thread_conditions_t_new(status, conditions, length) f_macro_memory_structure_t_new(status, conditions, f_thread_condition_t, length) #define f_macro_thread_conditions_t_resize(status, conditions, new_length) f_macro_memory_structure_t_resize(status, conditions, f_thread_condition_t, new_length) - #define f_macro_thread_conditions_t_adjust(status, conditions, new_length) f_macro_memory_structure_t_adjust(status, conditions, f_thread_condition_t, new_length) #endif // _di_f_thread_conditions_t_ /** @@ -129,18 +149,28 @@ extern "C" { #define f_thread_ids_t_initialize { 0, 0, 0 } + #define f_macro_thread_ids_t_adjust(status, ids, length) f_macro_memory_structure_t_adjust(status, ids, f_thread_ids_t, length) + #define f_macro_thread_ids_t_clear(ids) f_macro_memory_structure_t_clear(ids) - #define f_macro_thread_ids_t_new(status, ids, length) f_macro_memory_structure_t_new(status, ids, f_thread_ids_t, length) + #define f_macro_thread_ids_t_decimate(status, ids) f_macro_memory_structure_decimate(status, ids, f_thread_ids_t); + #define f_macro_thread_ids_t_decimate_by(status, ids, amount) f_macro_memory_structure_decimate_by(status, ids, f_thread_ids_t, amount); - #define f_macro_thread_ids_t_delete(status, ids) f_macro_memory_structure_t_delete(status, ids, f_thread_ids_t) - #define f_macro_thread_ids_t_destroy(status, ids) f_macro_memory_structure_t_destroy(status, ids, f_thread_ids_t) + #define f_macro_thread_ids_t_decrease(status, ids) f_macro_memory_structure_decrease(status, ids, f_thread_ids_t); + #define f_macro_thread_ids_t_decrease_by(status, ids, amount) f_macro_memory_structure_decrease_by(status, ids, f_thread_ids_t, amount); + #define f_macro_thread_ids_t_delete(status, ids) f_macro_memory_structure_t_delete(status, ids, f_thread_ids_t) #define f_macro_thread_ids_t_delete_simple(ids) f_macro_memory_structure_t_delete_simple(ids, f_thread_ids_t) - #define f_macro_thread_ids_t_destroy_simple(ids) f_macro_memory_structure_t_destroy_simple(ids, f_thread_ids_t) + + #define f_macro_thread_ids_t_destroy(status, ids) f_macro_memory_structure_t_destroy(status, ids, f_thread_ids_t) + #define f_macro_thread_ids_t_destroy_simple(ids) f_macro_memory_structure_t_destroy_simple(ids, f_thread_ids_t) + + #define f_macro_thread_ids_t_increase(status, ids) f_macro_memory_structure_increase(status, ids, f_thread_ids_t); + #define f_macro_thread_ids_t_increase_by(status, ids, amount) f_macro_memory_structure_increase_by(status, ids, f_thread_ids_t, amount); + + #define f_macro_thread_ids_t_new(status, ids, length) f_macro_memory_structure_t_new(status, ids, f_thread_ids_t, length) #define f_macro_thread_ids_t_resize(status, ids, new_length) f_macro_memory_structure_t_resize(status, ids, f_thread_ids_t, new_length) - #define f_macro_thread_ids_t_adjust(status, ids, new_length) f_macro_memory_structure_t_adjust(status, ids, f_thread_ids_t, new_length) #endif // _di_f_thread_ids_t_ /** @@ -171,18 +201,28 @@ extern "C" { #define f_thread_keys_t_initialize { 0, 0, 0 } + #define f_macro_thread_keys_t_adjust(status, keys, length) f_macro_memory_structure_t_adjust(status, keys, f_thread_key_t, length) + #define f_macro_thread_keys_t_clear(keys) f_macro_memory_structure_t_clear(keys) - #define f_macro_thread_keys_t_new(status, keys, length) f_macro_memory_structure_t_new(status, keys, f_thread_key_t, length) + #define f_macro_thread_keys_t_decimate(status, keys) f_macro_memory_structure_decimate(status, keys, f_thread_key_t); + #define f_macro_thread_keys_t_decimate_by(status, keys, amount) f_macro_memory_structure_decimate_by(status, keys, f_thread_key_t, amount); - #define f_macro_thread_keys_t_delete(status, keys) f_macro_memory_structure_t_delete(status, keys, f_thread_key_t) - #define f_macro_thread_keys_t_destroy(status, keys) f_macro_memory_structure_t_destroy(status, keys, f_thread_key_t) + #define f_macro_thread_keys_t_decrease(status, keys) f_macro_memory_structure_decrease(status, keys, f_thread_key_t); + #define f_macro_thread_keys_t_decrease_by(status, keys, amount) f_macro_memory_structure_decrease_by(status, keys, f_thread_key_t, amount); + #define f_macro_thread_keys_t_delete(status, keys) f_macro_memory_structure_t_delete(status, keys, f_thread_key_t) #define f_macro_thread_keys_t_delete_simple(keys) f_macro_memory_structure_t_delete_simple(keys, f_thread_key_t) - #define f_macro_thread_keys_t_destroy_simple(keys) f_macro_memory_structure_t_destroy_simple(keys, f_thread_key_t) + + #define f_macro_thread_keys_t_destroy(status, keys) f_macro_memory_structure_t_destroy(status, keys, f_thread_key_t) + #define f_macro_thread_keys_t_destroy_simple(keys) f_macro_memory_structure_t_destroy_simple(keys, f_thread_key_t) + + #define f_macro_thread_keys_t_increase(status, keys) f_macro_memory_structure_increase(status, keys, f_thread_key_t); + #define f_macro_thread_keys_t_increase_by(status, keys, amount) f_macro_memory_structure_increase_by(status, keys, f_thread_key_t, amount); + + #define f_macro_thread_keys_t_new(status, keys, length) f_macro_memory_structure_t_new(status, keys, f_thread_key_t, length) #define f_macro_thread_keys_t_resize(status, keys, new_length) f_macro_memory_structure_t_resize(status, keys, f_thread_key_t, new_length) - #define f_macro_thread_keys_t_adjust(status, keys, new_length) f_macro_memory_structure_t_adjust(status, keys, f_thread_key_t, new_length) #endif // _di_f_thread_keys_t_ /** @@ -213,18 +253,28 @@ extern "C" { #define f_thread_locks_t_initialize { 0, 0, 0 } + #define f_macro_thread_locks_t_adjust(status, locks, length) f_macro_memory_structure_t_adjust(status, locks, f_thread_lock_t, length) + #define f_macro_thread_locks_t_clear(locks) f_macro_memory_structure_t_clear(locks) - #define f_macro_thread_locks_t_new(status, locks, length) f_macro_memory_structure_t_new(status, locks, f_thread_lock_t, length) + #define f_macro_thread_locks_t_decimate(status, locks) f_macro_memory_structure_decimate(status, locks, f_thread_lock_t); + #define f_macro_thread_locks_t_decimate_by(status, locks, amount) f_macro_memory_structure_decimate_by(status, locks, f_thread_lock_t, amount); - #define f_macro_thread_locks_t_delete(status, locks) f_macro_memory_structure_t_delete(status, locks, f_thread_lock_t) - #define f_macro_thread_locks_t_destroy(status, locks) f_macro_memory_structure_t_destroy(status, locks, f_thread_lock_t) + #define f_macro_thread_locks_t_decrease(status, locks) f_macro_memory_structure_decrease(status, locks, f_thread_lock_t); + #define f_macro_thread_locks_t_decrease_by(status, locks, amount) f_macro_memory_structure_decrease_by(status, locks, f_thread_lock_t, amount); + #define f_macro_thread_locks_t_delete(status, locks) f_macro_memory_structure_t_delete(status, locks, f_thread_lock_t) #define f_macro_thread_locks_t_delete_simple(locks) f_macro_memory_structure_t_delete_simple(locks, f_thread_lock_t) - #define f_macro_thread_locks_t_destroy_simple(locks) f_macro_memory_structure_t_destroy_simple(locks, f_thread_lock_t) + + #define f_macro_thread_locks_t_destroy(status, locks) f_macro_memory_structure_t_destroy(status, locks, f_thread_lock_t) + #define f_macro_thread_locks_t_destroy_simple(locks) f_macro_memory_structure_t_destroy_simple(locks, f_thread_lock_t) + + #define f_macro_thread_locks_t_increase(status, locks) f_macro_memory_structure_increase(status, locks, f_thread_lock_t); + #define f_macro_thread_locks_t_increase_by(status, locks, amount) f_macro_memory_structure_increase_by(status, locks, f_thread_lock_t, amount); + + #define f_macro_thread_locks_t_new(status, locks, length) f_macro_memory_structure_t_new(status, locks, f_thread_lock_t, length) #define f_macro_thread_locks_t_resize(status, locks, new_length) f_macro_memory_structure_t_resize(status, locks, f_thread_lock_t, new_length) - #define f_macro_thread_locks_t_adjust(status, locks, new_length) f_macro_memory_structure_t_adjust(status, locks, f_thread_lock_t, new_length) #endif // _di_f_thread_locks_t_ /** @@ -257,16 +307,28 @@ extern "C" { #define f_macro_thread_mutexs_t_clear(mutexs) f_macro_memory_structure_t_clear(mutexs) - #define f_macro_thread_mutexs_t_new(status, mutexs, length) f_macro_memory_structure_t_new(status, mutexs, f_thread_mutex_t, length) + #define f_macro_thread_mutexs_t_adjust(status, mutexs, length) f_macro_memory_structure_t_adjust(status, mutexs, f_thread_mutex_t, length) - #define f_macro_thread_mutexs_t_delete(status, mutexs) f_macro_memory_structure_t_delete(status, mutexs, f_thread_mutex_t) - #define f_macro_thread_mutexs_t_destroy(status, mutexs) f_macro_memory_structure_t_destroy(status, mutexs, f_thread_mutex_t) + #define f_macro_thread_mutexs_t_clear(mutexs) f_macro_memory_structure_t_clear(mutexs) + + #define f_macro_thread_mutexs_t_decimate(status, mutexs) f_macro_memory_structure_decimate(status, mutexs, f_thread_mutex_t); + #define f_macro_thread_mutexs_t_decimate_by(status, mutexs, amount) f_macro_memory_structure_decimate_by(status, mutexs, f_thread_mutex_t, amount); + + #define f_macro_thread_mutexs_t_decrease(status, mutexs) f_macro_memory_structure_decrease(status, mutexs, f_thread_mutex_t); + #define f_macro_thread_mutexs_t_decrease_by(status, mutexs, amount) f_macro_memory_structure_decrease_by(status, mutexs, f_thread_mutex_t, amount); + #define f_macro_thread_mutexs_t_delete(status, mutexs) f_macro_memory_structure_t_delete(status, mutexs, f_thread_mutex_t) #define f_macro_thread_mutexs_t_delete_simple(mutexs) f_macro_memory_structure_t_delete_simple(mutexs, f_thread_mutex_t) - #define f_macro_thread_mutexs_t_destroy_simple(mutexs) f_macro_memory_structure_t_destroy_simple(mutexs, f_thread_mutex_t) + + #define f_macro_thread_mutexs_t_destroy(status, mutexs) f_macro_memory_structure_t_destroy(status, mutexs, f_thread_mutex_t) + #define f_macro_thread_mutexs_t_destroy_simple(mutexs) f_macro_memory_structure_t_destroy_simple(mutexs, f_thread_mutex_t) + + #define f_macro_thread_mutexs_t_increase(status, mutexs) f_macro_memory_structure_increase(status, mutexs, f_thread_mutex_t); + #define f_macro_thread_mutexs_t_increase_by(status, mutexs, amount) f_macro_memory_structure_increase_by(status, mutexs, f_thread_mutex_t, amount); + + #define f_macro_thread_mutexs_t_new(status, mutexs, length) f_macro_memory_structure_t_new(status, mutexs, f_thread_mutex_t, length) #define f_macro_thread_mutexs_t_resize(status, mutexs, new_length) f_macro_memory_structure_t_resize(status, mutexs, f_thread_mutex_t, new_length) - #define f_macro_thread_mutexs_t_adjust(status, mutexs, new_length) f_macro_memory_structure_t_adjust(status, mutexs, f_thread_mutex_t, new_length) #endif // _di_f_thread_mutexs_t_ /** @@ -297,18 +359,28 @@ extern "C" { #define f_thread_mutex_attributes_t_initialize { 0, 0, 0 } + #define f_macro_thread_mutex_attributes_t_adjust(status, mutex_attributes, length) f_macro_memory_structure_t_adjust(status, mutex_attributes, f_thread_mutex_attribute_t, length) + #define f_macro_thread_mutex_attributes_t_clear(mutex_attributes) f_macro_memory_structure_t_clear(mutex_attributes) - #define f_macro_thread_mutex_attributes_t_new(status, mutex_attributes, length) f_macro_memory_structure_t_new(status, mutex_attributes, f_thread_mutex_attribute_t, length) + #define f_macro_thread_mutex_attributes_t_decimate(status, mutex_attributes) f_macro_memory_structure_decimate(status, mutex_attributes, f_thread_mutex_attribute_t); + #define f_macro_thread_mutex_attributes_t_decimate_by(status, mutex_attributes, amount) f_macro_memory_structure_decimate_by(status, mutex_attributes, f_thread_mutex_attribute_t, amount); - #define f_macro_thread_mutex_attributes_t_delete(status, mutex_attributes) f_macro_memory_structure_t_delete(status, mutex_attributes, f_thread_mutex_attribute_t) - #define f_macro_thread_mutex_attributes_t_destroy(status, mutex_attributes) f_macro_memory_structure_t_destroy(status, mutex_attributes, f_thread_mutex_attribute_t) + #define f_macro_thread_mutex_attributes_t_decrease(status, mutex_attributes) f_macro_memory_structure_decrease(status, mutex_attributes, f_thread_mutex_attribute_t); + #define f_macro_thread_mutex_attributes_t_decrease_by(status, mutex_attributes, amount) f_macro_memory_structure_decrease_by(status, mutex_attributes, f_thread_mutex_attribute_t, amount); + #define f_macro_thread_mutex_attributes_t_delete(status, mutex_attributes) f_macro_memory_structure_t_delete(status, mutex_attributes, f_thread_mutex_attribute_t) #define f_macro_thread_mutex_attributes_t_delete_simple(mutex_attributes) f_macro_memory_structure_t_delete_simple(mutex_attributes, f_thread_mutex_attribute_t) - #define f_macro_thread_mutex_attributes_t_destroy_simple(mutex_attributes) f_macro_memory_structure_t_destroy_simple(mutex_attributes, f_thread_mutex_attribute_t) + + #define f_macro_thread_mutex_attributes_t_destroy(status, mutex_attributes) f_macro_memory_structure_t_destroy(status, mutex_attributes, f_thread_mutex_attribute_t) + #define f_macro_thread_mutex_attributes_t_destroy_simple(mutex_attributes) f_macro_memory_structure_t_destroy_simple(mutex_attributes, f_thread_mutex_attribute_t) + + #define f_macro_thread_mutex_attributes_t_increase(status, mutex_attributes) f_macro_memory_structure_increase(status, mutex_attributes, f_thread_mutex_attribute_t); + #define f_macro_thread_mutex_attributes_t_increase_by(status, mutex_attributes, amount) f_macro_memory_structure_increase_by(status, mutex_attributes, f_thread_mutex_attribute_t, amount); + + #define f_macro_thread_mutex_attributes_t_new(status, mutex_attributes, length) f_macro_memory_structure_t_new(status, mutex_attributes, f_thread_mutex_attribute_t, length) #define f_macro_thread_mutex_attributes_t_resize(status, mutex_attributes, new_length) f_macro_memory_structure_t_resize(status, mutex_attributes, f_thread_mutex_attribute_t, new_length) - #define f_macro_thread_mutex_attributes_t_adjust(status, mutex_attributes, new_length) f_macro_memory_structure_t_adjust(status, mutex_attributes, f_thread_mutex_attribute_t, new_length) #endif // _di_f_thread_mutex_attributes_t_ /** @@ -339,18 +411,28 @@ extern "C" { #define f_thread_onces_t_initialize { 0, 0, 0 } + #define f_macro_thread_onces_t_adjust(status, onces, length) f_macro_memory_structure_t_adjust(status, onces, f_thread_once_t, length) + #define f_macro_thread_onces_t_clear(onces) f_macro_memory_structure_t_clear(onces) - #define f_macro_thread_onces_t_new(status, onces, length) f_macro_memory_structure_t_new(status, onces, f_thread_once_t, length) + #define f_macro_thread_onces_t_decimate(status, onces) f_macro_memory_structure_decimate(status, onces, f_thread_once_t); + #define f_macro_thread_onces_t_decimate_by(status, onces, amount) f_macro_memory_structure_decimate_by(status, onces, f_thread_once_t, amount); - #define f_macro_thread_onces_t_delete(status, onces) f_macro_memory_structure_t_delete(status, onces, f_thread_once_t) - #define f_macro_thread_onces_t_destroy(status, onces) f_macro_memory_structure_t_destroy(status, onces, f_thread_once_t) + #define f_macro_thread_onces_t_decrease(status, onces) f_macro_memory_structure_decrease(status, onces, f_thread_once_t); + #define f_macro_thread_onces_t_decrease_by(status, onces, amount) f_macro_memory_structure_decrease_by(status, onces, f_thread_once_t, amount); + #define f_macro_thread_onces_t_delete(status, onces) f_macro_memory_structure_t_delete(status, onces, f_thread_once_t) #define f_macro_thread_onces_t_delete_simple(onces) f_macro_memory_structure_t_delete_simple(onces, f_thread_once_t) - #define f_macro_thread_onces_t_destroy_simple(onces) f_macro_memory_structure_t_destroy_simple(onces, f_thread_once_t) + + #define f_macro_thread_onces_t_destroy(status, onces) f_macro_memory_structure_t_destroy(status, onces, f_thread_once_t) + #define f_macro_thread_onces_t_destroy_simple(onces) f_macro_memory_structure_t_destroy_simple(onces, f_thread_once_t) + + #define f_macro_thread_onces_t_increase(status, onces) f_macro_memory_structure_increase(status, onces, f_thread_once_t); + #define f_macro_thread_onces_t_increase_by(status, onces, amount) f_macro_memory_structure_increase_by(status, onces, f_thread_once_t, amount); + + #define f_macro_thread_onces_t_new(status, onces, length) f_macro_memory_structure_t_new(status, onces, f_thread_once_t, length) #define f_macro_thread_onces_t_resize(status, onces, new_length) f_macro_memory_structure_t_resize(status, onces, f_thread_once_t, new_length) - #define f_macro_thread_onces_t_adjust(status, onces, new_length) f_macro_memory_structure_t_adjust(status, onces, f_thread_once_t, new_length) #endif // _di_f_thread_onces_t_ /** @@ -391,18 +473,28 @@ extern "C" { #define f_thread_sets_t_initialize { 0, 0, 0 } + #define f_macro_thread_sets_t_adjust(status, sets, length) f_macro_memory_structure_t_adjust(status, sets, f_thread_set_t, length) + #define f_macro_thread_sets_t_clear(sets) f_macro_memory_structure_t_clear(sets) - #define f_macro_thread_sets_t_new(status, sets, length) f_macro_memory_structure_t_new(status, sets, f_thread_set_t, length) + #define f_macro_thread_sets_t_decimate(status, sets) f_macro_memory_structure_decimate(status, sets, f_thread_set_t); + #define f_macro_thread_sets_t_decimate_by(status, sets, amount) f_macro_memory_structure_decimate_by(status, sets, f_thread_set_t, amount); - #define f_macro_thread_sets_t_delete(status, sets) f_macro_memory_structure_t_delete(status, sets, f_thread_set_t) - #define f_macro_thread_sets_t_destroy(status, sets) f_macro_memory_structure_t_destroy(status, sets, f_thread_set_t) + #define f_macro_thread_sets_t_decrease(status, sets) f_macro_memory_structure_decrease(status, sets, f_thread_set_t); + #define f_macro_thread_sets_t_decrease_by(status, sets, amount) f_macro_memory_structure_decrease_by(status, sets, f_thread_set_t, amount); + #define f_macro_thread_sets_t_delete(status, sets) f_macro_memory_structure_t_delete(status, sets, f_thread_set_t) #define f_macro_thread_sets_t_delete_simple(sets) f_macro_memory_structure_t_delete_simple(sets, f_thread_set_t) - #define f_macro_thread_sets_t_destroy_simple(sets) f_macro_memory_structure_t_destroy_simple(sets, f_thread_set_t) + + #define f_macro_thread_sets_t_destroy(status, sets) f_macro_memory_structure_t_destroy(status, sets, f_thread_set_t) + #define f_macro_thread_sets_t_destroy_simple(sets) f_macro_memory_structure_t_destroy_simple(sets, f_thread_set_t) + + #define f_macro_thread_sets_t_increase(status, sets) f_macro_memory_structure_increase(status, sets, f_thread_set_t); + #define f_macro_thread_sets_t_increase_by(status, sets, amount) f_macro_memory_structure_increase_by(status, sets, f_thread_set_t, amount); + + #define f_macro_thread_sets_t_new(status, sets, length) f_macro_memory_structure_t_new(status, sets, f_thread_set_t, length) #define f_macro_thread_sets_t_resize(status, sets, new_length) f_macro_memory_structure_t_resize(status, sets, f_thread_set_t, new_length) - #define f_macro_thread_sets_t_adjust(status, sets, new_length) f_macro_memory_structure_t_adjust(status, sets, f_thread_set_t, new_length) #endif // _di_f_thread_sets_t_ #ifdef __cplusplus diff --git a/level_0/f_thread/c/thread.c b/level_0/f_thread/c/thread.c index 5488bae..105c98c 100644 --- a/level_0/f_thread/c/thread.c +++ b/level_0/f_thread/c/thread.c @@ -1,12 +1,11 @@ #include "thread.h" -#include "private-thread.h" #ifdef __cplusplus extern "C" { #endif #ifndef _di_f_thread_at_fork_ - f_return_status f_thread_at_fork(void (*before) (void), void (*after_parent) (void), void (*after_child) (void)) { + f_status_t f_thread_at_fork(void (*before) (void), void (*after_parent) (void), void (*after_child) (void)) { #ifndef _di_level_0_parameter_checking_ if (!before) return F_status_set_error(F_parameter); if (!after_parent) return F_status_set_error(F_parameter); @@ -26,7 +25,7 @@ extern "C" { #endif // _di_f_thread_key_create_ #ifndef _di_f_thread_attribute_affinity_get_ - f_return_status f_thread_attribute_affinity_get(const f_thread_attribute_t attribute, const size_t affinity_size, cpu_set_t *affinity_set) { + f_status_t f_thread_attribute_affinity_get(const f_thread_attribute_t attribute, const size_t affinity_size, cpu_set_t *affinity_set) { #ifndef _di_level_0_parameter_checking_ if (!affinity_set) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -44,7 +43,7 @@ extern "C" { #endif // _di_f_thread_attribute_affinity_get_ #ifndef _di_f_thread_attribute_affinity_set_ - f_return_status f_thread_attribute_affinity_set(const size_t affinity_size, const cpu_set_t *affinity_set, f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_affinity_set(const size_t affinity_size, const cpu_set_t *affinity_set, f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -63,7 +62,7 @@ extern "C" { #endif // _di_f_thread_attribute_affinity_set_ #ifndef _di_f_thread_attribute_create_ - f_return_status f_thread_attribute_create(f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_create(f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -81,7 +80,7 @@ extern "C" { #endif // _di_f_thread_attribute_create_ #ifndef _di_f_thread_attribute_default_get_ - f_return_status f_thread_attribute_default_get(f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_default_get(f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -99,7 +98,7 @@ extern "C" { #endif // _di_f_thread_attribute_default_get_ #ifndef _di_f_thread_attribute_default_set_ - f_return_status f_thread_attribute_default_set(f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_default_set(f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -118,7 +117,7 @@ extern "C" { #endif // _di_f_thread_attribute_default_set_ #ifndef _di_f_thread_attribute_delete_ - f_return_status f_thread_attribute_delete(f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_delete(f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -136,7 +135,7 @@ extern "C" { #endif // _di_f_thread_attribute_delete_ #ifndef _di_f_thread_attribute_detach_get_ - f_return_status f_thread_attribute_detach_get(const f_thread_attribute_t attribute, int *state) { + f_status_t f_thread_attribute_detach_get(const f_thread_attribute_t attribute, int *state) { #ifndef _di_level_0_parameter_checking_ if (!state) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -154,7 +153,7 @@ extern "C" { #endif // _di_f_thread_attribute_detach_get_ #ifndef _di_f_thread_attribute_detach_set_ - f_return_status f_thread_attribute_detach_set(const int state, f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_detach_set(const int state, f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -172,7 +171,7 @@ extern "C" { #endif // _di_f_thread_attribute_detach_set_ #ifndef _di_f_thread_attribute_guard_get_ - f_return_status f_thread_attribute_guard_get(const f_thread_attribute_t attribute, size_t *guard) { + f_status_t f_thread_attribute_guard_get(const f_thread_attribute_t attribute, size_t *guard) { #ifndef _di_level_0_parameter_checking_ if (!guard) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -190,7 +189,7 @@ extern "C" { #endif // _di_f_thread_attribute_guard_get_ #ifndef _di_f_thread_attribute_guard_set_ - f_return_status f_thread_attribute_guard_set(const size_t guard, f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_guard_set(const size_t guard, f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -208,7 +207,7 @@ extern "C" { #endif // _di_f_thread_attribute_guard_set_ #ifndef _di_f_thread_attribute_scheduler_inherit_get_ - f_return_status f_thread_attribute_scheduler_inherit_get(const f_thread_attribute_t attribute, int *inherit) { + f_status_t f_thread_attribute_scheduler_inherit_get(const f_thread_attribute_t attribute, int *inherit) { #ifndef _di_level_0_parameter_checking_ if (!inherit) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -226,7 +225,7 @@ extern "C" { #endif // _di_f_thread_attribute_scheduler_inherit_get_ #ifndef _di_f_thread_attribute_scheduler_inherit_set_ - f_return_status f_thread_attribute_scheduler_inherit_set(const int inherit, f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_scheduler_inherit_set(const int inherit, f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -244,7 +243,7 @@ extern "C" { #endif // _di_f_thread_attribute_scheduler_inherit_set_ #ifndef _di_f_thread_attribute_scheduler_parameter_get_ - f_return_status f_thread_attribute_scheduler_parameter_get(const f_thread_attribute_t attribute, struct sched_param *parameter) { + f_status_t f_thread_attribute_scheduler_parameter_get(const f_thread_attribute_t attribute, struct sched_param *parameter) { #ifndef _di_level_0_parameter_checking_ if (!parameter) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -262,7 +261,7 @@ extern "C" { #endif // _di_f_thread_attribute_scheduler_parameter_get_ #ifndef _di_f_thread_attribute_scheduler_parameter_set_ - f_return_status f_thread_attribute_scheduler_parameter_set(const struct sched_param parameter, f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_scheduler_parameter_set(const struct sched_param parameter, f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -280,7 +279,7 @@ extern "C" { #endif // _di_f_thread_attribute_scheduler_parameter_set_ #ifndef _di_f_thread_attribute_scheduler_policy_get_ - f_return_status f_thread_attribute_scheduler_policy_get(const f_thread_attribute_t attribute, int *policy) { + f_status_t f_thread_attribute_scheduler_policy_get(const f_thread_attribute_t attribute, int *policy) { #ifndef _di_level_0_parameter_checking_ if (!policy) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -298,7 +297,7 @@ extern "C" { #endif // _di_f_thread_attribute_scheduler_policy_get_ #ifndef _di_f_thread_attribute_scheduler_policy_set_ - f_return_status f_thread_attribute_scheduler_policy_set(const int policy, f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_scheduler_policy_set(const int policy, f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -316,7 +315,7 @@ extern "C" { #endif // _di_f_thread_attribute_scheduler_policy_set_ #ifndef _di_f_thread_attribute_scope_get_ - f_return_status f_thread_attribute_scope_get(const f_thread_attribute_t attribute, int *scope) { + f_status_t f_thread_attribute_scope_get(const f_thread_attribute_t attribute, int *scope) { #ifndef _di_level_0_parameter_checking_ if (!scope) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -334,7 +333,7 @@ extern "C" { #endif // _di_f_thread_attribute_scope_get_ #ifndef _di_f_thread_attribute_scope_set_ - f_return_status f_thread_attribute_scope_set(const int scope, f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_scope_set(const int scope, f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -353,7 +352,7 @@ extern "C" { #endif // _di_f_thread_attribute_scope_set_ #ifndef _di_f_thread_attribute_stack_get_ - f_return_status f_thread_attribute_stack_get(const f_thread_attribute_t attribute, size_t *stack_size, void **stack) { + f_status_t f_thread_attribute_stack_get(const f_thread_attribute_t attribute, size_t *stack_size, void **stack) { #ifndef _di_level_0_parameter_checking_ if (!stack) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -372,7 +371,7 @@ extern "C" { #endif // _di_f_thread_attribute_stack_get_ #ifndef _di_f_thread_attribute_stack_set_ - f_return_status f_thread_attribute_stack_set(const size_t stack_size, void * const stack, f_thread_attribute_t *attribute) { + f_status_t f_thread_attribute_stack_set(const size_t stack_size, void * const stack, f_thread_attribute_t *attribute) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -390,87 +389,6 @@ extern "C" { } #endif // _di_f_thread_attribute_stack_set_ -#ifndef _di_f_thread_attributes_decrease_ - f_return_status f_thread_attributes_decrease(f_thread_attributes_t *attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (attributes->size > 1) { - return private_f_thread_attributes_resize(attributes->size - 1, attributes); - } - - return private_f_thread_attributes_delete(attributes); - } -#endif // _di_f_thread_attributes_decrease_ - -#ifndef _di_f_thread_attributes_decrease_by_ - f_return_status f_thread_attributes_decrease_by(const f_array_length_t amount, f_thread_attributes_t *attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (attributes->size - amount > 0) { - return private_f_thread_attributes_resize(attributes->size - amount, attributes); - } - - return private_f_thread_attributes_delete(attributes); - } -#endif // _di_f_thread_attributes_decrease_by_ - -#ifndef _di_f_thread_attributes_delete_ - f_return_status f_thread_attributes_delete(f_thread_attributes_t *attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_thread_attributes_delete(attributes); - } -#endif // _di_f_thread_attributes_delete_ - -#ifndef _di_f_thread_attributes_increase_ - f_return_status f_thread_attributes_increase(f_thread_attributes_t *attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (attributes->used + 1 > attributes->size) { - f_array_length_t size = attributes->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (attributes->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_thread_attributes_resize(size, attributes); - } - - return F_none; - } -#endif // _di_f_thread_attributes_increase_ - -#ifndef _di_f_thread_attributes_increase_by_ - f_return_status f_thread_attributes_increase_by(const f_array_length_t amount, f_thread_attributes_t *attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (attributes->used + amount > attributes->size) { - if (attributes->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_thread_attributes_resize(attributes->used + amount, attributes); - } - - return F_none; - } -#endif // _di_f_thread_attributes_increase_by_ - #ifndef _di_f_thread_caller_ f_thread_id_t f_thread_caller() { return pthread_self(); @@ -478,7 +396,7 @@ extern "C" { #endif // _di_f_thread_caller_ #ifndef _di_f_thread_cancel_ - f_return_status f_thread_cancel(const f_thread_id_t id) { + f_status_t f_thread_cancel(const f_thread_id_t id) { const int error = pthread_cancel(id); @@ -493,7 +411,7 @@ extern "C" { #endif // _di_f_thread_cancel_ #ifndef _di_f_thread_cancel_state_set_ - f_return_status f_thread_cancel_state_set(const int state, int *previous) { + f_status_t f_thread_cancel_state_set(const int state, int *previous) { const int error = pthread_setcancelstate(state, previous); @@ -508,7 +426,7 @@ extern "C" { #endif // _di_f_thread_cancel_state_set_ #ifndef _di_f_thread_cancel_test_ - f_return_status f_thread_cancel_test() { + f_status_t f_thread_cancel_test() { pthread_testcancel(); @@ -517,7 +435,7 @@ extern "C" { #endif // _di_f_thread_cancel_test_ #ifndef _di_f_thread_cancel_type_set_ - f_return_status f_thread_cancel_type_set(const int type, int *previous) { + f_status_t f_thread_cancel_type_set(const int type, int *previous) { const int error = pthread_setcanceltype(type, previous); @@ -532,7 +450,7 @@ extern "C" { #endif // _di_f_thread_cancel_type_set_ #ifndef _di_f_thread_clock_get_id_ - f_return_status f_thread_clock_get_id(const f_thread_id_t id_thread, clockid_t *id_clock) { + f_status_t f_thread_clock_get_id(const f_thread_id_t id_thread, clockid_t *id_clock) { const int error = pthread_getcpuclockid(id_thread, id_clock); @@ -548,7 +466,7 @@ extern "C" { #endif // _di_f_thread_clock_get_id_ #ifndef _di_f_thread_compare_ - f_return_status f_thread_compare(const f_thread_id_t id1, const f_thread_id_t id2) { + f_status_t f_thread_compare(const f_thread_id_t id1, const f_thread_id_t id2) { if (pthread_equal(id1, id2)) { return F_equal_to; @@ -559,7 +477,7 @@ extern "C" { #endif // _di_f_thread_compare_ #ifndef _di_f_thread_condition_unblock_all_ - f_return_status f_thread_condition_unblock_all(f_thread_condition_t *condition) { + f_status_t f_thread_condition_unblock_all(f_thread_condition_t *condition) { #ifndef _di_level_0_parameter_checking_ if (!condition) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -577,7 +495,7 @@ extern "C" { #endif // _di_f_thread_condition_unblock_all_ #ifndef _di_f_thread_condition_unblock_any_ - f_return_status f_thread_condition_unblock_any(f_thread_condition_t *condition) { + f_status_t f_thread_condition_unblock_any(f_thread_condition_t *condition) { #ifndef _di_level_0_parameter_checking_ if (!condition) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -595,7 +513,7 @@ extern "C" { #endif // _di_f_thread_condition_unblock_any_ #ifndef _di_f_thread_condition_wait_ - f_return_status f_thread_condition_wait(f_thread_condition_t *condition, f_thread_mutex_t *mutex) { + f_status_t f_thread_condition_wait(f_thread_condition_t *condition, f_thread_mutex_t *mutex) { #ifndef _di_level_0_parameter_checking_ if (!condition) return F_status_set_error(F_parameter); if (!mutex) return F_status_set_error(F_parameter); @@ -615,7 +533,7 @@ extern "C" { #endif // _di_f_thread_condition_wait_ #ifndef _di_f_thread_condition_wait_timed_ - f_return_status f_thread_condition_wait_timed(const struct timespec *wait, f_thread_condition_t *condition, f_thread_mutex_t *mutex) { + f_status_t f_thread_condition_wait_timed(const struct timespec *wait, f_thread_condition_t *condition, f_thread_mutex_t *mutex) { #ifndef _di_level_0_parameter_checking_ if (!condition) return F_status_set_error(F_parameter); if (!mutex) return F_status_set_error(F_parameter); @@ -634,89 +552,8 @@ extern "C" { } #endif // _di_f_thread_condition_wait_timed_ -#ifndef _di_f_thread_conditions_decrease_ - f_return_status f_thread_conditions_decrease(f_thread_conditions_t *conditions) { - #ifndef _di_level_0_parameter_checking_ - if (!conditions) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (conditions->size > 1) { - return private_f_thread_conditions_resize(conditions->size - 1, conditions); - } - - return private_f_thread_conditions_delete(conditions); - } -#endif // _di_f_thread_conditions_decrease_ - -#ifndef _di_f_thread_conditions_decrease_by_ - f_return_status f_thread_conditions_decrease_by(const f_array_length_t amount, f_thread_conditions_t *conditions) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!conditions) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (conditions->size - amount > 0) { - return private_f_thread_conditions_resize(conditions->size - amount, conditions); - } - - return private_f_thread_conditions_delete(conditions); - } -#endif // _di_f_thread_conditions_decrease_by_ - -#ifndef _di_f_thread_conditions_delete_ - f_return_status f_thread_conditions_delete(f_thread_conditions_t *conditions) { - #ifndef _di_level_0_parameter_checking_ - if (!conditions) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_thread_conditions_delete(conditions); - } -#endif // _di_f_thread_conditions_delete_ - -#ifndef _di_f_thread_conditions_increase_ - f_return_status f_thread_conditions_increase(f_thread_conditions_t *conditions) { - #ifndef _di_level_0_parameter_checking_ - if (!conditions) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (conditions->used + 1 > conditions->size) { - f_array_length_t size = conditions->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (conditions->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_thread_conditions_resize(size, conditions); - } - - return F_none; - } -#endif // _di_f_thread_conditions_increase_ - -#ifndef _di_f_thread_conditions_increase_by_ - f_return_status f_thread_conditions_increase_by(const f_array_length_t amount, f_thread_conditions_t *conditions) { - #ifndef _di_level_0_parameter_checking_ - if (!conditions) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (conditions->used + amount > conditions->size) { - if (conditions->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_thread_conditions_resize(conditions->used + amount, conditions); - } - - return F_none; - } -#endif // _di_f_thread_conditions_increase_by_ - #ifndef _di_f_thread_create_ - f_return_status f_thread_create(const f_thread_attribute_t *attribute, f_thread_id_t *id, void *(*routine) (void *), void *argument) { + f_status_t f_thread_create(const f_thread_attribute_t *attribute, f_thread_id_t *id, void *(*routine) (void *), void *argument) { #ifndef _di_level_0_parameter_checking_ if (!attribute) return F_status_set_error(F_parameter); if (!id) return F_status_set_error(F_parameter); @@ -740,7 +577,7 @@ extern "C" { #endif // _di_f_thread_create_ #ifndef _di_f_thread_exit_ - f_return_status f_thread_exit(int *result) { + f_status_t f_thread_exit(int *result) { #ifndef _di_level_0_parameter_checking_ if (!result) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -751,89 +588,8 @@ extern "C" { } #endif // _di_f_thread_exit_ -#ifndef _di_f_thread_ids_decrease_ - f_return_status f_thread_ids_decrease(f_thread_ids_t *ids) { - #ifndef _di_level_0_parameter_checking_ - if (!ids) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (ids->size > 1) { - return private_f_thread_ids_resize(ids->size - 1, ids); - } - - return private_f_thread_ids_delete(ids); - } -#endif // _di_f_thread_ids_decrease_ - -#ifndef _di_f_thread_ids_decrease_by_ - f_return_status f_thread_ids_decrease_by(const f_array_length_t amount, f_thread_ids_t *ids) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!ids) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (ids->size - amount > 0) { - return private_f_thread_ids_resize(ids->size - amount, ids); - } - - return private_f_thread_ids_delete(ids); - } -#endif // _di_f_thread_ids_decrease_by_ - -#ifndef _di_f_thread_ids_delete_ - f_return_status f_thread_ids_delete(f_thread_ids_t *ids) { - #ifndef _di_level_0_parameter_checking_ - if (!ids) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_thread_ids_delete(ids); - } -#endif // _di_f_thread_ids_delete_ - -#ifndef _di_f_thread_ids_increase_ - f_return_status f_thread_ids_increase(f_thread_ids_t *ids) { - #ifndef _di_level_0_parameter_checking_ - if (!ids) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (ids->used + 1 > ids->size) { - f_array_length_t size = ids->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (ids->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_thread_ids_resize(size, ids); - } - - return F_none; - } -#endif // _di_f_thread_ids_increase_ - -#ifndef _di_f_thread_ids_increase_by_ - f_return_status f_thread_ids_increase_by(const f_array_length_t amount, f_thread_ids_t *ids) { - #ifndef _di_level_0_parameter_checking_ - if (!ids) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (ids->used + amount > ids->size) { - if (ids->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_thread_ids_resize(ids->used + amount, ids); - } - - return F_none; - } -#endif // _di_f_thread_ids_increase_by_ - #ifndef _di_f_thread_join_ - f_return_status f_thread_join(const f_thread_id_t id, void **result) { + f_status_t f_thread_join(const f_thread_id_t id, void **result) { const int error = pthread_join(id, result); @@ -851,7 +607,7 @@ extern "C" { #endif // _di_f_thread_join_ #ifndef _di_f_thread_join_try_ - f_return_status f_thread_try(const f_thread_id_t id, void **result) { + f_status_t f_thread_try(const f_thread_id_t id, void **result) { const int error = pthread_tryjoin_np(id, result); @@ -870,7 +626,7 @@ extern "C" { #endif // _di_f_thread_join_try_ #ifndef _di_f_thread_join_timed_ - f_return_status f_thread_timed(const f_thread_id_t id, const struct timespec wait, void **result) { + f_status_t f_thread_timed(const f_thread_id_t id, const struct timespec wait, void **result) { const int error = pthread_timedjoin_np(id, result, &wait); @@ -890,7 +646,7 @@ extern "C" { #endif // _di_f_thread_join_timed_ #ifndef _di_f_thread_key_create_ - f_return_status f_thread_key_create(void (*routine) (void *), f_thread_key_t *key) { + f_status_t f_thread_key_create(void (*routine) (void *), f_thread_key_t *key) { #ifndef _di_level_0_parameter_checking_ if (!routine) return F_status_set_error(F_parameter); if (!key) return F_status_set_error(F_parameter); @@ -910,7 +666,7 @@ extern "C" { #endif // _di_f_thread_key_create_ #ifndef _di_f_thread_key_get_ - f_return_status f_thread_key_get(const f_thread_key_t key, void **value) { + f_status_t f_thread_key_get(const f_thread_key_t key, void **value) { #ifndef _di_level_0_parameter_checking_ if (!value) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -922,7 +678,7 @@ extern "C" { #endif // _di_f_thread_key_get_ #ifndef _di_f_thread_key_set_ - f_return_status f_thread_key_set(const f_thread_key_t key, const void *value) { + f_status_t f_thread_key_set(const f_thread_key_t key, const void *value) { #ifndef _di_level_0_parameter_checking_ if (!value) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -939,89 +695,8 @@ extern "C" { } #endif // _di_f_thread_key_set_ -#ifndef _di_f_thread_keys_decrease_ - f_return_status f_thread_keys_decrease(f_thread_keys_t *keys) { - #ifndef _di_level_0_parameter_checking_ - if (!keys) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (keys->size > 1) { - return private_f_thread_keys_resize(keys->size - 1, keys); - } - - return private_f_thread_keys_delete(keys); - } -#endif // _di_f_thread_keys_decrease_ - -#ifndef _di_f_thread_keys_decrease_by_ - f_return_status f_thread_keys_decrease_by(const f_array_length_t amount, f_thread_keys_t *keys) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!keys) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (keys->size - amount > 0) { - return private_f_thread_keys_resize(keys->size - amount, keys); - } - - return private_f_thread_keys_delete(keys); - } -#endif // _di_f_thread_keys_decrease_by_ - -#ifndef _di_f_thread_keys_delete_ - f_return_status f_thread_keys_delete(f_thread_keys_t *keys) { - #ifndef _di_level_0_parameter_checking_ - if (!keys) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_thread_keys_delete(keys); - } -#endif // _di_f_thread_keys_delete_ - -#ifndef _di_f_thread_keys_increase_ - f_return_status f_thread_keys_increase(f_thread_keys_t *keys) { - #ifndef _di_level_0_parameter_checking_ - if (!keys) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (keys->used + 1 > keys->size) { - f_array_length_t size = keys->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (keys->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_thread_keys_resize(size, keys); - } - - return F_none; - } -#endif // _di_f_thread_keys_increase_ - -#ifndef _di_f_thread_keys_increase_by_ - f_return_status f_thread_keys_increase_by(const f_array_length_t amount, f_thread_keys_t *keys) { - #ifndef _di_level_0_parameter_checking_ - if (!keys) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (keys->used + amount > keys->size) { - if (keys->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_thread_keys_resize(keys->used + amount, keys); - } - - return F_none; - } -#endif // _di_f_thread_keys_increase_by_ - #ifndef _di_f_thread_lock_ - f_return_status f_thread_lock(f_thread_lock_t *lock) { + f_status_t f_thread_lock(f_thread_lock_t *lock) { #ifndef _di_level_0_parameter_checking_ if (!lock) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1041,7 +716,7 @@ extern "C" { #endif // _di_f_thread_lock_ #ifndef _di_f_thread_lock_try_ - f_return_status f_thread_lock_try(f_thread_lock_t *lock) { + f_status_t f_thread_lock_try(f_thread_lock_t *lock) { #ifndef _di_level_0_parameter_checking_ if (!lock) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1060,89 +735,8 @@ extern "C" { } #endif // _di_f_thread_lock_try_ -#ifndef _di_f_thread_locks_decrease_ - f_return_status f_thread_locks_decrease(f_thread_locks_t *locks) { - #ifndef _di_level_0_parameter_checking_ - if (!locks) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (locks->size > 1) { - return private_f_thread_locks_resize(locks->size - 1, locks); - } - - return private_f_thread_locks_delete(locks); - } -#endif // _di_f_thread_locks_decrease_ - -#ifndef _di_f_thread_locks_decrease_by_ - f_return_status f_thread_locks_decrease_by(const f_array_length_t amount, f_thread_locks_t *locks) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!locks) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (locks->size - amount > 0) { - return private_f_thread_locks_resize(locks->size - amount, locks); - } - - return private_f_thread_locks_delete(locks); - } -#endif // _di_f_thread_locks_decrease_by_ - -#ifndef _di_f_thread_locks_delete_ - f_return_status f_thread_locks_delete(f_thread_locks_t *locks) { - #ifndef _di_level_0_parameter_checking_ - if (!locks) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_thread_locks_delete(locks); - } -#endif // _di_f_thread_locks_delete_ - -#ifndef _di_f_thread_locks_increase_ - f_return_status f_thread_locks_increase(f_thread_locks_t *locks) { - #ifndef _di_level_0_parameter_checking_ - if (!locks) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (locks->used + 1 > locks->size) { - f_array_length_t size = locks->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (locks->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_thread_locks_resize(size, locks); - } - - return F_none; - } -#endif // _di_f_thread_locks_increase_ - -#ifndef _di_f_thread_locks_increase_by_ - f_return_status f_thread_locks_increase_by(const f_array_length_t amount, f_thread_locks_t *locks) { - #ifndef _di_level_0_parameter_checking_ - if (!locks) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (locks->used + amount > locks->size) { - if (locks->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_thread_locks_resize(locks->used + amount, locks); - } - - return F_none; - } -#endif // _di_f_thread_locks_increase_by_ - #ifndef _di_f_thread_mutex_create_ - f_return_status f_thread_mutex_create(f_thread_mutex_attribute_t * const attribute, f_thread_mutex_t *mutex) { + f_status_t f_thread_mutex_create(f_thread_mutex_attribute_t * const attribute, f_thread_mutex_t *mutex) { #ifndef _di_level_0_parameter_checking_ if (!mutex) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1164,7 +758,7 @@ extern "C" { #endif // _di_f_thread_mutex_create_ #ifndef _di_f_thread_mutex_delete_ - f_return_status f_thread_mutex_delete(f_thread_mutex_t *mutex) { + f_status_t f_thread_mutex_delete(f_thread_mutex_t *mutex) { #ifndef _di_level_0_parameter_checking_ if (!mutex) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1183,7 +777,7 @@ extern "C" { #endif // _di_f_thread_mutex_delete_ #ifndef _di_f_thread_mutex_lock_ - f_return_status f_thread_mutex_lock(f_thread_mutex_t *mutex) { + f_status_t f_thread_mutex_lock(f_thread_mutex_t *mutex) { #ifndef _di_level_0_parameter_checking_ if (!mutex) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1203,7 +797,7 @@ extern "C" { #endif // _di_f_thread_mutex_lock_ #ifndef _di_f_thread_mutex_lock_try_ - f_return_status f_thread_mutex_lock_try(f_thread_mutex_t *mutex) { + f_status_t f_thread_mutex_lock_try(f_thread_mutex_t *mutex) { #ifndef _di_level_0_parameter_checking_ if (!mutex) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1223,7 +817,7 @@ extern "C" { #endif // _di_f_thread_mutex_lock_try_ #ifndef _di_f_thread_mutex_unlock_ - f_return_status f_thread_mutex_unlock(f_thread_mutex_t *mutex) { + f_status_t f_thread_mutex_unlock(f_thread_mutex_t *mutex) { #ifndef _di_level_0_parameter_checking_ if (!mutex) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1243,170 +837,8 @@ extern "C" { } #endif // _di_f_thread_mutex_unlock_ -#ifndef _di_f_thread_mutexs_decrease_ - f_return_status f_thread_mutexs_decrease(f_thread_mutexs_t *mutexs) { - #ifndef _di_level_0_parameter_checking_ - if (!mutexs) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (mutexs->size > 1) { - return private_f_thread_mutexs_resize(mutexs->size - 1, mutexs); - } - - return private_f_thread_mutexs_delete(mutexs); - } -#endif // _di_f_thread_mutexs_decrease_ - -#ifndef _di_f_thread_mutexs_decrease_by_ - f_return_status f_thread_mutexs_decrease_by(const f_array_length_t amount, f_thread_mutexs_t *mutexs) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!mutexs) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (mutexs->size - amount > 0) { - return private_f_thread_mutexs_resize(mutexs->size - amount, mutexs); - } - - return private_f_thread_mutexs_delete(mutexs); - } -#endif // _di_f_thread_mutexs_decrease_by_ - -#ifndef _di_f_thread_mutexs_delete_ - f_return_status f_thread_mutexs_delete(f_thread_mutexs_t *mutexs) { - #ifndef _di_level_0_parameter_checking_ - if (!mutexs) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_thread_mutexs_delete(mutexs); - } -#endif // _di_f_thread_mutexs_delete_ - -#ifndef _di_f_thread_mutexs_increase_ - f_return_status f_thread_mutexs_increase(f_thread_mutexs_t *mutexs) { - #ifndef _di_level_0_parameter_checking_ - if (!mutexs) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (mutexs->used + 1 > mutexs->size) { - f_array_length_t size = mutexs->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (mutexs->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_thread_mutexs_resize(size, mutexs); - } - - return F_none; - } -#endif // _di_f_thread_mutexs_increase_ - -#ifndef _di_f_thread_mutexs_increase_by_ - f_return_status f_thread_mutexs_increase_by(const f_array_length_t amount, f_thread_mutexs_t *mutexs) { - #ifndef _di_level_0_parameter_checking_ - if (!mutexs) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (mutexs->used + amount > mutexs->size) { - if (mutexs->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_thread_mutexs_resize(mutexs->used + amount, mutexs); - } - - return F_none; - } -#endif // _di_f_thread_mutexs_increase_by_ - -#ifndef _di_f_thread_mutex_attributes_decrease_ - f_return_status f_thread_mutex_attributes_decrease(f_thread_mutex_attributes_t *mutex_attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!mutex_attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (mutex_attributes->size > 1) { - return private_f_thread_mutex_attributes_resize(mutex_attributes->size - 1, mutex_attributes); - } - - return private_f_thread_mutex_attributes_delete(mutex_attributes); - } -#endif // _di_f_thread_mutex_attributes_decrease_ - -#ifndef _di_f_thread_mutex_attributes_decrease_by_ - f_return_status f_thread_mutex_attributes_decrease_by(const f_array_length_t amount, f_thread_mutex_attributes_t *mutex_attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!mutex_attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (mutex_attributes->size - amount > 0) { - return private_f_thread_mutex_attributes_resize(mutex_attributes->size - amount, mutex_attributes); - } - - return private_f_thread_mutex_attributes_delete(mutex_attributes); - } -#endif // _di_f_thread_mutex_attributes_decrease_by_ - -#ifndef _di_f_thread_mutex_attributes_delete_ - f_return_status f_thread_mutex_attributes_delete(f_thread_mutex_attributes_t *mutex_attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!mutex_attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_thread_mutex_attributes_delete(mutex_attributes); - } -#endif // _di_f_thread_mutex_attributes_delete_ - -#ifndef _di_f_thread_mutex_attributes_increase_ - f_return_status f_thread_mutex_attributes_increase(f_thread_mutex_attributes_t *mutex_attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!mutex_attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (mutex_attributes->used + 1 > mutex_attributes->size) { - f_array_length_t size = mutex_attributes->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (mutex_attributes->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_thread_mutex_attributes_resize(size, mutex_attributes); - } - - return F_none; - } -#endif // _di_f_thread_mutex_attributes_increase_ - -#ifndef _di_f_thread_mutex_attributes_increase_by_ - f_return_status f_thread_mutex_attributes_increase_by(const f_array_length_t amount, f_thread_mutex_attributes_t *mutex_attributes) { - #ifndef _di_level_0_parameter_checking_ - if (!mutex_attributes) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (mutex_attributes->used + amount > mutex_attributes->size) { - if (mutex_attributes->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_thread_mutex_attributes_resize(mutex_attributes->used + amount, mutex_attributes); - } - - return F_none; - } -#endif // _di_f_thread_mutex_attributes_increase_by_ - #ifndef _di_f_thread_once_ - f_return_status f_thread_once(void (*routine) (void), f_thread_once_t *once) { + f_status_t f_thread_once(void (*routine) (void), f_thread_once_t *once) { #ifndef _di_level_0_parameter_checking_ if (!routine) return F_status_set_error(F_parameter); if (!once) return F_status_set_error(F_parameter); @@ -1424,170 +856,8 @@ extern "C" { } #endif // _di_f_thread_once_ -#ifndef _di_f_thread_onces_decrease_ - f_return_status f_thread_onces_decrease(f_thread_onces_t *onces) { - #ifndef _di_level_0_parameter_checking_ - if (!onces) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (onces->size > 1) { - return private_f_thread_onces_resize(onces->size - 1, onces); - } - - return private_f_thread_onces_delete(onces); - } -#endif // _di_f_thread_onces_decrease_ - -#ifndef _di_f_thread_onces_decrease_by_ - f_return_status f_thread_onces_decrease_by(const f_array_length_t amount, f_thread_onces_t *onces) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!onces) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (onces->size - amount > 0) { - return private_f_thread_onces_resize(onces->size - amount, onces); - } - - return private_f_thread_onces_delete(onces); - } -#endif // _di_f_thread_onces_decrease_by_ - -#ifndef _di_f_thread_onces_delete_ - f_return_status f_thread_onces_delete(f_thread_onces_t *onces) { - #ifndef _di_level_0_parameter_checking_ - if (!onces) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_thread_onces_delete(onces); - } -#endif // _di_f_thread_onces_delete_ - -#ifndef _di_f_thread_onces_increase_ - f_return_status f_thread_onces_increase(f_thread_onces_t *onces) { - #ifndef _di_level_0_parameter_checking_ - if (!onces) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (onces->used + 1 > onces->size) { - f_array_length_t size = onces->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (onces->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_thread_onces_resize(size, onces); - } - - return F_none; - } -#endif // _di_f_thread_onces_increase_ - -#ifndef _di_f_thread_onces_increase_by_ - f_return_status f_thread_onces_increase_by(const f_array_length_t amount, f_thread_onces_t *onces) { - #ifndef _di_level_0_parameter_checking_ - if (!onces) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (onces->used + amount > onces->size) { - if (onces->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_thread_onces_resize(onces->used + amount, onces); - } - - return F_none; - } -#endif // _di_f_thread_onces_increase_by_ - -#ifndef _di_f_thread_sets_decrease_ - f_return_status f_thread_sets_decrease(f_thread_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (sets->size > 1) { - return private_f_thread_sets_resize(sets->size - 1, sets); - } - - return private_f_thread_sets_delete(sets); - } -#endif // _di_f_thread_sets_decrease_ - -#ifndef _di_f_thread_sets_decrease_by_ - f_return_status f_thread_sets_decrease_by(const f_array_length_t amount, f_thread_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!amount) return F_status_set_error(F_parameter); - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (sets->size - amount > 0) { - return private_f_thread_sets_resize(sets->size - amount, sets); - } - - return private_f_thread_sets_delete(sets); - } -#endif // _di_f_thread_sets_decrease_by_ - -#ifndef _di_f_thread_sets_delete_ - f_return_status f_thread_sets_delete(f_thread_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - return private_f_thread_sets_delete(sets); - } -#endif // _di_f_thread_sets_delete_ - -#ifndef _di_f_thread_sets_increase_ - f_return_status f_thread_sets_increase(f_thread_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (sets->used + 1 > sets->size) { - f_array_length_t size = sets->used + f_memory_default_allocation_step; - - if (size > f_array_length_t_size) { - if (sets->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - return private_f_thread_sets_resize(size, sets); - } - - return F_none; - } -#endif // _di_f_thread_sets_increase_ - -#ifndef _di_f_thread_sets_increase_by_ - f_return_status f_thread_sets_increase_by(const f_array_length_t amount, f_thread_sets_t *sets) { - #ifndef _di_level_0_parameter_checking_ - if (!sets) return F_status_set_error(F_parameter); - #endif // _di_level_0_parameter_checking_ - - if (sets->used + amount > sets->size) { - if (sets->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - return private_f_thread_sets_resize(sets->used + amount, sets); - } - - return F_none; - } -#endif // _di_f_thread_sets_increase_by_ - #ifndef _di_f_thread_signal_ - f_return_status f_thread_signal(const f_thread_id_t id, const int signal) { + f_status_t f_thread_signal(const f_thread_id_t id, const int signal) { const int error = pthread_kill(id, signal); @@ -1612,7 +882,7 @@ extern "C" { #endif // _di_f_thread_signal_ #ifndef _di_f_thread_signal_mask_ - f_return_status f_thread_signal_mask(const int how, const sigset_t *next, sigset_t *current) { + f_status_t f_thread_signal_mask(const int how, const sigset_t *next, sigset_t *current) { #ifndef _di_level_0_parameter_checking_ if (!next && !current) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1629,7 +899,7 @@ extern "C" { #endif // _di_f_thread_signal_mask_ #ifndef _di_f_thread_signal_queue_ - f_return_status f_thread_signal_queue(const f_thread_id_t id, const int signal, const union sigval value) { + f_status_t f_thread_signal_queue(const f_thread_id_t id, const int signal, const union sigval value) { const int error = pthread_sigqueue(id, signal, value); diff --git a/level_0/f_thread/c/thread.h b/level_0/f_thread/c/thread.h index 7178748..f278c27 100644 --- a/level_0/f_thread/c/thread.h +++ b/level_0/f_thread/c/thread.h @@ -51,7 +51,7 @@ extern "C" { * @see pthread_atfork() */ #ifndef _di_f_thread_at_fork_ - extern f_return_status f_thread_at_fork(void (*before) (void), void (*after_parent) (void), void (*after_child) (void)); + extern f_status_t f_thread_at_fork(void (*before) (void), void (*after_parent) (void), void (*after_child) (void)); #endif // _di_f_thread_at_fork_ /** @@ -72,7 +72,7 @@ extern "C" { * @see pthread_attr_getaffinity_np() */ #ifndef _di_f_thread_attribute_affinity_get_ - extern f_return_status f_thread_attribute_affinity_get(const f_thread_attribute_t attribute, const size_t affinity_size, cpu_set_t *affinity_set); + extern f_status_t f_thread_attribute_affinity_get(const f_thread_attribute_t attribute, const size_t affinity_size, cpu_set_t *affinity_set); #endif // _di_f_thread_attribute_affinity_get_ /** @@ -94,7 +94,7 @@ extern "C" { * @see pthread_attr_setaffinity_np() */ #ifndef _di_f_thread_attribute_affinity_set_ - extern f_return_status f_thread_attribute_affinity_set(const size_t affinity_size, const cpu_set_t *affinity_set, f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_affinity_set(const size_t affinity_size, const cpu_set_t *affinity_set, f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_affinity_set_ /** @@ -112,7 +112,7 @@ extern "C" { * @see pthread_attr_init() */ #ifndef _di_f_thread_attribute_create_ - extern f_return_status f_thread_attribute_create(f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_create(f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_create_ /** @@ -129,7 +129,7 @@ extern "C" { * @see pthread_getattr_default_np() */ #ifndef _di_f_thread_attribute_default_get_ - extern f_return_status f_thread_attribute_default_get(f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_default_get(f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_default_get_ /** @@ -147,7 +147,7 @@ extern "C" { * @see pthread_setattr_default_np() */ #ifndef _di_f_thread_attribute_default_set_ - extern f_return_status f_thread_attribute_default_set(f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_default_set(f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_default_set_ /** @@ -166,7 +166,7 @@ extern "C" { * @see pthread_attr_destroy() */ #ifndef _di_f_thread_attribute_delete_ - extern f_return_status f_thread_attribute_delete(f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_delete(f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_delete_ /** @@ -185,7 +185,7 @@ extern "C" { * @see pthread_attr_getdetachstate() */ #ifndef _di_f_thread_attribute_detach_get_ - extern f_return_status f_thread_attribute_detach_get(const f_thread_attribute_t attribute, int *state); + extern f_status_t f_thread_attribute_detach_get(const f_thread_attribute_t attribute, int *state); #endif // _di_f_thread_attribute_detach_get_ /** @@ -204,7 +204,7 @@ extern "C" { * @see pthread_attr_setdetachstate() */ #ifndef _di_f_thread_attribute_detach_set_ - extern f_return_status f_thread_attribute_detach_set(const int state, f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_detach_set(const int state, f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_detach_set_ /** @@ -223,7 +223,7 @@ extern "C" { * @see pthread_attr_getguardsize() */ #ifndef _di_f_thread_attribute_guard_get_ - extern f_return_status f_thread_attribute_guard_get(const f_thread_attribute_t attribute, size_t *guard); + extern f_status_t f_thread_attribute_guard_get(const f_thread_attribute_t attribute, size_t *guard); #endif // _di_f_thread_attribute_guard_get_ /** @@ -242,7 +242,7 @@ extern "C" { * @see pthread_attr_setguardsize() */ #ifndef _di_f_thread_attribute_guard_set_ - extern f_return_status f_thread_attribute_guard_set(const size_t guard, f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_guard_set(const size_t guard, f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_guard_set_ /** @@ -261,7 +261,7 @@ extern "C" { * @see pthread_attr_getinheritsched() */ #ifndef _di_f_thread_attribute_scheduler_inherit_get_ - extern f_return_status f_thread_attribute_scheduler_inherit_get(const f_thread_attribute_t attribute, int *inherit); + extern f_status_t f_thread_attribute_scheduler_inherit_get(const f_thread_attribute_t attribute, int *inherit); #endif // _di_f_thread_attribute_scheduler_inherit_get_ /** @@ -280,7 +280,7 @@ extern "C" { * @see pthread_attr_setinheritsched() */ #ifndef _di_f_thread_attribute_scheduler_inherit_set_ - extern f_return_status f_thread_attribute_scheduler_inherit_set(const int inherit, f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_scheduler_inherit_set(const int inherit, f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_scheduler_inherit_set_ /** @@ -299,7 +299,7 @@ extern "C" { * @see pthread_attr_getschedparam() */ #ifndef _di_f_thread_attribute_scheduler_parameter_get_ - extern f_return_status f_thread_attribute_scheduler_parameter_get(const f_thread_attribute_t attribute, struct sched_param *parameter); + extern f_status_t f_thread_attribute_scheduler_parameter_get(const f_thread_attribute_t attribute, struct sched_param *parameter); #endif // _di_f_thread_attribute_scheduler_parameter_get_ /** @@ -318,7 +318,7 @@ extern "C" { * @see pthread_attr_setschedparam() */ #ifndef _di_f_thread_attribute_scheduler_parameter_set_ - extern f_return_status f_thread_attribute_scheduler_parameter_set(const struct sched_param parameter, f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_scheduler_parameter_set(const struct sched_param parameter, f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_scheduler_parameter_set_ /** @@ -337,7 +337,7 @@ extern "C" { * @see pthread_attr_getschedpolicy() */ #ifndef _di_f_thread_attribute_scheduler_policy_get_ - extern f_return_status f_thread_attribute_scheduler_policy_get(const f_thread_attribute_t attribute, int *policy); + extern f_status_t f_thread_attribute_scheduler_policy_get(const f_thread_attribute_t attribute, int *policy); #endif // _di_f_thread_attribute_scheduler_policy_get_ /** @@ -356,7 +356,7 @@ extern "C" { * @see pthread_attr_setschedpolicy() */ #ifndef _di_f_thread_attribute_scheduler_policy_set_ - extern f_return_status f_thread_attribute_scheduler_policy_set(const int policy, f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_scheduler_policy_set(const int policy, f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_scheduler_policy_set_ /** @@ -375,7 +375,7 @@ extern "C" { * @see pthread_attr_getscope() */ #ifndef _di_f_thread_attribute_scope_get_ - extern f_return_status f_thread_attribute_scope_get(const f_thread_attribute_t attribute, int *scope); + extern f_status_t f_thread_attribute_scope_get(const f_thread_attribute_t attribute, int *scope); #endif // _di_f_thread_attribute_scope_get_ /** @@ -395,7 +395,7 @@ extern "C" { * @see pthread_attr_setscope() */ #ifndef _di_f_thread_attribute_scope_set_ - extern f_return_status f_thread_attribute_scope_set(const int scope, f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_scope_set(const int scope, f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_scope_set_ /** @@ -417,7 +417,7 @@ extern "C" { * @see pthread_attr_getstack() */ #ifndef _di_f_thread_attribute_stack_get_ - extern f_return_status f_thread_attribute_stack_get(const f_thread_attribute_t attribute, size_t *stack_size, void **stack); + extern f_status_t f_thread_attribute_stack_get(const f_thread_attribute_t attribute, size_t *stack_size, void **stack); #endif // _di_f_thread_attribute_stack_get_ /** @@ -439,108 +439,10 @@ extern "C" { * @see pthread_attr_setstack() */ #ifndef _di_f_thread_attribute_stack_set_ - extern f_return_status f_thread_attribute_stack_set(const size_t stack_size, void * const stack, f_thread_attribute_t *attribute); + extern f_status_t f_thread_attribute_stack_set(const size_t stack_size, void * const stack, f_thread_attribute_t *attribute); #endif // _di_f_thread_attribute_stack_set_ /** - * Resize the attributes array 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 attributes - * The string array 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_f_thread_attributes_decrease_ - extern f_return_status f_thread_attributes_decrease(f_thread_attributes_t *attributes); -#endif // _di_f_thread_attributes_decrease_ - -/** - * Resize the attributes array to a smaller size. - * - * This will resize making the array 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 attributes - * The string array 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_f_thread_attributes_decrease_by_ - extern f_return_status f_thread_attributes_decrease_by(const f_array_length_t amount, f_thread_attributes_t *attributes); -#endif // _di_f_thread_attributes_decrease_by_ - -/** - * Delete the attributes array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_thread_attributes_delete_ - extern f_return_status f_thread_attributes_delete(f_thread_attributes_t *attributes); -#endif // _di_f_thread_attributes_delete_ - -/** - * Increase the size of the attributes 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param attributes - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_attributes_increase_ - extern f_return_status f_thread_attributes_increase(f_thread_attributes_t *attributes); -#endif // _di_f_thread_attributes_increase_ - -/** - * Resize the attributes array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param attributes - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_attributes_increase_by_ - extern f_return_status f_thread_attributes_increase_by(const f_array_length_t amount, f_thread_attributes_t *attributes); -#endif // _di_f_thread_attributes_increase_by_ - -/** * Get the ID of the calling thread. * * @return @@ -566,7 +468,7 @@ extern "C" { * @see pthread_cancel() */ #ifndef _di_f_thread_cancel_ - extern f_return_status f_thread_cancel(const f_thread_id_t id); + extern f_status_t f_thread_cancel(const f_thread_id_t id); #endif // _di_f_thread_cancel_ /** @@ -587,7 +489,7 @@ extern "C" { * @see pthread_setcancelstate() */ #ifndef _di_f_thread_cancel_state_set_ - extern f_return_status f_thread_cancel_state_set(const int state, int *previous); + extern f_status_t f_thread_cancel_state_set(const int state, int *previous); #endif // _di_f_thread_cancel_state_set_ /** @@ -602,7 +504,7 @@ extern "C" { * @see pthread_testcancel() */ #ifndef _di_f_thread_cancel_test_ - extern f_return_status f_thread_cancel_test(); + extern f_status_t f_thread_cancel_test(); #endif // _di_f_thread_cancel_test_ /** @@ -623,7 +525,7 @@ extern "C" { * @see pthread_setcanceltype() */ #ifndef _di_f_thread_cancel_type_set_ - extern f_return_status f_thread_cancel_type_set(const int type, int *previous); + extern f_status_t f_thread_cancel_type_set(const int type, int *previous); #endif // _di_f_thread_cancel_type_set_ /** @@ -643,7 +545,7 @@ extern "C" { * @see pthread_equal() */ #ifndef _di_f_thread_clock_get_id_ - extern f_return_status f_thread_clock_get_id(const f_thread_id_t id_thread, clockid_t *id_clock); + extern f_status_t f_thread_clock_get_id(const f_thread_id_t id_thread, clockid_t *id_clock); #endif // _di_f_thread_clock_get_id_ /** @@ -659,7 +561,7 @@ extern "C" { * @see pthread_equal() */ #ifndef _di_f_thread_compare_ - extern f_return_status f_thread_compare(const f_thread_id_t id1, const f_thread_id_t id2); + extern f_status_t f_thread_compare(const f_thread_id_t id1, const f_thread_id_t id2); #endif // _di_f_thread_compare_ /** @@ -676,7 +578,7 @@ extern "C" { * @see pthread_cond_broadcast() */ #ifndef _di_f_thread_condition_unblock_all_ - extern f_return_status f_thread_condition_unblock_all(f_thread_condition_t *condition); + extern f_status_t f_thread_condition_unblock_all(f_thread_condition_t *condition); #endif // _di_f_thread_condition_unblock_all_ /** @@ -693,7 +595,7 @@ extern "C" { * @see pthread_cond_signal() */ #ifndef _di_f_thread_condition_unblock_any_ - extern f_return_status f_thread_condition_unblock_any(f_thread_condition_t *condition); + extern f_status_t f_thread_condition_unblock_any(f_thread_condition_t *condition); #endif // _di_f_thread_condition_unblock_any_ /** @@ -714,7 +616,7 @@ extern "C" { * @see pthread_cond_wait() */ #ifndef _di_f_thread_condition_wait_ - extern f_return_status f_thread_condition_wait(f_thread_condition_t *condition, f_thread_mutex_t *mutex); + extern f_status_t f_thread_condition_wait(f_thread_condition_t *condition, f_thread_mutex_t *mutex); #endif // _di_f_thread_condition_wait_ /** @@ -741,108 +643,10 @@ extern "C" { * @see pthread_cond_timedwait() */ #ifndef _di_f_thread_condition_wait_timed_ - extern f_return_status f_thread_condition_wait_timed(const struct timespec *wait, f_thread_condition_t *condition, f_thread_mutex_t *mutex); + extern f_status_t f_thread_condition_wait_timed(const struct timespec *wait, f_thread_condition_t *condition, f_thread_mutex_t *mutex); #endif // _di_f_thread_condition_wait_timed_ /** - * Resize the conditions array 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 conditions - * The string array 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_f_thread_conditions_decrease_ - extern f_return_status f_thread_conditions_decrease(f_thread_conditions_t *conditions); -#endif // _di_f_thread_conditions_decrease_ - -/** - * Resize the conditions array to a smaller size. - * - * This will resize making the array 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 conditions - * The string array 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_f_thread_conditions_decrease_by_ - extern f_return_status f_thread_conditions_decrease_by(const f_array_length_t amount, f_thread_conditions_t *conditions); -#endif // _di_f_thread_conditions_decrease_by_ - -/** - * Delete the conditions array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_thread_conditions_delete_ - extern f_return_status f_thread_conditions_delete(f_thread_conditions_t *conditions); -#endif // _di_f_thread_conditions_delete_ - -/** - * Increase the size of the conditions 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param conditions - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_conditions_increase_ - extern f_return_status f_thread_conditions_increase(f_thread_conditions_t *conditions); -#endif // _di_f_thread_conditions_increase_ - -/** - * Resize the conditions array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param conditions - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_conditions_increase_by_ - extern f_return_status f_thread_conditions_increase_by(const f_array_length_t amount, f_thread_conditions_t *conditions); -#endif // _di_f_thread_conditions_increase_by_ - -/** * Get the user account by the user id. * * @param attribute @@ -865,7 +669,7 @@ extern "C" { * @see pthread_create() */ #ifndef _di_f_thread_create_ - extern f_return_status f_thread_create(const f_thread_attribute_t *attribute, f_thread_id_t *id, void *(*routine) (void *), void *argument); + extern f_status_t f_thread_create(const f_thread_attribute_t *attribute, f_thread_id_t *id, void *(*routine) (void *), void *argument); #endif // _di_f_thread_create_ /** @@ -891,7 +695,7 @@ extern "C" { * @see pthread_detach() */ #ifndef _di_f_thread_detach_ - extern f_return_status f_thread_detach(const f_thread_id_t id); + extern f_status_t f_thread_detach(const f_thread_id_t id); #endif // _di_f_thread_detach_ /** @@ -907,108 +711,10 @@ extern "C" { * @see pthread_exit() */ #ifndef _di_f_thread_exit_ - extern f_return_status f_thread_exit(int *result); + extern f_status_t f_thread_exit(int *result); #endif // _di_f_thread_exit_ /** - * Resize the ids array 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 ids - * The string array 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_f_thread_ids_decrease_ - extern f_return_status f_thread_ids_decrease(f_thread_ids_t *ids); -#endif // _di_f_thread_ids_decrease_ - -/** - * Resize the ids array to a smaller size. - * - * This will resize making the array 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 ids - * The string array 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_f_thread_ids_decrease_by_ - extern f_return_status f_thread_ids_decrease_by(const f_array_length_t amount, f_thread_ids_t *ids); -#endif // _di_f_thread_ids_decrease_by_ - -/** - * Delete the ids array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_thread_ids_delete_ - extern f_return_status f_thread_ids_delete(f_thread_ids_t *ids); -#endif // _di_f_thread_ids_delete_ - -/** - * Increase the size of the ids 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param ids - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_ids_increase_ - extern f_return_status f_thread_ids_increase(f_thread_ids_t *ids); -#endif // _di_f_thread_ids_increase_ - -/** - * Resize the ids array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param ids - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_ids_increase_by_ - extern f_return_status f_thread_ids_increase_by(const f_array_length_t amount, f_thread_ids_t *ids); -#endif // _di_f_thread_ids_increase_by_ - -/** * Wait until the given thread exits and then join it to the current thread. * * This is a blocking operation. @@ -1031,7 +737,7 @@ extern "C" { * @see pthread_join() */ #ifndef _di_f_thread_join_ - extern f_return_status f_thread_join(const f_thread_id_t id, void **result); + extern f_status_t f_thread_join(const f_thread_id_t id, void **result); #endif // _di_f_thread_join_ /** @@ -1058,7 +764,7 @@ extern "C" { * @see pthread_tryjoin_np() */ #ifndef _di_f_thread_join_try_ - extern f_return_status f_thread_try(const f_thread_id_t id, void **result); + extern f_status_t f_thread_try(const f_thread_id_t id, void **result); #endif // _di_f_thread_join_try_ /** @@ -1090,7 +796,7 @@ extern "C" { * @see pthread_timedjoin_np() */ #ifndef _di_f_thread_join_timed_ - extern f_return_status f_thread_timed(const f_thread_id_t id, const struct timespec wait, void **result); + extern f_status_t f_thread_timed(const f_thread_id_t id, const struct timespec wait, void **result); #endif // _di_f_thread_join_timed_ /** @@ -1111,7 +817,7 @@ extern "C" { * @see pthread_key_create() */ #ifndef _di_f_thread_key_create_ - extern f_return_status f_thread_key_create(void (*routine) (void *), f_thread_key_t *key); + extern f_status_t f_thread_key_create(void (*routine) (void *), f_thread_key_t *key); #endif // _di_f_thread_key_create_ /** @@ -1129,7 +835,7 @@ extern "C" { * @see pthread_getspecific() */ #ifndef _di_f_thread_key_get_ - extern f_return_status f_thread_key_get(const f_thread_key_t key, void **value); + extern f_status_t f_thread_key_get(const f_thread_key_t key, void **value); #endif // _di_f_thread_key_get_ /** @@ -1147,108 +853,10 @@ extern "C" { * @see pthread_setspecific() */ #ifndef _di_f_thread_key_set_ - extern f_return_status f_thread_key_set(const f_thread_key_t key, const void *value); + extern f_status_t f_thread_key_set(const f_thread_key_t key, const void *value); #endif // _di_f_thread_key_set_ /** - * Resize the keys array 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 keys - * The string array 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_f_thread_keys_decrease_ - extern f_return_status f_thread_keys_decrease(f_thread_keys_t *keys); -#endif // _di_f_thread_keys_decrease_ - -/** - * Resize the keys array to a smaller size. - * - * This will resize making the array 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 keys - * The string array 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_f_thread_keys_decrease_by_ - extern f_return_status f_thread_keys_decrease_by(const f_array_length_t amount, f_thread_keys_t *keys); -#endif // _di_f_thread_keys_decrease_by_ - -/** - * Delete the keys array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_thread_keys_delete_ - extern f_return_status f_thread_keys_delete(f_thread_keys_t *keys); -#endif // _di_f_thread_keys_delete_ - -/** - * Increase the size of the keys 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param keys - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_keys_increase_ - extern f_return_status f_thread_keys_increase(f_thread_keys_t *keys); -#endif // _di_f_thread_keys_increase_ - -/** - * Resize the keys array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param keys - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_keys_increase_by_ - extern f_return_status f_thread_keys_increase_by(const f_array_length_t amount, f_thread_keys_t *keys); -#endif // _di_f_thread_keys_increase_by_ - -/** * Make a read lock on the read/write lock. * * @param lock @@ -1263,7 +871,7 @@ extern "C" { * @see pthread_rwlock_rdlock() */ #ifndef _di_f_thread_lock_ - extern f_return_status f_thread_lock(f_thread_lock_t *lock); + extern f_status_t f_thread_lock(f_thread_lock_t *lock); #endif // _di_f_thread_lock_ /** @@ -1281,108 +889,10 @@ extern "C" { * @see pthread_rwlock_tryrdlock() */ #ifndef _di_f_thread_lock_try_ - extern f_return_status f_thread_lock_try(f_thread_lock_t *lock); + extern f_status_t f_thread_lock_try(f_thread_lock_t *lock); #endif // _di_f_thread_lock_try_ /** - * Resize the locks array 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 locks - * The string array 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_f_thread_locks_decrease_ - extern f_return_status f_thread_locks_decrease(f_thread_locks_t *locks); -#endif // _di_f_thread_locks_decrease_ - -/** - * Resize the locks array to a smaller size. - * - * This will resize making the array 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 locks - * The string array 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_f_thread_locks_decrease_by_ - extern f_return_status f_thread_locks_decrease_by(const f_array_length_t amount, f_thread_locks_t *locks); -#endif // _di_f_thread_locks_decrease_by_ - -/** - * Delete the locks array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_thread_locks_delete_ - extern f_return_status f_thread_locks_delete(f_thread_locks_t *locks); -#endif // _di_f_thread_locks_delete_ - -/** - * Increase the size of the locks 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param locks - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_locks_increase_ - extern f_return_status f_thread_locks_increase(f_thread_locks_t *locks); -#endif // _di_f_thread_locks_increase_ - -/** - * Resize the locks array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param locks - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_locks_increase_by_ - extern f_return_status f_thread_locks_increase_by(const f_array_length_t amount, f_thread_locks_t *locks); -#endif // _di_f_thread_locks_increase_by_ - -/** * Create a thread mutex. * * @param attribute @@ -1403,7 +913,7 @@ extern "C" { * @see pthread_mutex_init() */ #ifndef _di_f_thread_mutex_create_ - extern f_return_status f_thread_mutex_create(f_thread_mutex_attribute_t * const attribute, f_thread_mutex_t *mutex); + extern f_status_t f_thread_mutex_create(f_thread_mutex_attribute_t * const attribute, f_thread_mutex_t *mutex); #endif // _di_f_thread_mutex_create_ /** @@ -1421,7 +931,7 @@ extern "C" { * @see pthread_mutex_destroy() */ #ifndef _di_f_thread_mutex_delete_ - extern f_return_status f_thread_mutex_delete(f_thread_mutex_t *mutex); + extern f_status_t f_thread_mutex_delete(f_thread_mutex_t *mutex); #endif // _di_f_thread_mutex_delete_ /** @@ -1441,7 +951,7 @@ extern "C" { * @see pthread_mutex_lock() */ #ifndef _di_f_thread_mutex_lock_ - extern f_return_status f_thread_mutex_lock(f_thread_mutex_t *mutex); + extern f_status_t f_thread_mutex_lock(f_thread_mutex_t *mutex); #endif // _di_f_thread_mutex_lock_ /** @@ -1463,7 +973,7 @@ extern "C" { * @see pthread_mutex_trylock() */ #ifndef _di_f_thread_mutex_lock_try_ - extern f_return_status f_thread_mutex_lock_try(f_thread_mutex_t *mutex); + extern f_status_t f_thread_mutex_lock_try(f_thread_mutex_t *mutex); #endif // _di_f_thread_mutex_lock_try_ /** @@ -1481,206 +991,10 @@ extern "C" { * @see pthread_mutex_unlock() */ #ifndef _di_f_thread_mutex_unlock_ - extern f_return_status f_thread_mutex_unlock(f_thread_mutex_t *mutex); + extern f_status_t f_thread_mutex_unlock(f_thread_mutex_t *mutex); #endif // _di_f_thread_mutex_unlock_ /** - * Resize the mutexs array 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 mutexs - * The string array 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_f_thread_mutexs_decrease_ - extern f_return_status f_thread_mutexs_decrease(f_thread_mutexs_t *mutexs); -#endif // _di_f_thread_mutexs_decrease_ - -/** - * Resize the mutexs array to a smaller size. - * - * This will resize making the array 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 mutexs - * The string array 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_f_thread_mutexs_decrease_by_ - extern f_return_status f_thread_mutexs_decrease_by(const f_array_length_t amount, f_thread_mutexs_t *mutexs); -#endif // _di_f_thread_mutexs_decrease_by_ - -/** - * Delete the mutexs array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_thread_mutexs_delete_ - extern f_return_status f_thread_mutexs_delete(f_thread_mutexs_t *mutexs); -#endif // _di_f_thread_mutexs_delete_ - -/** - * Increase the size of the mutexs 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param mutexs - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_mutexs_increase_ - extern f_return_status f_thread_mutexs_increase(f_thread_mutexs_t *mutexs); -#endif // _di_f_thread_mutexs_increase_ - -/** - * Resize the mutexs array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param mutexs - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_mutexs_increase_by_ - extern f_return_status f_thread_mutexs_increase_by(const f_array_length_t amount, f_thread_mutexs_t *mutexs); -#endif // _di_f_thread_mutexs_increase_by_ - -/** - * Resize the mutex_attributes array 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 mutex_attributes - * The string array 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_f_thread_mutex_attributes_decrease_ - extern f_return_status f_thread_mutex_attributes_decrease(f_thread_mutex_attributes_t *mutex_attributes); -#endif // _di_f_thread_mutex_attributes_decrease_ - -/** - * Resize the mutex_attributes array to a smaller size. - * - * This will resize making the array 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 mutex_attributes - * The string array 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_f_thread_mutex_attributes_decrease_by_ - extern f_return_status f_thread_mutex_attributes_decrease_by(const f_array_length_t amount, f_thread_mutex_attributes_t *mutex_attributes); -#endif // _di_f_thread_mutex_attributes_decrease_by_ - -/** - * Delete the mutex_attributes array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_thread_mutex_attributes_delete_ - extern f_return_status f_thread_mutex_attributes_delete(f_thread_mutex_attributes_t *mutex_attributes); -#endif // _di_f_thread_mutex_attributes_delete_ - -/** - * Increase the size of the mutex_attributes 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param mutex_attributes - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_mutex_attributes_increase_ - extern f_return_status f_thread_mutex_attributes_increase(f_thread_mutex_attributes_t *mutex_attributes); -#endif // _di_f_thread_mutex_attributes_increase_ - -/** - * Resize the mutex_attributes array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param mutex_attributes - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_mutex_attributes_increase_by_ - extern f_return_status f_thread_mutex_attributes_increase_by(const f_array_length_t amount, f_thread_mutex_attributes_t *mutex_attributes); -#endif // _di_f_thread_mutex_attributes_increase_by_ - -/** * Call the given routine only one time and never again. * * Subsequent calls will not call the given routine. @@ -1695,206 +1009,10 @@ extern "C" { * @see pthread_once() */ #ifndef _di_f_thread_once_ - extern f_return_status f_thread_once(void (*routine) (void), f_thread_once_t *once); + extern f_status_t f_thread_once(void (*routine) (void), f_thread_once_t *once); #endif // _di_f_thread_once_ /** - * Resize the onces array 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 onces - * The string array 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_f_thread_onces_decrease_ - extern f_return_status f_thread_onces_decrease(f_thread_onces_t *onces); -#endif // _di_f_thread_onces_decrease_ - -/** - * Resize the onces array to a smaller size. - * - * This will resize making the array 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 onces - * The string array 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_f_thread_onces_decrease_by_ - extern f_return_status f_thread_onces_decrease_by(const f_array_length_t amount, f_thread_onces_t *onces); -#endif // _di_f_thread_onces_decrease_by_ - -/** - * Delete the onces array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_thread_onces_delete_ - extern f_return_status f_thread_onces_delete(f_thread_onces_t *onces); -#endif // _di_f_thread_onces_delete_ - -/** - * Increase the size of the onces 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param onces - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_onces_increase_ - extern f_return_status f_thread_onces_increase(f_thread_onces_t *onces); -#endif // _di_f_thread_onces_increase_ - -/** - * Resize the onces array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param onces - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_onces_increase_by_ - extern f_return_status f_thread_onces_increase_by(const f_array_length_t amount, f_thread_onces_t *onces); -#endif // _di_f_thread_onces_increase_by_ - -/** - * Resize the thread set array 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 sets - * The string array 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_f_thread_sets_decrease_ - extern f_return_status f_thread_sets_decrease(f_thread_sets_t *sets); -#endif // _di_f_thread_sets_decrease_ - -/** - * Resize the thread set array to a smaller size. - * - * This will resize making the array 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 sets - * The string array 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_f_thread_sets_decrease_by_ - extern f_return_status f_thread_sets_decrease_by(const f_array_length_t amount, f_thread_sets_t *sets); -#endif // _di_f_thread_sets_decrease_by_ - -/** - * Delete the thread set array. - * - * @param string - * The string to delete. - * - * @return - * F_none on success. - * F_parameter (with error bit) if a parameter is invalid. - */ -#ifndef _di_f_thread_sets_delete_ - extern f_return_status f_thread_sets_delete(f_thread_sets_t *sets); -#endif // _di_f_thread_sets_delete_ - -/** - * Increase the size of the thread set 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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param sets - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_sets_increase_ - extern f_return_status f_thread_sets_increase(f_thread_sets_t *sets); -#endif // _di_f_thread_sets_increase_ - -/** - * Resize the thread set array to a larger size. - * - * This will resize making the array larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param sets - * The string array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_f_thread_sets_increase_by_ - extern f_return_status f_thread_sets_increase_by(const f_array_length_t amount, f_thread_sets_t *sets); -#endif // _di_f_thread_sets_increase_by_ - -/** * Send a signal to the given thread. * * @param id @@ -1913,7 +1031,7 @@ extern "C" { * @see pthread_kill() */ #ifndef _di_f_thread_signal_ - extern f_return_status f_thread_signal(const f_thread_id_t id, const int signal); + extern f_status_t f_thread_signal(const f_thread_id_t id, const int signal); #endif // _di_f_thread_signal_ /** @@ -1939,7 +1057,7 @@ extern "C" { * @see pthread_sigmask() */ #ifndef _di_f_thread_signal_mask_ - extern f_return_status f_thread_signal_mask(const int how, const sigset_t *next, sigset_t *current); + extern f_status_t f_thread_signal_mask(const int how, const sigset_t *next, sigset_t *current); #endif // _di_f_thread_signal_mask_ /** @@ -1963,7 +1081,7 @@ extern "C" { * @see pthread_sigqueue() */ #ifndef _di_f_thread_signal_queue_ - extern f_return_status f_thread_signal_queue(const f_thread_id_t id, const int signal, const union sigval value); + extern f_status_t f_thread_signal_queue(const f_thread_id_t id, const int signal, const union sigval value); #endif // _di_f_thread_signal_queue_ #ifdef __cplusplus diff --git a/level_0/f_thread/data/build/settings b/level_0/f_thread/data/build/settings index 204bc1a..80deffd 100644 --- a/level_0/f_thread/data/build/settings +++ b/level_0/f_thread/data/build/settings @@ -20,7 +20,7 @@ build_indexer ar build_language c build_libraries -pthread -lc build_libraries-individual -lf_memory -build_sources_library thread.c private-thread.c +build_sources_library thread.c build_sources_program build_sources_headers thread.h thread-common.h build_sources_script diff --git a/level_0/f_type/c/type.h b/level_0/f_type/c/type.h index b77aa7e..a9cfab3 100644 --- a/level_0/f_type/c/type.h +++ b/level_0/f_type/c/type.h @@ -10,6 +10,11 @@ #ifndef _F_type_h #define _F_type_h +// include pre-requirements +#ifndef _GNU_SOURCE + #define _GNU_SOURCE +#endif // _GNU_SOURCE + // libc includes #include #include @@ -25,17 +30,6 @@ extern "C" { */ #ifndef _di_f_type_status_t_ typedef uint16_t f_status_t; - - /** - * The c language gives warnings about return types of constants. - * Remove the const for c, but keep it for c++, which is only for function call declarations & prototypes. - * Do not declare these for the return data types themselves, instead use f_status_t; only use these for function prototypes and declarations. - */ - #ifdef __cplusplus - #define f_return_status const f_status_t - #else - #define f_return_status f_status_t - #endif // __cplusplus #endif // _di_f_type_status_t_ /** diff --git a/level_0/f_type/c/type_array.h b/level_0/f_type/c/type_array.h index ccb663d..453d3c6 100644 --- a/level_0/f_type/c/type_array.h +++ b/level_0/f_type/c/type_array.h @@ -7,7 +7,7 @@ * * Provides datatypes that require memory operations. * - * Because memory requires status.h, this is moved to a separate file to reduce potential circular dependency issues. + * Because memory requires status.h, this is moved to a separate file to prevent circular dependency issues. */ #ifndef _F_type_array_h #define _F_type_array_h @@ -37,18 +37,28 @@ extern "C" { #define f_array_lengths_t_initialize { 0, 0, 0 } + #define f_macro_array_lengths_t_adjust(status, lengths, length) f_macro_memory_structure_t_adjust(status, lengths, f_array_length_t, length) + #define f_macro_array_lengths_t_clear(lengths) f_macro_memory_structure_t_clear(lengths) - #define f_macro_array_lengths_t_new(status, lengths, length) f_macro_memory_structure_t_new(status, lengths, f_array_length_t, length) + #define f_macro_array_lengths_t_decimate(status, lengths) f_macro_memory_structure_decimate(status, lengths, f_array_length_t); + #define f_macro_array_lengths_t_decimate_by(status, lengths, amount) f_macro_memory_structure_decimate_by(status, lengths, f_array_length_t, amount); - #define f_macro_array_lengths_t_delete(status, lengths) f_macro_memory_structure_t_delete(status, lengths, f_array_length_t) - #define f_macro_array_lengths_t_destroy(status, lengths) f_macro_memory_structure_t_destroy(status, lengths, f_array_length_t) + #define f_macro_array_lengths_t_decrease(status, lengths) f_macro_memory_structure_decrease(status, lengths, f_array_length_t); + #define f_macro_array_lengths_t_decrease_by(status, lengths, amount) f_macro_memory_structure_decrease_by(status, lengths, f_array_length_t, amount); + #define f_macro_array_lengths_t_delete(status, lengths) f_macro_memory_structure_t_delete(status, lengths, f_array_length_t) #define f_macro_array_lengths_t_delete_simple(lengths) f_macro_memory_structure_t_delete_simple(lengths, f_array_length_t) - #define f_macro_array_lengths_t_destroy_simple(lengths) f_macro_memory_structure_t_destroy_simple(lengths, f_array_length_t) + + #define f_macro_array_lengths_t_destroy(status, lengths) f_macro_memory_structure_t_destroy(status, lengths, f_array_length_t) + #define f_macro_array_lengths_t_destroy_simple(lengths) f_macro_memory_structure_t_destroy_simple(lengths, f_array_length_t) + + #define f_macro_array_lengths_t_increase(status, lengths) f_macro_memory_structure_increase(status, lengths, f_array_length_t); + #define f_macro_array_lengths_t_increase_by(status, lengths, amount) f_macro_memory_structure_increase_by(status, lengths, f_array_length_t, amount); + + #define f_macro_array_lengths_t_new(status, lengths, length) f_macro_memory_structure_t_new(status, lengths, f_array_length_t, length) #define f_macro_array_lengths_t_resize(status, lengths, new_length) f_macro_memory_structure_t_resize(status, lengths, f_array_length_t, new_length) - #define f_macro_array_lengths_t_adjust(status, lengths, new_length) f_macro_memory_structure_t_adjust(status, lengths, f_array_length_t, new_length) #endif // _di_f_array_lengths_t_ /** @@ -99,18 +109,28 @@ extern "C" { #define f_cells_t_initialize {0, 0, 0} + #define f_macro_cells_t_adjust(status, cells, length) f_macro_memory_structure_t_adjust(status, cells, f_cell_t, length) + #define f_macro_cells_t_clear(cells) f_macro_memory_structure_t_clear(cells) - #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_decimate(status, cells) f_macro_memory_structure_decimate(status, cells, f_cell_t); + #define f_macro_cells_t_decimate_by(status, cells, amount) f_macro_memory_structure_decimate_by(status, cells, f_cell_t, amount); - #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_decrease(status, cells) f_macro_memory_structure_decrease(status, cells, f_cell_t); + #define f_macro_cells_t_decrease_by(status, cells, amount) f_macro_memory_structure_decrease_by(status, cells, f_cell_t, amount); + #define f_macro_cells_t_delete(status, cells) f_macro_memory_structure_t_delete(status, cells, 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_destroy(status, cells) f_macro_memory_structure_t_destroy(status, 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_increase(status, cells) f_macro_memory_structure_increase(status, cells, f_cell_t); + #define f_macro_cells_t_increase_by(status, cells, amount) f_macro_memory_structure_increase_by(status, cells, f_cell_t, amount); + + #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_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_ /** @@ -161,18 +181,28 @@ extern "C" { #define f_int8s_t_initialize { 0, 0, 0 } - #define f_macro_int8s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_int8s_t_adjust(status, int8s, length) f_macro_memory_structure_t_adjust(status, int8s, int8_t, length) - #define f_macro_int8s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, int8_t, length) + #define f_macro_int8s_t_clear(int8s) f_macro_memory_structure_t_clear(int8s) - #define f_macro_int8s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, int8_t) - #define f_macro_int8s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, int8_t) + #define f_macro_int8s_t_decimate(status, int8s) f_macro_memory_structure_decimate(status, int8s, int8_t); + #define f_macro_int8s_t_decimate_by(status, int8s, amount) f_macro_memory_structure_decimate_by(status, int8s, int8_t, amount); - #define f_macro_int8s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, int8_t) - #define f_macro_int8s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, int8_t) + #define f_macro_int8s_t_decrease(status, int8s) f_macro_memory_structure_decrease(status, int8s, int8_t); + #define f_macro_int8s_t_decrease_by(status, int8s, amount) f_macro_memory_structure_decrease_by(status, int8s, int8_t, amount); - #define f_macro_int8s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, int8_t, new_length) - #define f_macro_int8s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, int8_t, new_length) + #define f_macro_int8s_t_delete(status, int8s) f_macro_memory_structure_t_delete(status, int8s, int8_t) + #define f_macro_int8s_t_delete_simple(int8s) f_macro_memory_structure_t_delete_simple(int8s, int8_t) + + #define f_macro_int8s_t_destroy(status, int8s) f_macro_memory_structure_t_destroy(status, int8s, int8_t) + #define f_macro_int8s_t_destroy_simple(int8s) f_macro_memory_structure_t_destroy_simple(int8s, int8_t) + + #define f_macro_int8s_t_increase(status, int8s) f_macro_memory_structure_increase(status, int8s, int8_t); + #define f_macro_int8s_t_increase_by(status, int8s, amount) f_macro_memory_structure_increase_by(status, int8s, int8_t, amount); + + #define f_macro_int8s_t_new(status, int8s, length) f_macro_memory_structure_t_new(status, int8s, int8_t, length) + + #define f_macro_int8s_t_resize(status, int8s, new_length) f_macro_memory_structure_t_resize(status, int8s, int8_t, new_length) #endif // _di_int8s_t_ /** @@ -223,18 +253,28 @@ extern "C" { #define f_uint8s_t_initialize { 0, 0, 0 } - #define f_macro_uint8s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_uint8s_t_adjust(status, uint8s, length) f_macro_memory_structure_t_adjust(status, uint8s, uint8_t, length) + + #define f_macro_uint8s_t_clear(uint8s) f_macro_memory_structure_t_clear(uint8s) + + #define f_macro_uint8s_t_decimate(status, uint8s) f_macro_memory_structure_decimate(status, uint8s, uint8_t); + #define f_macro_uint8s_t_decimate_by(status, uint8s, amount) f_macro_memory_structure_decimate_by(status, uint8s, uint8_t, amount); + + #define f_macro_uint8s_t_decrease(status, uint8s) f_macro_memory_structure_decrease(status, uint8s, uint8_t); + #define f_macro_uint8s_t_decrease_by(status, uint8s, amount) f_macro_memory_structure_decrease_by(status, uint8s, uint8_t, amount); + + #define f_macro_uint8s_t_delete(status, uint8s) f_macro_memory_structure_t_delete(status, uint8s, uint8_t) + #define f_macro_uint8s_t_delete_simple(uint8s) f_macro_memory_structure_t_delete_simple(uint8s, uint8_t) - #define f_macro_uint8s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, uint8_t, length) + #define f_macro_uint8s_t_destroy(status, uint8s) f_macro_memory_structure_t_destroy(status, uint8s, uint8_t) + #define f_macro_uint8s_t_destroy_simple(uint8s) f_macro_memory_structure_t_destroy_simple(uint8s, uint8_t) - #define f_macro_uint8s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, uint8_t) - #define f_macro_uint8s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, uint8_t) + #define f_macro_uint8s_t_increase(status, uint8s) f_macro_memory_structure_increase(status, uint8s, uint8_t); + #define f_macro_uint8s_t_increase_by(status, uint8s, amount) f_macro_memory_structure_increase_by(status, uint8s, uint8_t, amount); - #define f_macro_uint8s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, uint8_t) - #define f_macro_uint8s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, uint8_t) + #define f_macro_uint8s_t_new(status, uint8s, length) f_macro_memory_structure_t_new(status, uint8s, uint8_t, length) - #define f_macro_uint8s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, uint8_t, new_length) - #define f_macro_uint8s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, uint8_t, new_length) + #define f_macro_uint8s_t_resize(status, uint8s, new_length) f_macro_memory_structure_t_resize(status, uint8s, uint8_t, new_length) #endif // _di_uint8s_t_ /** @@ -286,18 +326,28 @@ extern "C" { #define f_int16s_t_initialize { 0, 0, 0 } - #define f_macro_int16s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_int16s_t_adjust(status, int16s, length) f_macro_memory_structure_t_adjust(status, int16s, int16_t, length) - #define f_macro_int16s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, int16_t, length) + #define f_macro_int16s_t_clear(int16s) f_macro_memory_structure_t_clear(int16s) - #define f_macro_int16s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, int16_t) - #define f_macro_int16s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, int16_t) + #define f_macro_int16s_t_decimate(status, int16s) f_macro_memory_structure_decimate(status, int16s, int16_t); + #define f_macro_int16s_t_decimate_by(status, int16s, amount) f_macro_memory_structure_decimate_by(status, int16s, int16_t, amount); - #define f_macro_int16s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, int16_t) - #define f_macro_int16s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, int16_t) + #define f_macro_int16s_t_decrease(status, int16s) f_macro_memory_structure_decrease(status, int16s, int16_t); + #define f_macro_int16s_t_decrease_by(status, int16s, amount) f_macro_memory_structure_decrease_by(status, int16s, int16_t, amount); - #define f_macro_int16s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, int16_t, new_length) - #define f_macro_int16s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, int16_t, new_length) + #define f_macro_int16s_t_delete(status, int16s) f_macro_memory_structure_t_delete(status, int16s, int16_t) + #define f_macro_int16s_t_delete_simple(int16s) f_macro_memory_structure_t_delete_simple(int16s, int16_t) + + #define f_macro_int16s_t_destroy(status, int16s) f_macro_memory_structure_t_destroy(status, int16s, int16_t) + #define f_macro_int16s_t_destroy_simple(int16s) f_macro_memory_structure_t_destroy_simple(int16s, int16_t) + + #define f_macro_int16s_t_increase(status, int16s) f_macro_memory_structure_increase(status, int16s, int16_t); + #define f_macro_int16s_t_increase_by(status, int16s, amount) f_macro_memory_structure_increase_by(status, int16s, int16_t, amount); + + #define f_macro_int16s_t_new(status, int16s, length) f_macro_memory_structure_t_new(status, int16s, int16_t, length) + + #define f_macro_int16s_t_resize(status, int16s, new_length) f_macro_memory_structure_t_resize(status, int16s, int16_t, new_length) #endif // _di_int16s_t_ /** @@ -348,18 +398,28 @@ extern "C" { #define f_uint16s_t_initialize { 0, 0, 0 } - #define f_macro_uint16s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_uint16s_t_adjust(status, uint16s, length) f_macro_memory_structure_t_adjust(status, uint16s, uint16_t, length) + + #define f_macro_uint16s_t_clear(uint16s) f_macro_memory_structure_t_clear(uint16s) + + #define f_macro_uint16s_t_decimate(status, uint16s) f_macro_memory_structure_decimate(status, uint16s, uint16_t); + #define f_macro_uint16s_t_decimate_by(status, uint16s, amount) f_macro_memory_structure_decimate_by(status, uint16s, uint16_t, amount); + + #define f_macro_uint16s_t_decrease(status, uint16s) f_macro_memory_structure_decrease(status, uint16s, uint16_t); + #define f_macro_uint16s_t_decrease_by(status, uint16s, amount) f_macro_memory_structure_decrease_by(status, uint16s, uint16_t, amount); + + #define f_macro_uint16s_t_delete(status, uint16s) f_macro_memory_structure_t_delete(status, uint16s, uint16_t) + #define f_macro_uint16s_t_delete_simple(uint16s) f_macro_memory_structure_t_delete_simple(uint16s, uint16_t) - #define f_macro_uint16s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, uint16_t, length) + #define f_macro_uint16s_t_destroy(status, uint16s) f_macro_memory_structure_t_destroy(status, uint16s, uint16_t) + #define f_macro_uint16s_t_destroy_simple(uint16s) f_macro_memory_structure_t_destroy_simple(uint16s, uint16_t) - #define f_macro_uint16s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, uint16_t) - #define f_macro_uint16s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, uint16_t) + #define f_macro_uint16s_t_increase(status, uint16s) f_macro_memory_structure_increase(status, uint16s, uint16_t); + #define f_macro_uint16s_t_increase_by(status, uint16s, amount) f_macro_memory_structure_increase_by(status, uint16s, uint16_t, amount); - #define f_macro_uint16s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, uint16_t) - #define f_macro_uint16s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, uint16_t) + #define f_macro_uint16s_t_new(status, uint16s, length) f_macro_memory_structure_t_new(status, uint16s, uint16_t, length) - #define f_macro_uint16s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, uint16_t, new_length) - #define f_macro_uint16s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, uint16_t, new_length) + #define f_macro_uint16s_t_resize(status, uint16s, new_length) f_macro_memory_structure_t_resize(status, uint16s, uint16_t, new_length) #endif // _di_uint16s_t_ /** @@ -410,18 +470,28 @@ extern "C" { #define f_int32s_t_initialize { 0, 0, 0 } - #define f_macro_int32s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_int32s_t_adjust(status, int32s, length) f_macro_memory_structure_t_adjust(status, int32s, int32_t, length) - #define f_macro_int32s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, int32_t, length) + #define f_macro_int32s_t_clear(int32s) f_macro_memory_structure_t_clear(int32s) - #define f_macro_int32s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, int32_t) - #define f_macro_int32s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, int32_t) + #define f_macro_int32s_t_decimate(status, int32s) f_macro_memory_structure_decimate(status, int32s, int32_t); + #define f_macro_int32s_t_decimate_by(status, int32s, amount) f_macro_memory_structure_decimate_by(status, int32s, int32_t, amount); - #define f_macro_int32s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, int32_t) - #define f_macro_int32s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, int32_t) + #define f_macro_int32s_t_decrease(status, int32s) f_macro_memory_structure_decrease(status, int32s, int32_t); + #define f_macro_int32s_t_decrease_by(status, int32s, amount) f_macro_memory_structure_decrease_by(status, int32s, int32_t, amount); - #define f_macro_int32s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, int32_t, new_length) - #define f_macro_int32s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, int32_t, new_length) + #define f_macro_int32s_t_delete(status, int32s) f_macro_memory_structure_t_delete(status, int32s, int32_t) + #define f_macro_int32s_t_delete_simple(int32s) f_macro_memory_structure_t_delete_simple(int32s, int32_t) + + #define f_macro_int32s_t_destroy(status, int32s) f_macro_memory_structure_t_destroy(status, int32s, int32_t) + #define f_macro_int32s_t_destroy_simple(int32s) f_macro_memory_structure_t_destroy_simple(int32s, int32_t) + + #define f_macro_int32s_t_increase(status, int32s) f_macro_memory_structure_increase(status, int32s, int32_t); + #define f_macro_int32s_t_increase_by(status, int32s, amount) f_macro_memory_structure_increase_by(status, int32s, int32_t, amount); + + #define f_macro_int32s_t_new(status, int32s, length) f_macro_memory_structure_t_new(status, int32s, int32_t, length) + + #define f_macro_int32s_t_resize(status, int32s, new_length) f_macro_memory_structure_t_resize(status, int32s, int32_t, new_length) #endif // _di_int32s_t_ /** @@ -472,18 +542,28 @@ extern "C" { #define f_uint32s_t_initialize { 0, 0, 0 } - #define f_macro_uint32s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_uint32s_t_adjust(status, uint32s, length) f_macro_memory_structure_t_adjust(status, uint32s, uint32_t, length) + + #define f_macro_uint32s_t_clear(uint32s) f_macro_memory_structure_t_clear(uint32s) + + #define f_macro_uint32s_t_decimate(status, uint32s) f_macro_memory_structure_decimate(status, uint32s, uint32_t); + #define f_macro_uint32s_t_decimate_by(status, uint32s, amount) f_macro_memory_structure_decimate_by(status, uint32s, uint32_t, amount); + + #define f_macro_uint32s_t_decrease(status, uint32s) f_macro_memory_structure_decrease(status, uint32s, uint32_t); + #define f_macro_uint32s_t_decrease_by(status, uint32s, amount) f_macro_memory_structure_decrease_by(status, uint32s, uint32_t, amount); + + #define f_macro_uint32s_t_delete(status, uint32s) f_macro_memory_structure_t_delete(status, uint32s, uint32_t) + #define f_macro_uint32s_t_delete_simple(uint32s) f_macro_memory_structure_t_delete_simple(uint32s, uint32_t) - #define f_macro_uint32s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, uint32_t, length) + #define f_macro_uint32s_t_destroy(status, uint32s) f_macro_memory_structure_t_destroy(status, uint32s, uint32_t) + #define f_macro_uint32s_t_destroy_simple(uint32s) f_macro_memory_structure_t_destroy_simple(uint32s, uint32_t) - #define f_macro_uint32s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, uint32_t) - #define f_macro_uint32s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, uint32_t) + #define f_macro_uint32s_t_increase(status, uint32s) f_macro_memory_structure_increase(status, uint32s, uint32_t); + #define f_macro_uint32s_t_increase_by(status, uint32s, amount) f_macro_memory_structure_increase_by(status, uint32s, uint32_t, amount); - #define f_macro_uint32s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, uint32_t) - #define f_macro_uint32s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, uint32_t) + #define f_macro_uint32s_t_new(status, uint32s, length) f_macro_memory_structure_t_new(status, uint32s, uint32_t, length) - #define f_macro_uint32s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, uint32_t, new_length) - #define f_macro_uint32s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, uint32_t, new_length) + #define f_macro_uint32s_t_resize(status, uint32s, new_length) f_macro_memory_structure_t_resize(status, uint32s, uint32_t, new_length) #endif // _di_uint32s_t_ /** @@ -534,18 +614,28 @@ extern "C" { #define f_int64s_t_initialize { 0, 0, 0 } - #define f_macro_int64s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_int64s_t_adjust(status, int64s, length) f_macro_memory_structure_t_adjust(status, int64s, int64_t, length) - #define f_macro_int64s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, int64_t, length) + #define f_macro_int64s_t_clear(int64s) f_macro_memory_structure_t_clear(int64s) - #define f_macro_int64s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, int64_t) - #define f_macro_int64s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, int64_t) + #define f_macro_int64s_t_decimate(status, int64s) f_macro_memory_structure_decimate(status, int64s, int64_t); + #define f_macro_int64s_t_decimate_by(status, int64s, amount) f_macro_memory_structure_decimate_by(status, int64s, int64_t, amount); - #define f_macro_int64s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, int64_t) - #define f_macro_int64s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, int64_t) + #define f_macro_int64s_t_decrease(status, int64s) f_macro_memory_structure_decrease(status, int64s, int64_t); + #define f_macro_int64s_t_decrease_by(status, int64s, amount) f_macro_memory_structure_decrease_by(status, int64s, int64_t, amount); - #define f_macro_int64s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, int64_t, new_length) - #define f_macro_int64s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, int64_t, new_length) + #define f_macro_int64s_t_delete(status, int64s) f_macro_memory_structure_t_delete(status, int64s, int64_t) + #define f_macro_int64s_t_delete_simple(int64s) f_macro_memory_structure_t_delete_simple(int64s, int64_t) + + #define f_macro_int64s_t_destroy(status, int64s) f_macro_memory_structure_t_destroy(status, int64s, int64_t) + #define f_macro_int64s_t_destroy_simple(int64s) f_macro_memory_structure_t_destroy_simple(int64s, int64_t) + + #define f_macro_int64s_t_increase(status, int64s) f_macro_memory_structure_increase(status, int64s, int64_t); + #define f_macro_int64s_t_increase_by(status, int64s, amount) f_macro_memory_structure_increase_by(status, int64s, int64_t, amount); + + #define f_macro_int64s_t_new(status, int64s, length) f_macro_memory_structure_t_new(status, int64s, int64_t, length) + + #define f_macro_int64s_t_resize(status, int64s, new_length) f_macro_memory_structure_t_resize(status, int64s, int64_t, new_length) #endif // _di_int64s_t_ /** @@ -596,18 +686,28 @@ extern "C" { #define f_uint64s_t_initialize { 0, 0, 0 } - #define f_macro_uint64s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_uint64s_t_adjust(status, uint64s, length) f_macro_memory_structure_t_adjust(status, uint64s, uint64_t, length) + + #define f_macro_uint64s_t_clear(uint64s) f_macro_memory_structure_t_clear(uint64s) + + #define f_macro_uint64s_t_decimate(status, uint64s) f_macro_memory_structure_decimate(status, uint64s, uint64_t); + #define f_macro_uint64s_t_decimate_by(status, uint64s, amount) f_macro_memory_structure_decimate_by(status, uint64s, uint64_t, amount); + + #define f_macro_uint64s_t_decrease(status, uint64s) f_macro_memory_structure_decrease(status, uint64s, uint64_t); + #define f_macro_uint64s_t_decrease_by(status, uint64s, amount) f_macro_memory_structure_decrease_by(status, uint64s, uint64_t, amount); + + #define f_macro_uint64s_t_delete(status, uint64s) f_macro_memory_structure_t_delete(status, uint64s, uint64_t) + #define f_macro_uint64s_t_delete_simple(uint64s) f_macro_memory_structure_t_delete_simple(uint64s, uint64_t) - #define f_macro_uint64s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, uint64_t, length) + #define f_macro_uint64s_t_destroy(status, uint64s) f_macro_memory_structure_t_destroy(status, uint64s, uint64_t) + #define f_macro_uint64s_t_destroy_simple(uint64s) f_macro_memory_structure_t_destroy_simple(uint64s, uint64_t) - #define f_macro_uint64s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, uint64_t) - #define f_macro_uint64s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, uint64_t) + #define f_macro_uint64s_t_increase(status, uint64s) f_macro_memory_structure_increase(status, uint64s, uint64_t); + #define f_macro_uint64s_t_increase_by(status, uint64s, amount) f_macro_memory_structure_increase_by(status, uint64s, uint64_t, amount); - #define f_macro_uint64s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, uint64_t) - #define f_macro_uint64s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, uint64_t) + #define f_macro_uint64s_t_new(status, uint64s, length) f_macro_memory_structure_t_new(status, uint64s, uint64_t, length) - #define f_macro_uint64s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, uint64_t, new_length) - #define f_macro_uint64s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, uint64_t, new_length) + #define f_macro_uint64s_t_resize(status, uint64s, new_length) f_macro_memory_structure_t_resize(status, uint64s, uint64_t, new_length) #endif // _di_uint64s_t_ /** @@ -659,18 +759,28 @@ extern "C" { #define f_int128s_t_initialize { 0, 0, 0 } - #define f_macro_int128s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_int128s_t_adjust(status, int128s, length) f_macro_memory_structure_t_adjust(status, int128s, __int128_t, length) - #define f_macro_int128s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, __int128_t, length) + #define f_macro_int128s_t_clear(int128s) f_macro_memory_structure_t_clear(int128s) - #define f_macro_int128s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, __int128_t) - #define f_macro_int128s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, __int128_t) + #define f_macro_int128s_t_decimate(status, int128s) f_macro_memory_structure_decimate(status, int128s, __int128_t); + #define f_macro_int128s_t_decimate_by(status, int128s, amount) f_macro_memory_structure_decimate_by(status, int128s, __int128_t, amount); - #define f_macro_int128s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, __int128_t) - #define f_macro_int128s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, __int128_t) + #define f_macro_int128s_t_decrease(status, int128s) f_macro_memory_structure_decrease(status, int128s, __int128_t); + #define f_macro_int128s_t_decrease_by(status, int128s, amount) f_macro_memory_structure_decrease_by(status, int128s, __int128_t, amount); - #define f_macro_int128s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, __int128_t, new_length) - #define f_macro_int128s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, __int128_t, new_length) + #define f_macro_int128s_t_delete(status, int128s) f_macro_memory_structure_t_delete(status, int128s, __int128_t) + #define f_macro_int128s_t_delete_simple(int128s) f_macro_memory_structure_t_delete_simple(int128s, __int128_t) + + #define f_macro_int128s_t_destroy(status, int128s) f_macro_memory_structure_t_destroy(status, int128s, __int128_t) + #define f_macro_int128s_t_destroy_simple(int128s) f_macro_memory_structure_t_destroy_simple(int128s, __int128_t) + + #define f_macro_int128s_t_increase(status, int128s) f_macro_memory_structure_increase(status, int128s, __int128_t); + #define f_macro_int128s_t_increase_by(status, int128s, amount) f_macro_memory_structure_increase_by(status, int128s, __int128_t, amount); + + #define f_macro_int128s_t_new(status, int128s, length) f_macro_memory_structure_t_new(status, int128s, __int128_t, length) + + #define f_macro_int128s_t_resize(status, int128s, new_length) f_macro_memory_structure_t_resize(status, int128s, __int128_t, new_length) #endif // _di_int128s_t_ /** @@ -721,18 +831,28 @@ extern "C" { #define f_uint128s_t_initialize { 0, 0, 0 } - #define f_macro_uint128s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_uint128s_t_adjust(status, uint128s, length) f_macro_memory_structure_t_adjust(status, uint128s, __uint128_t, length) + + #define f_macro_uint128s_t_clear(uint128s) f_macro_memory_structure_t_clear(uint128s) + + #define f_macro_uint128s_t_decimate(status, uint128s) f_macro_memory_structure_decimate(status, uint128s, __uint128_t); + #define f_macro_uint128s_t_decimate_by(status, uint128s, amount) f_macro_memory_structure_decimate_by(status, uint128s, __uint128_t, amount); + + #define f_macro_uint128s_t_decrease(status, uint128s) f_macro_memory_structure_decrease(status, uint128s, __uint128_t); + #define f_macro_uint128s_t_decrease_by(status, uint128s, amount) f_macro_memory_structure_decrease_by(status, uint128s, __uint128_t, amount); + + #define f_macro_uint128s_t_delete(status, uint128s) f_macro_memory_structure_t_delete(status, uint128s, __uint128_t) + #define f_macro_uint128s_t_delete_simple(uint128s) f_macro_memory_structure_t_delete_simple(uint128s, __uint128_t) - #define f_macro_uint128s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, __uint128_t, length) + #define f_macro_uint128s_t_destroy(status, uint128s) f_macro_memory_structure_t_destroy(status, uint128s, __uint128_t) + #define f_macro_uint128s_t_destroy_simple(uint128s) f_macro_memory_structure_t_destroy_simple(uint128s, __uint128_t) - #define f_macro_uint128s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, __uint128_t) - #define f_macro_uint128s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, __uint128_t) + #define f_macro_uint128s_t_increase(status, uint128s) f_macro_memory_structure_increase(status, uint128s, __uint128_t); + #define f_macro_uint128s_t_increase_by(status, uint128s, amount) f_macro_memory_structure_increase_by(status, uint128s, __uint128_t, amount); - #define f_macro_uint128s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, __uint128_t) - #define f_macro_uint128s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, __uint128_t) + #define f_macro_uint128s_t_new(status, uint128s, length) f_macro_memory_structure_t_new(status, uint128s, __uint128_t, length) - #define f_macro_uint128s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, __uint128_t, new_length) - #define f_macro_uint128s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, __uint128_t, new_length) + #define f_macro_uint128s_t_resize(status, uint128s, new_length) f_macro_memory_structure_t_resize(status, uint128s, __uint128_t, new_length) #endif // _di_uint128s_t_ /** @@ -783,18 +903,28 @@ extern "C" { #define f_int128s_t_initialize { 0, 0, 0 } - #define f_macro_int128s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_int128s_t_adjust(status, int128s, length) f_macro_memory_structure_t_adjust(status, int128s, int64_t, length) - #define f_macro_int128s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, int64_t, length) + #define f_macro_int128s_t_clear(int128s) f_macro_memory_structure_t_clear(int128s) - #define f_macro_int128s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, int64_t) - #define f_macro_int128s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, int64_t) + #define f_macro_int128s_t_decimate(status, int128s) f_macro_memory_structure_decimate(status, int128s, int64_t); + #define f_macro_int128s_t_decimate_by(status, int128s, amount) f_macro_memory_structure_decimate_by(status, int128s, int64_t, amount); - #define f_macro_int128s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, int64_t) - #define f_macro_int128s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, int64_t) + #define f_macro_int128s_t_decrease(status, int128s) f_macro_memory_structure_decrease(status, int128s, int64_t); + #define f_macro_int128s_t_decrease_by(status, int128s, amount) f_macro_memory_structure_decrease_by(status, int128s, int64_t, amount); - #define f_macro_int128s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, int64_t, new_length) - #define f_macro_int128s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, int64_t, new_length) + #define f_macro_int128s_t_delete(status, int128s) f_macro_memory_structure_t_delete(status, int128s, int64_t) + #define f_macro_int128s_t_delete_simple(int128s) f_macro_memory_structure_t_delete_simple(int128s, int64_t) + + #define f_macro_int128s_t_destroy(status, int128s) f_macro_memory_structure_t_destroy(status, int128s, int64_t) + #define f_macro_int128s_t_destroy_simple(int128s) f_macro_memory_structure_t_destroy_simple(int128s, int64_t) + + #define f_macro_int128s_t_increase(status, int128s) f_macro_memory_structure_increase(status, int128s, int64_t); + #define f_macro_int128s_t_increase_by(status, int128s, amount) f_macro_memory_structure_increase_by(status, int128s, int64_t, amount); + + #define f_macro_int128s_t_new(status, int128s, length) f_macro_memory_structure_t_new(status, int128s, int64_t, length) + + #define f_macro_int128s_t_resize(status, int128s, new_length) f_macro_memory_structure_t_resize(status, int128s, int64_t, new_length) #endif // _di_int128s_t_ /** @@ -845,18 +975,28 @@ extern "C" { #define f_uint128s_t_initialize { 0, 0, 0 } - #define f_macro_uint128s_t_clear(numbers) f_macro_memory_structure_t_clear(numbers) + #define f_macro_uint128s_t_adjust(status, uint128s, length) f_macro_memory_structure_t_adjust(status, uint128s, uint64_t, length) + + #define f_macro_uint128s_t_clear(uint128s) f_macro_memory_structure_t_clear(uint128s) + + #define f_macro_uint128s_t_decimate(status, uint128s) f_macro_memory_structure_decimate(status, uint128s, uint64_t); + #define f_macro_uint128s_t_decimate_by(status, uint128s, amount) f_macro_memory_structure_decimate_by(status, uint128s, uint64_t, amount); + + #define f_macro_uint128s_t_decrease(status, uint128s) f_macro_memory_structure_decrease(status, uint128s, uint64_t); + #define f_macro_uint128s_t_decrease_by(status, uint128s, amount) f_macro_memory_structure_decrease_by(status, uint128s, uint64_t, amount); + + #define f_macro_uint128s_t_delete(status, uint128s) f_macro_memory_structure_t_delete(status, uint128s, uint64_t) + #define f_macro_uint128s_t_delete_simple(uint128s) f_macro_memory_structure_t_delete_simple(uint128s, uint64_t) - #define f_macro_uint128s_t_new(status, numbers, length) f_macro_memory_structure_t_new(status, numbers, uint64_t, length) + #define f_macro_uint128s_t_destroy(status, uint128s) f_macro_memory_structure_t_destroy(status, uint128s, uint64_t) + #define f_macro_uint128s_t_destroy_simple(uint128s) f_macro_memory_structure_t_destroy_simple(uint128s, uint64_t) - #define f_macro_uint128s_t_delete(status, numbers) f_macro_memory_structure_t_delete(status, numbers, uint64_t) - #define f_macro_uint128s_t_destroy(status, numbers) f_macro_memory_structure_t_destroy(status, numbers, uint64_t) + #define f_macro_uint128s_t_increase(status, uint128s) f_macro_memory_structure_increase(status, uint128s, uint64_t); + #define f_macro_uint128s_t_increase_by(status, uint128s, amount) f_macro_memory_structure_increase_by(status, uint128s, uint64_t, amount); - #define f_macro_uint128s_t_delete_simple(numbers) f_macro_memory_structure_t_delete_simple(numbers, uint64_t) - #define f_macro_uint128s_t_destroy_simple(numbers) f_macro_memory_structure_t_destroy_simple(numbers, uint64_t) + #define f_macro_uint128s_t_new(status, uint128s, length) f_macro_memory_structure_t_new(status, uint128s, uint64_t, length) - #define f_macro_uint128s_t_resize(status, numbers, new_length) f_macro_memory_structure_t_resize(status, numbers, uint64_t, new_length) - #define f_macro_uint128s_t_adjust(status, numbers, new_length) f_macro_memory_structure_t_adjust(status, numbers, uint64_t, new_length) + #define f_macro_uint128s_t_resize(status, uint128s, new_length) f_macro_memory_structure_t_resize(status, uint128s, uint64_t, new_length) #endif // _di_uint128s_t_ /** diff --git a/level_0/f_utf/c/private-utf.c b/level_0/f_utf/c/private-utf.c index 5366791..b103e25 100644 --- a/level_0/f_utf/c/private-utf.c +++ b/level_0/f_utf/c/private-utf.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_f_utf_character_is_alpha_) || !defined(_di_f_utf_is_alpha_) - f_return_status private_f_utf_character_is_alpha(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_alpha(const f_utf_character_t character, const uint8_t width) { if (private_f_utf_character_is_zero_width(character, width)) { return F_false; @@ -53,7 +53,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_alpha_) || !defined(_di_f_utf_is_alpha_) #if !defined(_di_f_utf_character_is_alpha_digit_) || !defined(_di_f_utf_is_alpha_digit_) - f_return_status private_f_utf_character_is_alpha_digit(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_alpha_digit(const f_utf_character_t character, const uint8_t width) { if (private_f_utf_character_is_digit(character, width)) { return F_true; @@ -100,7 +100,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_alpha_digit_) || !defined(_di_f_utf_is_alpha_digit_) #if !defined(_di_f_utf_character_is_alpha_numeric_) || !defined(_di_f_utf_is_alpha_numeric_) - f_return_status private_f_utf_character_is_alpha_numeric(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_alpha_numeric(const f_utf_character_t character, const uint8_t width) { if (private_f_utf_character_is_numeric(character, width)) { return F_true; @@ -143,7 +143,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_alpha_numeric_) || !defined(_di_f_utf_is_alpha_numeric_) #if !defined(_di_f_utf_character_is_ascii_) || !defined(_di_f_utf_is_ascii_) - f_return_status private_f_utf_character_is_ascii(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_ascii(const f_utf_character_t character, const uint8_t width) { if (!width) { const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character); @@ -158,7 +158,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_ascii_) || !defined(_di_f_utf_is_ascii_) #if !defined(_di_f_utf_character_is_combining_) || !defined(_di_f_utf_is_combining_) - f_return_status private_f_utf_character_is_combining(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_combining(const f_utf_character_t character, const uint8_t width) { if (width == 2) { @@ -202,7 +202,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_combining_) || !defined(_di_f_utf_is_combining_) #if !defined(_di_f_utf_character_is_control_) || !defined(_di_f_utf_is_control_) - f_return_status private_f_utf_character_is_control(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_control(const f_utf_character_t character, const uint8_t width) { if (width == 2) { @@ -241,7 +241,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_control_) || !defined(_di_f_utf_is_control_) #if !defined(_di_f_utf_character_is_control_picture_) || !defined(_di_f_utf_is_control_picture_) - f_return_status private_f_utf_character_is_control_picture(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_control_picture(const f_utf_character_t character, const uint8_t width) { if (width == 3) { // Control Pictures: U+2400 to U+2426. @@ -260,7 +260,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_control_picture_) || !defined(_di_f_utf_is_control_picture_) #if !defined(_di_f_utf_character_is_digit_) || !defined(_di_f_utf_is_digit_) - f_return_status private_f_utf_character_is_digit(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_digit(const f_utf_character_t character, const uint8_t width) { if (width == 2) { uint16_t bytes = (uint16_t) ((character & 0xffff0000) >> 16); @@ -633,7 +633,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_digit_) || !defined(_di_f_utf_is_digit_) #if !defined(_di_f_utf_character_is_emoji_) || !defined(_di_f_utf_is_emoji_) - f_return_status private_f_utf_character_is_emoji(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_emoji(const f_utf_character_t character, const uint8_t width) { // reduce the number of checks by grouping checks by first byte. const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character); @@ -1126,7 +1126,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_emoji_) || !defined(_di_f_utf_is_emoji_) #if !defined(_di_f_utf_character_is_numeric_) || !defined(_di_f_utf_is_numeric_) - f_return_status private_f_utf_character_is_numeric(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_numeric(const f_utf_character_t character, const uint8_t width) { if (private_f_utf_character_is_digit(character, width)) { return F_true; @@ -1155,7 +1155,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_numeric_) || !defined(_di_f_utf_is_numeric_) #if !defined(_di_f_utf_character_is_phonetic_) || !defined(_di_f_utf_is_phonetic_) - f_return_status private_f_utf_character_is_phonetic(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_phonetic(const f_utf_character_t character, const uint8_t width) { if (width == 3) { @@ -1175,7 +1175,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_phonetic_) || !defined(_di_f_utf_is_phonetic_) #if !defined(_di_f_utf_character_is_private_) || !defined(_di_f_utf_is_private_) - f_return_status private_f_utf_character_is_private(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_private(const f_utf_character_t character, const uint8_t width) { if (width < 3) { return F_false; @@ -1233,7 +1233,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_private_) || !defined(_di_f_utf_is_private_) #if !defined(_di_f_utf_character_is_punctuation_) || !defined(_di_f_utf_is_punctuation_) - f_return_status private_f_utf_character_is_punctuation(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_punctuation(const f_utf_character_t character, const uint8_t width) { // reduce the number of checks by grouping checks by first byte. const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character); @@ -1900,7 +1900,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_punctuation_) || !defined(_di_f_utf_is_punctuation_) #if !defined(_di_f_utf_character_is_symbol_) || !defined(_di_f_utf_is_symbol_) - f_return_status private_f_utf_character_is_symbol(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_symbol(const f_utf_character_t character, const uint8_t width) { // reduce the number of checks by grouping checks by first byte. const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character); @@ -1912,7 +1912,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_symbol_) || !defined(_di_f_utf_is_symbol_) #if !defined(_di_f_utf_character_is_unassigned_) || !defined(_di_f_utf_is_unassigned_) - f_return_status private_f_utf_character_is_unassigned(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_unassigned(const f_utf_character_t character, const uint8_t width) { // reduce the number of checks by grouping checks by first byte. const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character); @@ -1931,7 +1931,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_unassigned_) || !defined(_di_f_utf_is_unassigned_) #if !defined(_di_f_utf_character_is_valid_) || !defined(_di_f_utf_is_valid_) - f_return_status private_f_utf_character_is_valid(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_valid(const f_utf_character_t character, const uint8_t width) { // reduce the number of checks by grouping checks by byte. const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character); @@ -2033,7 +2033,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_valid_) || !defined(_di_f_utf_is_valid_) #if !defined(_di_f_utf_character_is_whitespace_) || !defined(_di_f_utf_is_whitespace_) - f_return_status private_f_utf_character_is_whitespace(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_whitespace(const f_utf_character_t character, const uint8_t width) { if (width == 2) { @@ -2073,7 +2073,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_whitespace_) || !defined(_di_f_utf_is_whitespace_) #if !defined(_di_f_utf_character_is_whitespace_modifier_) || !defined(_di_f_utf_is_whitespace_modifier_) - f_return_status private_f_utf_character_is_whitespace_modifier(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_whitespace_modifier(const f_utf_character_t character, const uint8_t width) { if (width == 2) { @@ -2088,7 +2088,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_whitespace_modifier_) || !defined(_di_f_utf_is_whitespace_modifier_) #if !defined(_di_f_utf_character_is_whitespace_other_) || !defined(_di_f_utf_is_whitespace_other_) - f_return_status private_f_utf_character_is_whitespace_other(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_whitespace_other(const f_utf_character_t character, const uint8_t width) { // Ogham: U+1680 (isn't whitespace but is technically considered one: ( )). if (character == 0xe19a8000) { @@ -2100,7 +2100,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_whitespace_other_) || !defined(_di_f_utf_is_whitespace_other_) #if !defined(_di_f_utf_character_is_word_) || !defined(_di_f_utf_is_word_) - f_return_status private_f_utf_character_is_word(const f_utf_character_t character, const uint8_t width, const bool strict) { + f_status_t private_f_utf_character_is_word(const f_utf_character_t character, const uint8_t width, const bool strict) { if (private_f_utf_character_is_alpha_digit(character, width)) { return F_true; @@ -2144,7 +2144,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_word_) || !defined(_di_f_utf_is_word_) #if !defined(_di_f_utf_character_is_word_dash_) || !defined(_di_f_utf_is_word_dash_) - f_return_status private_f_utf_character_is_word_dash(const f_utf_character_t character, const uint8_t width, const bool strict) { + f_status_t private_f_utf_character_is_word_dash(const f_utf_character_t character, const uint8_t width, const bool strict) { if (private_f_utf_character_is_word(character, width, strict)) { return F_true; @@ -2163,7 +2163,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_word_dash_) || !defined(_di_f_utf_is_word_dash_) #if !defined(_di_f_utf_character_is_word_dash_plus_) || !defined(_di_f_utf_is_word_dash_plus_) - f_return_status private_f_utf_character_is_word_dash_plus(const f_utf_character_t character, const uint8_t width, const bool strict) { + f_status_t private_f_utf_character_is_word_dash_plus(const f_utf_character_t character, const uint8_t width, const bool strict) { if (private_f_utf_character_is_word_dash(character, width, strict)) { return F_true; @@ -2182,7 +2182,7 @@ extern "C" { #endif // !defined(_di_f_utf_character_is_word_dash_plus_) || !defined(_di_f_utf_is_word_dash_plus_) #if !defined(_di_f_utf_character_is_zero_width_) || !defined(_di_f_utf_is_zero_width_) - f_return_status private_f_utf_character_is_zero_width(const f_utf_character_t character, const uint8_t width) { + f_status_t private_f_utf_character_is_zero_width(const f_utf_character_t character, const uint8_t width) { // reduce the number of checks by grouping checks by first byte. const uint8_t byte_first = f_macro_utf_character_t_to_char_1(character); diff --git a/level_0/f_utf/c/private-utf.h b/level_0/f_utf/c/private-utf.h index 2f0767f..c22c227 100644 --- a/level_0/f_utf/c/private-utf.h +++ b/level_0/f_utf/c/private-utf.h @@ -36,7 +36,7 @@ extern "C" { * @see f_utf_is_alpha() */ #if !defined(_di_f_utf_character_is_alpha_) || !defined(_di_f_utf_is_alpha_) - extern f_return_status private_f_utf_character_is_alpha(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_alpha(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_alpha_) || !defined(_di_f_utf_is_alpha_) /** @@ -58,7 +58,7 @@ extern "C" { * @see f_utf_is_alpha_digit() */ #if !defined(_di_f_utf_character_is_alpha_digit_) || !defined(_di_f_utf_is_alpha_digit_) - extern f_return_status private_f_utf_character_is_alpha_digit(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_alpha_digit(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_alpha_digit_) || !defined(_di_f_utf_is_alpha_digit_) /** @@ -80,7 +80,7 @@ extern "C" { * @see f_utf_is_alpha_numeric() */ #if !defined(_di_f_utf_character_is_alpha_numeric_) || !defined(_di_f_utf_is_alpha_numeric_) - extern f_return_status private_f_utf_character_is_alpha_numeric(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_alpha_numeric(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_alpha_numeric_) || !defined(_di_f_utf_is_alpha_numeric_) /** @@ -102,7 +102,7 @@ extern "C" { * @see f_utf_is_ascii() */ #if !defined(_di_f_utf_character_is_ascii_) || !defined(_di_f_utf_is_ascii_) - extern f_return_status private_f_utf_character_is_ascii(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_ascii(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_ascii_) || !defined(_di_f_utf_is_ascii_) /** @@ -124,7 +124,7 @@ extern "C" { * @see f_utf_is_combining() */ #if !defined(_di_f_utf_character_is_combining_) || !defined(_di_f_utf_is_combining_) - extern f_return_status private_f_utf_character_is_combining(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_combining(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_combining_) || !defined(_di_f_utf_is_combining_) /** @@ -146,7 +146,7 @@ extern "C" { * @see f_utf_is_control() */ #if !defined(_di_f_utf_character_is_control_) || !defined(_di_f_utf_is_control_) - extern f_return_status private_f_utf_character_is_control(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_control(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_control_) || !defined(_di_f_utf_is_control_) /** @@ -168,7 +168,7 @@ extern "C" { * @see f_utf_is_control_picture() */ #if !defined(_di_f_utf_character_is_control_picture_) || !defined(_di_f_utf_is_control_picture_) - extern f_return_status private_f_utf_character_is_control_picture(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_control_picture(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_control_picture_) || !defined(_di_f_utf_is_control_picture_) /** @@ -190,7 +190,7 @@ extern "C" { * @see f_utf_is_digit() */ #if !defined(_di_f_utf_character_is_digit_) || !defined(_di_f_utf_is_digit_) - extern f_return_status private_f_utf_character_is_digit(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_digit(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_digit_) || !defined(_di_f_utf_is_digit_) /** @@ -212,7 +212,7 @@ extern "C" { * @see f_utf_is_emoji() */ #if !defined(_di_f_utf_character_is_emoji_) || !defined(_di_f_utf_is_emoji_) - extern f_return_status private_f_utf_character_is_emoji(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_emoji(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_emoji_) || !defined(_di_f_utf_is_emoji_) /** @@ -234,7 +234,7 @@ extern "C" { * @see f_utf_is_numeric() */ #if !defined(_di_f_utf_character_is_numeric_) || !defined(_di_f_utf_is_numeric_) - extern f_return_status private_f_utf_character_is_numeric(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_numeric(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_numeric_) || !defined(_di_f_utf_is_numeric_) /** @@ -256,7 +256,7 @@ extern "C" { * @see f_utf_is_phonetic() */ #if !defined(_di_f_utf_character_is_phonetic_) || !defined(_di_f_utf_is_phonetic_) - extern f_return_status private_f_utf_character_is_phonetic(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_phonetic(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_phonetic_) || !defined(_di_f_utf_is_phonetic_) /** @@ -278,7 +278,7 @@ extern "C" { * @see f_utf_is_private() */ #if !defined(_di_f_utf_character_is_private_) || !defined(_di_f_utf_is_private_) - extern f_return_status private_f_utf_character_is_private(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_private(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_private_) || !defined(_di_f_utf_is_private_) /** @@ -300,7 +300,7 @@ extern "C" { * @see f_utf_is_punctuation() */ #if !defined(_di_f_utf_character_is_punctuation_) || !defined(_di_f_utf_is_punctuation_) - extern f_return_status private_f_utf_character_is_punctuation(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_punctuation(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_punctuation_) || !defined(_di_f_utf_is_punctuation_) /** @@ -322,7 +322,7 @@ extern "C" { * @see f_utf_is_symbol() */ #if !defined(_di_f_utf_character_is_symbol_) || !defined(_di_f_utf_is_symbol_) - extern f_return_status private_f_utf_character_is_symbol(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_symbol(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_symbol_) || !defined(_di_f_utf_is_symbol_) /** @@ -344,7 +344,7 @@ extern "C" { * @see f_utf_is_unassigned() */ #if !defined(_di_f_utf_character_is_unassigned_) || !defined(_di_f_utf_is_unassigned_) - extern f_return_status private_f_utf_character_is_unassigned(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_unassigned(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_unassigned_) || !defined(_di_f_utf_is_unassigned_) /** @@ -366,7 +366,7 @@ extern "C" { * @see f_utf_is_valid() */ #if !defined(_di_f_utf_character_is_valid_) || !defined(_di_f_utf_is_valid_) - extern f_return_status private_f_utf_character_is_valid(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_valid(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_valid_) || !defined(_di_f_utf_is_valid_) /** @@ -388,7 +388,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #if !defined(_di_f_utf_character_is_whitespace_) || !defined(_di_f_utf_is_whitespace_) - extern f_return_status private_f_utf_character_is_whitespace(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_whitespace(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_whitespace_) || !defined(_di_f_utf_is_whitespace_) /** @@ -410,7 +410,7 @@ extern "C" { * @see f_utf_is_whitespace_modifier() */ #if !defined(_di_f_utf_character_is_whitespace_modifier_) || !defined(_di_f_utf_is_whitespace_modifier_) - extern f_return_status private_f_utf_character_is_whitespace_modifier(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_whitespace_modifier(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_whitespace_modifier_) || !defined(_di_f_utf_is_whitespace_modifier_) /** @@ -432,7 +432,7 @@ extern "C" { * @see f_utf_is_whitespace_other() */ #if !defined(_di_f_utf_character_is_whitespace_other_) || !defined(_di_f_utf_is_whitespace_other_) - extern f_return_status private_f_utf_character_is_whitespace_other(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_whitespace_other(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_whitespace_other_) || !defined(_di_f_utf_is_whitespace_other_) /** @@ -458,7 +458,7 @@ extern "C" { * @see f_utf_is_word() */ #if !defined(_di_f_utf_character_is_word_) || !defined(_di_f_utf_is_word_) - extern f_return_status private_f_utf_character_is_word(const f_utf_character_t character, const uint8_t width, const bool strict) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_word(const f_utf_character_t character, const uint8_t width, const bool strict) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_word_) || !defined(_di_f_utf_is_word_) /** @@ -484,7 +484,7 @@ extern "C" { * @see f_utf_is_word_dash() */ #if !defined(_di_f_utf_character_is_word_dash_) || !defined(_di_f_utf_is_word_dash_) - extern f_return_status private_f_utf_character_is_word_dash(const f_utf_character_t character, const uint8_t width, const bool strict) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_word_dash(const f_utf_character_t character, const uint8_t width, const bool strict) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_word_dash_) || !defined(_di_f_utf_is_word_dash_) /** @@ -510,7 +510,7 @@ extern "C" { * @see f_utf_is_word_dash_plus() */ #if !defined(_di_f_utf_character_is_word_dash_plus_) || !defined(_di_f_utf_is_word_dash_plus_) - extern f_return_status private_f_utf_character_is_word_dash_plus(const f_utf_character_t character, const uint8_t width, const bool strict) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_word_dash_plus(const f_utf_character_t character, const uint8_t width, const bool strict) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_word_dash_plus_) || !defined(_di_f_utf_is_word_dash_plus_) /** @@ -532,7 +532,7 @@ extern "C" { * @see f_utf_is_zero_width() */ #if !defined(_di_f_utf_character_is_zero_width_) || !defined(_di_f_utf_is_zero_width_) - extern f_return_status private_f_utf_character_is_zero_width(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; + extern f_status_t private_f_utf_character_is_zero_width(const f_utf_character_t character, const uint8_t width) f_gcc_attribute_visibility_internal; #endif // !defined(_di_f_utf_character_is_zero_width_) || !defined(_di_f_utf_is_zero_width_) #ifdef __cplusplus diff --git a/level_0/f_utf/c/utf.c b/level_0/f_utf/c/utf.c index e09a2a9..b925b7d 100644 --- a/level_0/f_utf/c/utf.c +++ b/level_0/f_utf/c/utf.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_f_utf_buffer_decrement_ - f_return_status f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_string_length_t step) { + f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_string_length_t step) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (step < 1) return F_status_set_error(F_parameter); @@ -37,7 +37,7 @@ extern "C" { #endif // _di_f_utf_buffer_decrement_ #ifndef _di_f_utf_buffer_increment_ - f_return_status f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_string_length_t step) { + f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_string_length_t step) { #ifndef _di_level_0_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (step < 1) return F_status_set_error(F_parameter); @@ -77,7 +77,7 @@ extern "C" { #endif // _di_f_utf_buffer_increment_ #ifndef _di_f_utf_character_is_ - f_return_status f_utf_character_is(const f_utf_character_t character) { + f_status_t f_utf_character_is(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -93,7 +93,7 @@ extern "C" { #endif // _di_f_utf_character_is_ #ifndef _di_f_utf_character_is_alpha_ - f_return_status f_utf_character_is_alpha(const f_utf_character_t character) { + f_status_t f_utf_character_is_alpha(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -113,7 +113,7 @@ extern "C" { #endif // _di_f_utf_character_is_alpha_ #ifndef _di_f_utf_character_is_alpha_digit_ - f_return_status f_utf_character_is_alpha_digit(const f_utf_character_t character) { + f_status_t f_utf_character_is_alpha_digit(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -133,7 +133,7 @@ extern "C" { #endif // _di_f_utf_character_is_alpha_digit_ #ifndef _di_f_utf_character_is_alpha_numeric_ - f_return_status f_utf_character_is_alpha_numeric(const f_utf_character_t character) { + f_status_t f_utf_character_is_alpha_numeric(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -153,7 +153,7 @@ extern "C" { #endif // _di_f_utf_character_is_alpha_numeric_ #ifndef _di_f_utf_character_is_ascii_ - f_return_status f_utf_character_is_ascii(const f_utf_character_t character) { + f_status_t f_utf_character_is_ascii(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (width == 1) { @@ -165,7 +165,7 @@ extern "C" { #endif // _di_f_utf_character_is_ascii_ #ifndef _di_f_utf_character_is_combining_ - f_return_status f_utf_character_is_combining(const f_utf_character_t character) { + f_status_t f_utf_character_is_combining(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -186,7 +186,7 @@ extern "C" { #endif // _di_f_utf_character_is_combining_ #ifndef _di_f_utf_character_is_control_ - f_return_status f_utf_character_is_control(const f_utf_character_t character) { + f_status_t f_utf_character_is_control(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -206,7 +206,7 @@ extern "C" { #endif // _di_f_utf_character_is_control_ #ifndef _di_f_utf_character_is_control_picture_ - f_return_status f_utf_character_is_control_picture(const f_utf_character_t character) { + f_status_t f_utf_character_is_control_picture(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -228,7 +228,7 @@ extern "C" { #endif // _di_f_utf_character_is_control_picture_ #ifndef _di_f_utf_character_is_digit_ - f_return_status f_utf_character_is_digit(const f_utf_character_t character) { + f_status_t f_utf_character_is_digit(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -248,7 +248,7 @@ extern "C" { #endif // _di_f_utf_character_is_digit_ #ifndef _di_f_utf_character_is_emoji_ - f_return_status f_utf_character_is_emoji(const f_utf_character_t character) { + f_status_t f_utf_character_is_emoji(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -268,7 +268,7 @@ extern "C" { #endif // _di_f_utf_character_is_emoji_ #ifndef _di_f_utf_character_is_fragment_ - f_return_status f_utf_character_is_fragment(const f_utf_character_t character) { + f_status_t f_utf_character_is_fragment(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (width == 1) return F_true; @@ -278,7 +278,7 @@ extern "C" { #endif // _di_f_utf_character_is_fragment_ #ifndef _di_f_utf_character_is_graph_ - f_return_status f_utf_character_is_graph(const f_utf_character_t character) { + f_status_t f_utf_character_is_graph(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -310,7 +310,7 @@ extern "C" { #endif // _di_f_utf_character_is_graph_ #ifndef _di_f_utf_character_is_numeric_ - f_return_status f_utf_character_is_numeric(const f_utf_character_t character) { + f_status_t f_utf_character_is_numeric(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -330,7 +330,7 @@ extern "C" { #endif // _di_f_utf_character_is_numeric_ #ifndef _di_f_utf_character_is_phonetic_ - f_return_status f_utf_character_is_phonetic(const f_utf_character_t character) { + f_status_t f_utf_character_is_phonetic(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -348,7 +348,7 @@ extern "C" { #endif // _di_f_utf_character_is_phonetic_ #ifndef _di_f_utf_character_is_private_ - f_return_status f_utf_character_is_private(const f_utf_character_t character) { + f_status_t f_utf_character_is_private(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -366,7 +366,7 @@ extern "C" { #endif // _di_f_utf_character_is_phonetic_ #ifndef _di_f_utf_character_is_punctuation_ - f_return_status f_utf_character_is_punctuation(const f_utf_character_t character) { + f_status_t f_utf_character_is_punctuation(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -413,7 +413,7 @@ extern "C" { #endif // _di_f_utf_character_is_punctuation_ #ifndef _di_f_utf_character_is_symbol_ - f_return_status f_utf_character_is_symbol(const f_utf_character_t character) { + f_status_t f_utf_character_is_symbol(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -445,7 +445,7 @@ extern "C" { #endif // _di_f_utf_character_is_symbol_ #ifndef _di_f_utf_character_is_unassigned_ - f_return_status f_utf_character_is_unassigned(const f_utf_character_t character) { + f_status_t f_utf_character_is_unassigned(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width || width == 1) { @@ -457,7 +457,7 @@ extern "C" { #endif // _di_f_utf_character_is_unassigned_ #ifndef _di_f_utf_character_is_valid_ - f_return_status f_utf_character_is_valid(const f_utf_character_t character) { + f_status_t f_utf_character_is_valid(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (width == 1) { @@ -469,7 +469,7 @@ extern "C" { #endif // _di_f_utf_character_is_valid_ #ifndef _di_f_utf_character_is_whitespace_ - f_return_status f_utf_character_is_whitespace(const f_utf_character_t character) { + f_status_t f_utf_character_is_whitespace(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -489,7 +489,7 @@ extern "C" { #endif // _di_f_utf_character_is_whitespace_ #ifndef _di_f_utf_character_is_whitespace_modifier_ - f_return_status f_utf_character_is_whitespace_modifier(const f_utf_character_t character) { + f_status_t f_utf_character_is_whitespace_modifier(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -506,7 +506,7 @@ extern "C" { #endif // _di_f_utf_character_is_whitespace_modifier_ #ifndef _di_f_utf_character_is_whitespace_other_ - f_return_status f_utf_character_is_whitespace_other(const f_utf_character_t character) { + f_status_t f_utf_character_is_whitespace_other(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -524,7 +524,7 @@ extern "C" { #endif // _di_f_utf_character_is_whitespace_other_ #ifndef _di_f_utf_character_is_word_ - f_return_status f_utf_character_is_word(const f_utf_character_t character, const bool strict) { + f_status_t f_utf_character_is_word(const f_utf_character_t character, const bool strict) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -544,7 +544,7 @@ extern "C" { #endif // _di_f_utf_character_is_word_ #ifndef _di_f_utf_character_is_word_dash_ - f_return_status f_utf_character_is_word_dash(const f_utf_character_t character, const bool strict) { + f_status_t f_utf_character_is_word_dash(const f_utf_character_t character, const bool strict) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -564,7 +564,7 @@ extern "C" { #endif // _di_f_utf_character_is_word_dash_ #ifndef _di_f_utf_character_is_word_dash_plus_ - f_return_status f_utf_character_is_word_dash_plus(const f_utf_character_t character, const bool strict) { + f_status_t f_utf_character_is_word_dash_plus(const f_utf_character_t character, const bool strict) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -584,7 +584,7 @@ extern "C" { #endif // _di_f_utf_character_is_word_dash_plus_ #ifndef _di_f_utf_character_is_zero_width_ - f_return_status f_utf_character_is_zero_width(const f_utf_character_t character) { + f_status_t f_utf_character_is_zero_width(const f_utf_character_t character) { const uint8_t width = f_macro_utf_character_t_width_is(character); if (!width) { @@ -616,7 +616,7 @@ extern "C" { #endif // _di_f_utf_character_is_zero_width_ #ifndef _di_f_utf_character_to_char_ - f_return_status f_utf_character_to_char(const f_utf_character_t utf_character, f_string_t *character, f_string_length_t *width_max) { + f_status_t f_utf_character_to_char(const f_utf_character_t utf_character, f_string_t *character, f_string_length_t *width_max) { #ifndef _di_level_0_parameter_checking_ if (!utf_character) return F_status_set_error(F_parameter); if (!width_max && *character) return F_status_set_error(F_parameter); @@ -672,7 +672,7 @@ extern "C" { #endif // _di_f_utf_character_to_char_ #ifndef _di_f_utf_is_big_endian_ - f_return_status f_utf_is_big_endian() { + f_status_t f_utf_is_big_endian() { uint16_t test_int = (0x01 << 8) | 0x02; int8_t test_char[2] = {0x01, 0x02}; @@ -685,7 +685,7 @@ extern "C" { #endif // _di_f_utf_is_big_endian_ #ifndef _di_f_utf_is_ - f_return_status f_utf_is(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -705,7 +705,7 @@ extern "C" { #endif // _di_f_utf_is_ #ifndef _di_f_utf_is_alpha_ - f_return_status f_utf_is_alpha(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_alpha(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -739,7 +739,7 @@ extern "C" { #endif // _di_f_utf_is_alpha_ #ifndef _di_f_utf_is_alpha_digit_ - f_return_status f_utf_is_alpha_digit(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_alpha_digit(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -773,7 +773,7 @@ extern "C" { #endif // _di_f_utf_is_alpha_digit_ #ifndef _di_f_utf_is_alpha_numeric_ - f_return_status f_utf_is_alpha_numeric(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_alpha_numeric(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -807,7 +807,7 @@ extern "C" { #endif // _di_f_utf_is_alpha_numeric_ #ifndef _di_f_utf_is_ascii_ - f_return_status f_utf_is_ascii(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_ascii(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -833,7 +833,7 @@ extern "C" { #endif // _di_f_utf_is_ascii_ #ifndef _di_f_utf_is_combining_ - f_return_status f_utf_is_combining(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_combining(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -864,7 +864,7 @@ extern "C" { #endif // _di_f_utf_is_combining_ #ifndef _di_f_utf_is_control_ - f_return_status f_utf_is_control(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_control(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -898,7 +898,7 @@ extern "C" { #endif // _di_f_utf_is_control_ #ifndef _di_f_utf_is_control_picture_ - f_return_status f_utf_is_control_picture(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_control_picture(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -929,7 +929,7 @@ extern "C" { #endif // _di_f_utf_is_control_picture_ #ifndef _di_f_utf_is_digit_ - f_return_status f_utf_is_digit(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_digit(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -963,7 +963,7 @@ extern "C" { #endif // _di_f_utf_is_digit_ #ifndef _di_f_utf_is_emoji_ - f_return_status f_utf_is_emoji(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_emoji(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -997,7 +997,7 @@ extern "C" { #endif // _di_f_utf_is_emoji_ #ifndef _di_f_utf_is_fragment_ - f_return_status f_utf_is_fragment(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_fragment(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1013,7 +1013,7 @@ extern "C" { #endif // _di_f_utf_is_fragment_ #ifndef _di_f_utf_is_graph_ - f_return_status f_utf_is_graph(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_graph(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1060,7 +1060,7 @@ extern "C" { #endif // _di_f_utf_is_graph_ #ifndef _di_f_utf_is_numeric_ - f_return_status f_utf_is_numeric(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_numeric(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1094,7 +1094,7 @@ extern "C" { #endif // _di_f_utf_is_numeric_ #ifndef _di_f_utf_is_phonetic_ - f_return_status f_utf_is_phonetic(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_phonetic(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1125,7 +1125,7 @@ extern "C" { #endif // _di_f_utf_is_phonetic_ #ifndef _di_f_utf_is_private_ - f_return_status f_utf_is_private(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_private(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1156,7 +1156,7 @@ extern "C" { #endif // _di_f_utf_is_private_ #ifndef _di_f_utf_is_punctuation_ - f_return_status f_utf_is_punctuation(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_punctuation(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1217,7 +1217,7 @@ extern "C" { #endif // _di_f_utf_is_punctuation_ #ifndef _di_f_utf_is_symbol_ - f_return_status f_utf_is_symbol(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_symbol(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1263,7 +1263,7 @@ extern "C" { #endif // _di_f_utf_is_symbol_ #ifndef _di_f_utf_is_unassigned_ - f_return_status f_utf_is_unassigned(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_unassigned(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1289,7 +1289,7 @@ extern "C" { #endif // _di_f_utf_is_unassigned_ #ifndef _di_f_utf_is_valid_ - f_return_status f_utf_is_valid(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_valid(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1315,7 +1315,7 @@ extern "C" { #endif // _di_f_utf_is_valid_ #ifndef _di_f_utf_is_whitespace_ - f_return_status f_utf_is_whitespace(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_whitespace(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1349,7 +1349,7 @@ extern "C" { #endif // _di_f_utf_is_whitespace_ #ifndef _di_f_utf_is_whitespace_modifier_ - f_return_status f_utf_is_whitespace_modifier(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_whitespace_modifier(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1381,7 +1381,7 @@ extern "C" { #endif // _di_f_utf_is_whitespace_modifier_ #ifndef _di_f_utf_is_whitespace_other_ - f_return_status f_utf_is_whitespace_other(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_whitespace_other(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1413,7 +1413,7 @@ extern "C" { #endif // _di_f_utf_is_whitespace_other_ #ifndef _di_f_utf_is_word_ - f_return_status f_utf_is_word(const f_string_t character, const f_string_length_t width_max, const bool strict) { + f_status_t f_utf_is_word(const f_string_t character, const f_string_length_t width_max, const bool strict) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1447,7 +1447,7 @@ extern "C" { #endif // _di_f_utf_is_word_ #ifndef _di_f_utf_is_word_dash_ - f_return_status f_utf_is_word_dash(const f_string_t character, const f_string_length_t width_max, const bool strict) { + f_status_t f_utf_is_word_dash(const f_string_t character, const f_string_length_t width_max, const bool strict) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1481,7 +1481,7 @@ extern "C" { #endif // _di_f_utf_is_word_dash_ #ifndef _di_f_utf_is_word_dash_plus_ - f_return_status f_utf_is_word_dash_plus(const f_string_t character, const f_string_length_t width_max, const bool strict) { + f_status_t f_utf_is_word_dash_plus(const f_string_t character, const f_string_length_t width_max, const bool strict) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1515,7 +1515,7 @@ extern "C" { #endif // _di_f_utf_is_word_dash_plus_ #ifndef _di_f_utf_is_zero_width_ - f_return_status f_utf_is_zero_width(const f_string_t character, const f_string_length_t width_max) { + f_status_t f_utf_is_zero_width(const f_string_t character, const f_string_length_t width_max) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); #endif // _di_level_0_parameter_checking_ @@ -1557,7 +1557,7 @@ extern "C" { #endif // _di_f_utf_is_zero_width_ #ifndef _di_f_utf_char_to_character_ - f_return_status f_utf_char_to_character(const f_string_t character, const f_string_length_t width_max, f_utf_character_t *character_utf) { + f_status_t f_utf_char_to_character(const f_string_t character, const f_string_length_t width_max, f_utf_character_t *character_utf) { #ifndef _di_level_0_parameter_checking_ if (width_max < 1) return F_status_set_error(F_parameter); if (!character_utf) return F_status_set_error(F_parameter); diff --git a/level_0/f_utf/c/utf.h b/level_0/f_utf/c/utf.h index fc70956..34b18c3 100644 --- a/level_0/f_utf/c/utf.h +++ b/level_0/f_utf/c/utf.h @@ -81,7 +81,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_buffer_decrement_ - extern f_return_status f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_string_length_t step); + extern f_status_t f_utf_buffer_decrement(const f_string_static_t buffer, f_string_range_t *range, const f_string_length_t step); #endif // _di_f_utf_buffer_decrement_ /** @@ -113,7 +113,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_buffer_increment_ - extern f_return_status f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_string_length_t step); + extern f_status_t f_utf_buffer_increment(const f_string_static_t buffer, f_string_range_t *range, const f_string_length_t step); #endif // _di_f_utf_buffer_increment_ /** @@ -132,7 +132,7 @@ extern "C" { * @see f_utf_character_is_valid() */ #ifndef _di_f_utf_character_is_ - extern f_return_status f_utf_character_is(const f_utf_character_t character); + extern f_status_t f_utf_character_is(const f_utf_character_t character); #endif // _di_f_utf_character_is_ /** @@ -149,7 +149,7 @@ extern "C" { * @see isalpha() */ #ifndef _di_f_utf_character_is_alpha_ - extern f_return_status f_utf_character_is_alpha(const f_utf_character_t character); + extern f_status_t f_utf_character_is_alpha(const f_utf_character_t character); #endif // _di_f_utf_character_is_alpha_ /** @@ -170,7 +170,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_character_is_alpha_digit_ - extern f_return_status f_utf_character_is_alpha_digit(const f_utf_character_t character); + extern f_status_t f_utf_character_is_alpha_digit(const f_utf_character_t character); #endif // _di_f_utf_character_is_alpha_digit_ /** @@ -189,7 +189,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_character_is_alpha_numeric_ - extern f_return_status f_utf_character_is_alpha_numeric(const f_utf_character_t character); + extern f_status_t f_utf_character_is_alpha_numeric(const f_utf_character_t character); #endif // _di_f_utf_character_is_alpha_numeric_ /** @@ -204,7 +204,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_ascii_ - extern f_return_status f_utf_character_is_ascii(const f_utf_character_t character); + extern f_status_t f_utf_character_is_ascii(const f_utf_character_t character); #endif // _di_f_utf_character_is_ascii_ /** @@ -219,7 +219,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_combining_ - extern f_return_status f_utf_character_is_combining(const f_utf_character_t character); + extern f_status_t f_utf_character_is_combining(const f_utf_character_t character); #endif // _di_f_utf_character_is_combining_ /** @@ -236,7 +236,7 @@ extern "C" { * @see iscntrl() */ #ifndef _di_f_utf_character_is_control_ - extern f_return_status f_utf_character_is_control(const f_utf_character_t character); + extern f_status_t f_utf_character_is_control(const f_utf_character_t character); #endif // _di_f_utf_character_is_control_ /** @@ -253,7 +253,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_control_picture_ - extern f_return_status f_utf_character_is_control_picture(const f_utf_character_t character); + extern f_status_t f_utf_character_is_control_picture(const f_utf_character_t character); #endif // _di_f_utf_character_is_control_picture_ /** @@ -274,7 +274,7 @@ extern "C" { * @see isdigit() */ #ifndef _di_f_utf_character_is_digit_ - extern f_return_status f_utf_character_is_digit(const f_utf_character_t character); + extern f_status_t f_utf_character_is_digit(const f_utf_character_t character); #endif // _di_f_utf_character_is_digit_ /** @@ -291,7 +291,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_emoji_ - extern f_return_status f_utf_character_is_emoji(const f_utf_character_t character); + extern f_status_t f_utf_character_is_emoji(const f_utf_character_t character); #endif // _di_f_utf_character_is_emoji_ /** @@ -325,7 +325,7 @@ extern "C" { * @see f_utf_character_is_valid() */ #ifndef _di_f_utf_character_is_fragment_ - extern f_return_status f_utf_character_is_fragment(const f_utf_character_t character); + extern f_status_t f_utf_character_is_fragment(const f_utf_character_t character); #endif // _di_f_utf_character_is_fragment_ /** @@ -342,7 +342,7 @@ extern "C" { * @see isgraph() */ #ifndef _di_f_utf_character_is_graph_ - extern f_return_status f_utf_character_is_graph(const f_utf_character_t character); + extern f_status_t f_utf_character_is_graph(const f_utf_character_t character); #endif // _di_f_utf_character_is_graph_ /** @@ -361,7 +361,7 @@ extern "C" { * @see isdigit() */ #ifndef _di_f_utf_character_is_numeric_ - extern f_return_status f_utf_character_is_numeric(const f_utf_character_t character); + extern f_status_t f_utf_character_is_numeric(const f_utf_character_t character); #endif // _di_f_utf_character_is_numeric_ /** @@ -376,7 +376,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_phonetic_ - extern f_return_status f_utf_character_is_phonetic(const f_utf_character_t character); + extern f_status_t f_utf_character_is_phonetic(const f_utf_character_t character); #endif // _di_f_utf_character_is_phonetic_ /** @@ -391,7 +391,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_private_ - extern f_return_status f_utf_character_is_private(const f_utf_character_t character); + extern f_status_t f_utf_character_is_private(const f_utf_character_t character); #endif // _di_f_utf_character_is_private_ /** @@ -408,7 +408,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_punctuation_ - extern f_return_status f_utf_character_is_punctuation(const f_utf_character_t character); + extern f_status_t f_utf_character_is_punctuation(const f_utf_character_t character); #endif // _di_f_utf_character_is_punctuation_ /** @@ -425,7 +425,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_symbol_ - extern f_return_status f_utf_character_is_symbol(const f_utf_character_t character); + extern f_status_t f_utf_character_is_symbol(const f_utf_character_t character); #endif // _di_f_utf_character_is_symbol_ /** @@ -446,7 +446,7 @@ extern "C" { * @see f_utf_character_is_fragment() */ #ifndef _di_f_utf_character_is_unassigned_ - extern f_return_status f_utf_character_is_unassigned(const f_utf_character_t character); + extern f_status_t f_utf_character_is_unassigned(const f_utf_character_t character); #endif // _di_f_utf_character_is_value_ /** @@ -469,7 +469,7 @@ extern "C" { * @see f_utf_character_is_fragment() */ #ifndef _di_f_utf_character_is_valid_ - extern f_return_status f_utf_character_is_valid(const f_utf_character_t character); + extern f_status_t f_utf_character_is_valid(const f_utf_character_t character); #endif // _di_f_utf_character_is_value_ /** @@ -494,7 +494,7 @@ extern "C" { * @see isspace() */ #ifndef _di_f_utf_character_is_whitespace_ - extern f_return_status f_utf_character_is_whitespace(const f_utf_character_t character); + extern f_status_t f_utf_character_is_whitespace(const f_utf_character_t character); #endif // _di_f_utf_character_is_whitespace_ /** @@ -514,7 +514,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_whitespace_modifier_ - extern f_return_status f_utf_character_is_whitespace_modifier(const f_utf_character_t character); + extern f_status_t f_utf_character_is_whitespace_modifier(const f_utf_character_t character); #endif // _di_f_utf_character_is_whitespace_modifier_ /** @@ -533,7 +533,7 @@ extern "C" { * @see isspace() */ #ifndef _di_f_utf_character_is_whitespace_other_ - extern f_return_status f_utf_character_is_whitespace_other(const f_utf_character_t character); + extern f_status_t f_utf_character_is_whitespace_other(const f_utf_character_t character); #endif // _di_f_utf_character_is_whitespace_other_ /** @@ -558,7 +558,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_character_is_word_ - extern f_return_status f_utf_character_is_word(const f_utf_character_t character, const bool strict); + extern f_status_t f_utf_character_is_word(const f_utf_character_t character, const bool strict); #endif // _di_f_utf_character_is_word_ /** @@ -588,7 +588,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_character_is_word_dash_ - extern f_return_status f_utf_character_is_word_dash(const f_utf_character_t character, const bool strict); + extern f_status_t f_utf_character_is_word_dash(const f_utf_character_t character, const bool strict); #endif // _di_f_utf_character_is_word_dash_ /** @@ -618,7 +618,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_character_is_word_dash_plus_ - extern f_return_status f_utf_character_is_word_dash_plus(const f_utf_character_t character, const bool strict); + extern f_status_t f_utf_character_is_word_dash_plus(const f_utf_character_t character, const bool strict); #endif // _di_f_utf_character_is_word_dash_plus_ /** @@ -635,7 +635,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_character_is_zero_width_ - extern f_return_status f_utf_character_is_zero_width(const f_utf_character_t character); + extern f_status_t f_utf_character_is_zero_width(const f_utf_character_t character); #endif // _di_f_utf_character_is_zero_width_ /** @@ -663,7 +663,7 @@ extern "C" { * F_failure (with error bit) if width is not long enough to convert. */ #ifndef _di_f_utf_character_to_char_ - extern f_return_status f_utf_character_to_char(const f_utf_character_t utf_character, f_string_t *character, f_string_length_t *width_max); + extern f_status_t f_utf_character_to_char(const f_utf_character_t utf_character, f_string_t *character, f_string_length_t *width_max); #endif // _di_f_utf_character_to_char_ /** @@ -676,7 +676,7 @@ extern "C" { * F_false if the system is little-endian. */ #ifndef _di_f_utf_is_big_endian_ - extern f_return_status f_utf_is_big_endian(); + extern f_status_t f_utf_is_big_endian(); #endif // _di_f_utf_is_big_endian_ /** @@ -698,7 +698,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_is_ - extern f_return_status f_utf_is(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_ /** @@ -719,7 +719,7 @@ extern "C" { * @see isalpha() */ #ifndef _di_f_utf_is_alpha_ - extern f_return_status f_utf_is_alpha(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_alpha(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_alpha_ /** @@ -744,7 +744,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_is_alpha_digit_ - extern f_return_status f_utf_is_alpha_digit(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_alpha_digit(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_alpha_digit_ /** @@ -767,7 +767,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_is_alpha_numeric_ - extern f_return_status f_utf_is_alpha_numeric(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_alpha_numeric(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_alpha_numeric_ /** @@ -786,7 +786,7 @@ extern "C" { * F_complete_not_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_f_utf_is_ascii_ - extern f_return_status f_utf_is_ascii(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_ascii(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_ascii_ /** @@ -805,7 +805,7 @@ extern "C" { * F_complete_not_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_f_utf_is_combining_ - extern f_return_status f_utf_is_combining(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_combining(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_combining_ /** @@ -826,7 +826,7 @@ extern "C" { * @see iscntrl() */ #ifndef _di_f_utf_is_control_ - extern f_return_status f_utf_is_control(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_control(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_control_ /** @@ -847,7 +847,7 @@ extern "C" { * F_complete_not_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_f_utf_is_control_picture_ - extern f_return_status f_utf_is_control_picture(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_control_picture(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_control_picture_ /** @@ -868,7 +868,7 @@ extern "C" { * @see isdigit() */ #ifndef _di_f_utf_is_digit_ - extern f_return_status f_utf_is_digit(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_digit(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_digit_ /** @@ -889,7 +889,7 @@ extern "C" { * F_complete_not_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_f_utf_is_emoji_ - extern f_return_status f_utf_is_emoji(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_emoji(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_emoji_ /** @@ -923,7 +923,7 @@ extern "C" { * F_false if not a UTF-8 character. */ #ifndef _di_f_utf_is_fragment_ - extern f_return_status f_utf_is_fragment(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_fragment(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_fragment_ /** @@ -946,7 +946,7 @@ extern "C" { * @see isgraph() */ #ifndef _di_f_utf_is_graph_ - extern f_return_status f_utf_is_graph(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_graph(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_graph_ /** @@ -969,7 +969,7 @@ extern "C" { * @see isdigit() */ #ifndef _di_f_utf_is_numeric_ - extern f_return_status f_utf_is_numeric(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_numeric(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_numeric_ /** @@ -988,7 +988,7 @@ extern "C" { * F_complete_not_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_f_utf_is_phonetic_ - extern f_return_status f_utf_is_phonetic(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_phonetic(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_phonetic_ /** @@ -1007,7 +1007,7 @@ extern "C" { * F_complete_not_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_f_utf_is_private_ - extern f_return_status f_utf_is_private(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_private(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_private_ /** @@ -1028,7 +1028,7 @@ extern "C" { * F_complete_not_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_f_utf_is_punctuation_ - extern f_return_status f_utf_is_punctuation(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_punctuation(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_punctuation_ /** @@ -1049,7 +1049,7 @@ extern "C" { * F_complete_not_utf (with error bit) if character is an incomplete UTF-8 fragment. */ #ifndef _di_f_utf_is_symbol_ - extern f_return_status f_utf_is_symbol(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_symbol(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_symbol_ /** @@ -1071,7 +1071,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is inunassigned. */ #ifndef _di_f_utf_is_unassigned_ - extern f_return_status f_utf_is_unassigned(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_unassigned(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_unassigned_ /** @@ -1096,7 +1096,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_is_valid_ - extern f_return_status f_utf_is_valid(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_valid(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_valid_ /** @@ -1127,7 +1127,7 @@ extern "C" { * @see isspace() */ #ifndef _di_f_utf_is_whitespace_ - extern f_return_status f_utf_is_whitespace(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_whitespace(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_whitespace_ /** @@ -1153,7 +1153,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_is_whitespace_modifier_ - extern f_return_status f_utf_is_whitespace_modifier(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_whitespace_modifier(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_whitespace_modifier_ /** @@ -1176,7 +1176,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_is_whitespace_other_ - extern f_return_status f_utf_is_whitespace_other(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_whitespace_other(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_whitespace_other_ /** @@ -1205,7 +1205,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_is_word_ - extern f_return_status f_utf_is_word(const f_string_t character, const f_string_length_t width_max, const bool strict); + extern f_status_t f_utf_is_word(const f_string_t character, const f_string_length_t width_max, const bool strict); #endif // _di_f_utf_is_word_ /** @@ -1239,7 +1239,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_is_word_dash_ - extern f_return_status f_utf_is_word_dash(const f_string_t character, const f_string_length_t width_max, const bool strict); + extern f_status_t f_utf_is_word_dash(const f_string_t character, const f_string_length_t width_max, const bool strict); #endif // _di_f_utf_is_word_dash_ /** @@ -1273,7 +1273,7 @@ extern "C" { * @see isalnum() */ #ifndef _di_f_utf_is_word_dash_plus_ - extern f_return_status f_utf_is_word_dash_plus(const f_string_t character, const f_string_length_t width_max, const bool strict); + extern f_status_t f_utf_is_word_dash_plus(const f_string_t character, const f_string_length_t width_max, const bool strict); #endif // _di_f_utf_is_word_dash_plus_ /** @@ -1296,7 +1296,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_f_utf_is_zero_width_ - extern f_return_status f_utf_is_zero_width(const f_string_t character, const f_string_length_t width_max); + extern f_status_t f_utf_is_zero_width(const f_string_t character, const f_string_length_t width_max); #endif // _di_f_utf_is_zero_width_ /** @@ -1319,7 +1319,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_f_utf_char_to_character_ - extern f_return_status f_utf_char_to_character(const f_string_t character, const f_string_length_t width_max, f_utf_character_t *character_utf); + extern f_status_t f_utf_char_to_character(const f_string_t character, const f_string_length_t width_max, f_utf_character_t *character_utf); #endif // _di_f_utf_char_to_character_ #ifdef __cplusplus diff --git a/level_1/fl_color/c/color.c b/level_1/fl_color/c/color.c index 047a187..df9fbdc 100644 --- a/level_1/fl_color/c/color.c +++ b/level_1/fl_color/c/color.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fl_color_set_ - f_return_status fl_color_set(FILE *stream, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { + f_status_t fl_color_set(FILE *stream, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { #ifndef _di_level_1_parameter_checking_ if (!stream) return F_status_set_error(F_parameter); if (!color1) return F_status_set_error(F_parameter); @@ -27,7 +27,7 @@ extern "C" { #endif // _di_fl_color_set_ #ifndef _di_fl_color_set_to_ - f_return_status fl_color_set_to(const int id, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { + f_status_t fl_color_set_to(const int id, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { #ifndef _di_level_1_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); if (!color1) return F_status_set_error(F_parameter); @@ -49,7 +49,7 @@ extern "C" { #endif // _di_fl_color_set_to_ #ifndef _di_fl_color_save_ - f_return_status fl_color_save(f_string_dynamic_t *buffer, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { + f_status_t fl_color_save(f_string_dynamic_t *buffer, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5) { #ifndef _di_level_1_parameter_checking_ if (!buffer) return F_status_set_error(F_parameter); if (!color1) return F_status_set_error(F_parameter); @@ -136,7 +136,7 @@ extern "C" { #endif // _di_fl_color_save_ #ifndef _di_fl_color_print_ - f_return_status fl_color_print(FILE *stream, const f_color_set_t set, const f_string_t string, ...) { + f_status_t fl_color_print(FILE *stream, const f_color_set_t set, const f_string_t string, ...) { #ifndef _di_level_1_parameter_checking_ if (!stream) return F_status_set_error(F_parameter); if (!string) return F_status_set_error(F_parameter); @@ -163,7 +163,7 @@ extern "C" { #endif // _di_fl_color_print_ #ifndef _di_fl_color_print2_ - f_return_status fl_color_print2(FILE *stream, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...) { + f_status_t fl_color_print2(FILE *stream, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...) { #ifndef _di_level_1_parameter_checking_ if (!stream) return F_status_set_error(F_parameter); if (!string) return F_status_set_error(F_parameter); @@ -200,7 +200,7 @@ extern "C" { #endif // _di_fl_color_print2_ #ifndef _di_fl_color_print_code_ - f_return_status fl_color_print_code(FILE *stream, const f_string_static_t color) { + f_status_t fl_color_print_code(FILE *stream, const f_string_static_t color) { #ifndef _di_level_1_parameter_checking_ if (!stream) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -214,7 +214,7 @@ extern "C" { #endif // _di_fl_color_print_code_ #ifndef _di_fl_color_print_code_to_ - f_return_status fl_color_print_code_to(const int id, const f_string_static_t color) { + f_status_t fl_color_print_code_to(const int id, const f_string_static_t color) { #ifndef _di_level_1_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -228,7 +228,7 @@ extern "C" { #endif // _di_fl_color_print_code_to_ #ifndef _di_fl_color_print_to_ - f_return_status fl_color_print_to(const int id, const f_color_set_t set, const f_string_t string, ...) { + f_status_t fl_color_print_to(const int id, const f_color_set_t set, const f_string_t string, ...) { #ifndef _di_level_1_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); if (!string) return F_status_set_error(F_parameter); @@ -255,7 +255,7 @@ extern "C" { #endif // _di_fl_color_print_to_ #ifndef _di_fl_color_print2_to_ - f_return_status fl_color_print2_to(const int id, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...) { + f_status_t fl_color_print2_to(const int id, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...) { #ifndef _di_level_1_parameter_checking_ if (id == -1) return F_status_set_error(F_parameter); if (!string) return F_status_set_error(F_parameter); @@ -292,7 +292,7 @@ extern "C" { #endif // _di_fl_color_print2_to_ #ifndef _di_fl_color_load_context_ - f_return_status fl_color_load_context(f_color_context_t *context, const bool use_light_colors) { + f_status_t fl_color_load_context(f_color_context_t *context, const bool use_light_colors) { #ifndef _di_level_1_parameter_checking_ if (!context) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_color/c/color.h b/level_1/fl_color/c/color.h index 00337ac..b3ff8e2 100644 --- a/level_1/fl_color/c/color.h +++ b/level_1/fl_color/c/color.h @@ -55,7 +55,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_color_set_ - extern f_return_status fl_color_set(FILE *stream, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); + extern f_status_t fl_color_set(FILE *stream, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); #define fl_macro_color_set_1(stream, format, color1) fl_color_set(stream, format, color1, 0, 0, 0, 0) #define fl_macro_color_set_2(stream, format, color1, color2) fl_color_set(stream, format, color1, color2, 0, 0, 0) @@ -89,7 +89,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_color_set_to_ - extern f_return_status fl_color_set_to(const int id, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); + extern f_status_t fl_color_set_to(const int id, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); #define fl_macro_color_set_to_1(id, format, color1) fl_color_set_to(id, format, color1, 0, 0, 0, 0) #define fl_macro_color_set_to_2(id, format, color1, color2) fl_color_set_to(id, format, color1, color2, 0, 0, 0) @@ -124,7 +124,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_color_save_ - extern f_return_status fl_color_save(f_string_dynamic_t *buffer, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); + extern f_status_t fl_color_save(f_string_dynamic_t *buffer, const f_color_format_t format, const int8_t *color1, const int8_t *color2, const int8_t *color3, const int8_t *color4, const int8_t *color5); #define fl_macro_color_save_1(buffer, format, color1) fl_color_save(buffer, format, color1, 0, 0, 0, 0) #define fl_macro_color_save_2(buffer, format, color1, color2) fl_color_save(buffer, format, color1, color2, 0, 0, 0) @@ -152,7 +152,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_color_print_ - extern f_return_status fl_color_print(FILE *stream, const f_color_set_t set, const f_string_t string, ...); + extern f_status_t fl_color_print(FILE *stream, const f_color_set_t set, const f_string_t string, ...); #endif // _di_fl_color_print_ /** @@ -179,7 +179,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_color_print2_ - extern f_return_status fl_color_print2(FILE *stream, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...); + extern f_status_t fl_color_print2(FILE *stream, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...); #endif // _di_fl_color_print2_ /** @@ -199,7 +199,7 @@ extern "C" { * Errors (with error bit) from: f_print_dynamic(). */ #ifndef _di_fl_color_print_code_ - extern f_return_status fl_color_print_code(FILE *stream, const f_string_static_t color); + extern f_status_t fl_color_print_code(FILE *stream, const f_string_static_t color); #endif // _di_fl_color_print_code_ /** @@ -219,7 +219,7 @@ extern "C" { * Errors (with error bit) from: f_print_to_dynamic(). */ #ifndef _di_fl_color_print_code_to_ - extern f_return_status fl_color_print_code_to(const int id, const f_string_static_t color); + extern f_status_t fl_color_print_code_to(const int id, const f_string_static_t color); #endif // _di_fl_color_print_code_to_ /** @@ -243,7 +243,7 @@ extern "C" { * Errors (with error bit) from: f_print_dynamic(). */ #ifndef _di_fl_color_print_to_ - extern f_return_status fl_color_print_to(const int id, const f_color_set_t set, const f_string_t string, ...); + extern f_status_t fl_color_print_to(const int id, const f_color_set_t set, const f_string_t string, ...); #endif // _di_fl_color_print_to_ /** @@ -272,7 +272,7 @@ extern "C" { * Errors (with error bit) from: f_print_dynamic(). */ #ifndef _di_fl_color_print2_to_ - extern f_return_status fl_color_print2_to(const int id, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...); + extern f_status_t fl_color_print2_to(const int id, const f_color_set_t set, const f_color_set_t extra, const f_string_t string, ...); #endif // _di_fl_color_print2_to_ /** @@ -295,7 +295,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_color_load_context_ - extern f_return_status fl_color_load_context(f_color_context_t *context, const bool use_light_colors); + extern f_status_t fl_color_load_context(f_color_context_t *context, const bool use_light_colors); #endif // _di_fl_color_load_context_ #ifdef __cplusplus diff --git a/level_1/fl_console/c/console.c b/level_1/fl_console/c/console.c index 833c8be..27d19a7 100644 --- a/level_1/fl_console/c/console.c +++ b/level_1/fl_console/c/console.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _fl_console_parameter_to_string_dynamic_directory_ - f_return_status fl_console_parameter_to_string_dynamic_directory(const f_string_t argument, f_string_dynamic_t *directory) { + f_status_t fl_console_parameter_to_string_dynamic_directory(const f_string_t argument, f_string_dynamic_t *directory) { #ifndef _di_level_1_parameter_checking_ if (!argument) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_console/c/console.h b/level_1/fl_console/c/console.h index b3d5684..6491f76 100644 --- a/level_1/fl_console/c/console.h +++ b/level_1/fl_console/c/console.h @@ -56,7 +56,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _fl_console_parameter_to_string_dynamic_directory_ - extern f_return_status fl_console_parameter_to_string_dynamic_directory(const f_string_t argument, f_string_dynamic_t *directory); + extern f_status_t fl_console_parameter_to_string_dynamic_directory(const f_string_t argument, f_string_dynamic_t *directory); #endif // _fl_console_parameter_to_string_dynamic_directory_ #ifdef __cplusplus diff --git a/level_1/fl_control_group/c/control_group.c b/level_1/fl_control_group/c/control_group.c index c541fa0..48a5845 100644 --- a/level_1/fl_control_group/c/control_group.c +++ b/level_1/fl_control_group/c/control_group.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fl_control_group_apply_ - f_return_status fl_control_group_apply(const f_control_group_t control_group, const pid_t id) { + f_status_t fl_control_group_apply(const f_control_group_t control_group, const pid_t id) { #ifndef _di_level_1_parameter_checking_ if (!id) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -61,7 +61,7 @@ extern "C" { #endif // _di_fl_control_group_apply_ #ifndef _di_fl_control_group_delete_ - f_return_status fl_control_group_delete(f_control_group_t *control_group) { + f_status_t fl_control_group_delete(f_control_group_t *control_group) { f_status_t status = F_none; f_macro_control_group_t_delete(status, (*control_group)); diff --git a/level_1/fl_control_group/c/control_group.h b/level_1/fl_control_group/c/control_group.h index 445bef7..4da5578 100644 --- a/level_1/fl_control_group/c/control_group.h +++ b/level_1/fl_control_group/c/control_group.h @@ -63,7 +63,7 @@ extern "C" { * @see f_file_stream_open() */ #ifndef _di_fl_control_group_apply_ - extern f_return_status fl_control_group_apply(const f_control_group_t control_group, const pid_t id); + extern f_status_t fl_control_group_apply(const f_control_group_t control_group, const pid_t id); #endif // _di_fl_control_group_apply_ /** @@ -77,7 +77,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_control_group_delete_ - extern f_return_status fl_control_group_delete(f_control_group_t *control_group); + extern f_status_t fl_control_group_delete(f_control_group_t *control_group); #endif // _di_fl_control_group_delete_ #ifdef __cplusplus diff --git a/level_1/fl_conversion/c/conversion.c b/level_1/fl_conversion/c/conversion.c index 80d0aea..0db0c95 100644 --- a/level_1/fl_conversion/c/conversion.c +++ b/level_1/fl_conversion/c/conversion.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fl_conversion_string_to_binary_signed_ - f_return_status fl_conversion_string_to_binary_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { + f_status_t fl_conversion_string_to_binary_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -65,7 +65,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_binary_signed_ #ifndef _di_fl_conversion_string_to_binary_unsigned_ - f_return_status fl_conversion_string_to_binary_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { + f_status_t fl_conversion_string_to_binary_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -109,7 +109,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_binary_unsigned_ #ifndef _di_fl_conversion_string_to_decimal_signed_ - f_return_status fl_conversion_string_to_decimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { + f_status_t fl_conversion_string_to_decimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -174,7 +174,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_decimal_signed_ #ifndef _di_fl_conversion_string_to_decimal_unsigned_ - f_return_status fl_conversion_string_to_decimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { + f_status_t fl_conversion_string_to_decimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -221,7 +221,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_decimal_unsigned_ #ifndef _di_fl_conversion_string_to_duodecimal_signed_ - f_return_status fl_conversion_string_to_duodecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { + f_status_t fl_conversion_string_to_duodecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -286,7 +286,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_duodecimal_signed_ #ifndef _di_fl_conversion_string_to_duodecimal_unsigned_ - f_return_status fl_conversion_string_to_duodecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { + f_status_t fl_conversion_string_to_duodecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -333,7 +333,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_duodecimal_unsigned_ #ifndef _di_fl_conversion_string_to_hexidecimal_signed_ - f_return_status fl_conversion_string_to_hexidecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { + f_status_t fl_conversion_string_to_hexidecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -398,7 +398,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_hexidecimal_signed_ #ifndef _di_fl_conversion_string_to_hexidecimal_unsigned_ - f_return_status fl_conversion_string_to_hexidecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { + f_status_t fl_conversion_string_to_hexidecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -445,7 +445,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_hexidecimal_unsigned_ #ifndef _di_fl_conversion_string_to_octal_signed_ - f_return_status fl_conversion_string_to_octal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { + f_status_t fl_conversion_string_to_octal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -510,7 +510,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_octal_signed_ #ifndef _di_fl_conversion_string_to_octal_unsigned_ - f_return_status fl_conversion_string_to_octal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { + f_status_t fl_conversion_string_to_octal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -557,7 +557,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_octal_unsigned_ #ifndef _di_fl_conversion_string_to_number_signed_ - f_return_status fl_conversion_string_to_number_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range) { + f_status_t fl_conversion_string_to_number_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); @@ -713,7 +713,7 @@ extern "C" { #endif // _di_fl_conversion_string_to_number_signed_ #ifndef _di_fl_conversion_string_to_number_unsigned_ - f_return_status fl_conversion_string_to_number_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { + f_status_t fl_conversion_string_to_number_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); if (!number) return F_status_set_error(F_parameter); diff --git a/level_1/fl_conversion/c/conversion.h b/level_1/fl_conversion/c/conversion.h index 8449daf..d9aa28d 100644 --- a/level_1/fl_conversion/c/conversion.h +++ b/level_1/fl_conversion/c/conversion.h @@ -52,7 +52,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_binary_signed_ - extern f_return_status fl_conversion_string_to_binary_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); + extern f_status_t fl_conversion_string_to_binary_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); #endif // _di_fl_conversion_string_to_binary_signed_ /** @@ -78,7 +78,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_binary_unsigned_ - extern f_return_status fl_conversion_string_to_binary_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); + extern f_status_t fl_conversion_string_to_binary_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); #endif // _di_fl_conversion_string_to_binary_unsigned_ /** @@ -107,7 +107,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_decimal_signed_ - extern f_return_status fl_conversion_string_to_decimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); + extern f_status_t fl_conversion_string_to_decimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); #endif // _di_fl_conversion_string_to_decimal_signed_ /** @@ -133,7 +133,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_decimal_unsigned_ - extern f_return_status fl_conversion_string_to_decimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); + extern f_status_t fl_conversion_string_to_decimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); #endif // _di_fl_conversion_string_to_decimal_unsigned_ /** @@ -162,7 +162,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_duodecimal_signed_ - extern f_return_status fl_conversion_string_to_duodecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); + extern f_status_t fl_conversion_string_to_duodecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); #endif // _di_fl_conversion_string_to_duodecimal_signed_ /** @@ -188,7 +188,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_duodecimal_unsigned_ - extern f_return_status fl_conversion_string_to_duodecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); + extern f_status_t fl_conversion_string_to_duodecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); #endif // _di_fl_conversion_string_to_duodecimal_unsigned_ /** @@ -217,7 +217,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_hexidecimal_signed_ - extern f_return_status fl_conversion_string_to_hexidecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); + extern f_status_t fl_conversion_string_to_hexidecimal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); #endif // _di_fl_conversion_string_to_hexidecimal_signed_ /** @@ -243,7 +243,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_hexidecimal_unsigned_ - extern f_return_status fl_conversion_string_to_hexidecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); + extern f_status_t fl_conversion_string_to_hexidecimal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); #endif // _di_fl_conversion_string_to_hexidecimal_unsigned_ /** @@ -271,7 +271,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_octal_signed_ - extern f_return_status fl_conversion_string_to_octal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); + extern f_status_t fl_conversion_string_to_octal_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range, const bool negative); #endif // _di_fl_conversion_string_to_octal_signed_ /** @@ -297,7 +297,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_conversion_string_to_octal_unsigned_ - extern f_return_status fl_conversion_string_to_octal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); + extern f_status_t fl_conversion_string_to_octal_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); #endif // _di_fl_conversion_string_to_octal_unsigned_ /** @@ -339,7 +339,7 @@ extern "C" { * @see strtoll() */ #ifndef _di_fl_conversion_string_to_number_signed_ - extern f_return_status fl_conversion_string_to_number_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range); + extern f_status_t fl_conversion_string_to_number_signed(const f_string_t string, f_number_signed_t *number, const f_string_range_t range); #endif // _di_fl_conversion_string_to_number_signed_ /** @@ -383,7 +383,7 @@ extern "C" { * @see strtoull() */ #ifndef _di_fl_conversion_string_to_number_unsigned_ - extern f_return_status fl_conversion_string_to_number_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); + extern f_status_t fl_conversion_string_to_number_unsigned(const f_string_t string, f_number_unsigned_t *number, const f_string_range_t range); #endif // _di_fl_conversion_string_to_number_unsigned_ #ifdef __cplusplus diff --git a/level_1/fl_directory/c/directory.c b/level_1/fl_directory/c/directory.c index 9d141b8..2a6fa42 100644 --- a/level_1/fl_directory/c/directory.c +++ b/level_1/fl_directory/c/directory.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_directory_create_ - f_return_status fl_directory_create(const f_string_t path, const f_string_length_t length, const mode_t mode) { + f_status_t fl_directory_create(const f_string_t path, const f_string_length_t length, const mode_t mode) { #ifndef _di_level_1_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -50,7 +50,7 @@ extern "C" { #endif // _di_fl_directory_create_ #ifndef _di_fl_directory_clone_ - f_return_status fl_directory_clone(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const bool role, const fl_directory_recurse_t recurse) { + f_status_t fl_directory_clone(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const bool role, const fl_directory_recurse_t recurse) { #ifndef _di_level_1_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -128,7 +128,7 @@ extern "C" { #endif // _di_fl_directory_clone_ #ifndef _di_fl_directory_clone_content_ - f_return_status fl_directory_clone_content(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const bool role, const fl_directory_recurse_t recurse) { + f_status_t fl_directory_clone_content(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const bool role, const fl_directory_recurse_t recurse) { #ifndef _di_level_1_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -184,7 +184,7 @@ extern "C" { #endif // _di_fl_directory_clone_content_ #ifndef _di_fl_directory_copy_ - f_return_status fl_directory_copy(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const f_mode_t mode, const fl_directory_recurse_t recurse) { + f_status_t fl_directory_copy(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const f_mode_t mode, const fl_directory_recurse_t recurse) { #ifndef _di_level_1_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -250,7 +250,7 @@ extern "C" { #endif // _di_fl_directory_copy_ #ifndef _di_fl_directory_copy_content_ - f_return_status fl_directory_copy_content(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const f_mode_t mode, const fl_directory_recurse_t recurse) { + f_status_t fl_directory_copy_content(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const f_mode_t mode, const fl_directory_recurse_t recurse) { #ifndef _di_level_1_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -304,7 +304,7 @@ extern "C" { #endif // _di_fl_directory_copy_content_ #ifndef _di_fl_directory_list_ - f_return_status fl_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), const bool dereference, f_directory_listing_t *listing) { + f_status_t fl_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), const bool dereference, f_directory_listing_t *listing) { #ifndef _di_level_1_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (!listing) return F_status_set_error(F_parameter); @@ -315,7 +315,7 @@ extern "C" { #endif // _di_fl_directory_list_ #ifndef _di_fl_directory_path_pop_ - f_return_status fl_directory_path_pop(f_string_static_t *path) { + f_status_t fl_directory_path_pop(f_string_static_t *path) { #ifndef _di_level_1_parameter_checking_ if (path->used > path->size) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -387,7 +387,7 @@ extern "C" { #endif // _di_fl_directory_path_pop_ #ifndef _di_fl_directory_path_push_ - f_return_status fl_directory_path_push(const f_string_t source, f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_directory_path_push(const f_string_t source, f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (destination->used > destination->size) return F_status_set_error(F_parameter); @@ -402,7 +402,7 @@ extern "C" { #endif // _di_fl_directory_path_push_ #ifndef _di_fl_directory_path_push_dynamic_ - f_return_status fl_directory_path_push_dynamic(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_directory_path_push_dynamic(const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used > source.size) return F_status_set_error(F_parameter); if (destination->used > destination->size) return F_status_set_error(F_parameter); diff --git a/level_1/fl_directory/c/directory.h b/level_1/fl_directory/c/directory.h index 46e55c4..fca18d9 100644 --- a/level_1/fl_directory/c/directory.h +++ b/level_1/fl_directory/c/directory.h @@ -122,7 +122,7 @@ extern "C" { * @see f_directory_create() */ #ifndef _di_fl_directory_create_ - extern f_return_status fl_directory_create(const f_string_t path, const f_string_length_t length, const mode_t mode); + extern f_status_t fl_directory_create(const f_string_t path, const f_string_length_t length, const mode_t mode); #endif // _di_fl_directory_create_ /** @@ -165,7 +165,7 @@ extern "C" { * @see f_file_clone() */ #ifndef _di_fl_directory_clone_ - extern f_return_status fl_directory_clone(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const bool role, const fl_directory_recurse_t recurse); + extern f_status_t fl_directory_clone(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const bool role, const fl_directory_recurse_t recurse); #endif // _di_fl_directory_clone_ /** @@ -206,7 +206,7 @@ extern "C" { * @see f_file_clone() */ #ifndef _di_fl_directory_clone_content_ - extern f_return_status fl_directory_clone_content(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const bool role, const fl_directory_recurse_t recurse); + extern f_status_t fl_directory_clone_content(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const bool role, const fl_directory_recurse_t recurse); #endif // _di_fl_directory_clone_content_ /** @@ -247,7 +247,7 @@ extern "C" { * @see f_file_copy() */ #ifndef _di_fl_directory_copy_ - extern f_return_status fl_directory_copy(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const f_mode_t mode, const fl_directory_recurse_t recurse); + extern f_status_t fl_directory_copy(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const f_mode_t mode, const fl_directory_recurse_t recurse); #endif // _di_fl_directory_copy_ /** @@ -286,7 +286,7 @@ extern "C" { * @see f_file_copy() */ #ifndef _di_fl_directory_copy_content_ - extern f_return_status fl_directory_copy_content(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const f_mode_t mode, const fl_directory_recurse_t recurse); + extern f_status_t fl_directory_copy_content(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const f_mode_t mode, const fl_directory_recurse_t recurse); #endif // _di_fl_directory_copy_content_ /** @@ -331,7 +331,7 @@ extern "C" { * @see versionsort() */ #ifndef _di_fl_directory_list_ - extern f_return_status fl_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), const bool dereference, f_directory_listing_t *listing); + extern f_status_t fl_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), const bool dereference, f_directory_listing_t *listing); #endif // _di_fl_directory_list_ /** @@ -354,7 +354,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_control(). */ #ifndef _di_fl_directory_path_pop_ - extern f_return_status fl_directory_path_pop(f_string_static_t *path); + extern f_status_t fl_directory_path_pop(f_string_static_t *path); #endif // _di_fl_directory_path_pop_ /** @@ -383,7 +383,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_control(). */ #ifndef _di_fl_directory_path_push_ - extern f_return_status fl_directory_path_push(const f_string_t source, f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_directory_path_push(const f_string_t source, f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_directory_path_push_ /** @@ -409,7 +409,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_control(). */ #ifndef _di_fl_directory_path_push_dynamic_ - extern f_return_status fl_directory_path_push_dynamic(const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_directory_path_push_dynamic(const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_directory_path_push_dynamic_ #ifdef __cplusplus diff --git a/level_1/fl_directory/c/private-directory.c b/level_1/fl_directory/c/private-directory.c index 1cc8a80..6c565e3 100644 --- a/level_1/fl_directory/c/private-directory.c +++ b/level_1/fl_directory/c/private-directory.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fl_directory_clone_) - f_return_status private_fl_directory_clone(const f_string_static_t source, const f_string_static_t destination, const bool role, const fl_directory_recurse_t recurse, const f_number_unsigned_t depth) { + f_status_t private_fl_directory_clone(const f_string_static_t source, const f_string_static_t destination, const bool role, const fl_directory_recurse_t recurse, const f_number_unsigned_t depth) { f_status_t status = F_none; f_directory_listing_t listing = f_directory_listing_t_initialize; @@ -133,7 +133,7 @@ extern "C" { #endif // !defined(_di_fl_directory_clone_) #if !defined(_di_fl_directory_clone_file_) - f_return_status private_fl_directory_clone_file(const f_string_static_t file, const f_string_static_t source, const f_string_static_t destination, const bool role, const fl_directory_recurse_t recurse) { + f_status_t private_fl_directory_clone_file(const f_string_static_t file, const f_string_static_t source, const f_string_static_t destination, const bool role, const fl_directory_recurse_t recurse) { char path_source[source.used + file.used + 2]; char path_destination[destination.used + file.used + 2]; @@ -217,7 +217,7 @@ extern "C" { #endif // !defined(_di_fl_directory_clone_file_) #if !defined(_di_fl_directory_copy_) - f_return_status private_fl_directory_copy(const f_string_static_t source, const f_string_static_t destination, const f_mode_t mode, const fl_directory_recurse_t recurse, const f_number_unsigned_t depth) { + f_status_t private_fl_directory_copy(const f_string_static_t source, const f_string_static_t destination, const f_mode_t mode, const fl_directory_recurse_t recurse, const f_number_unsigned_t depth) { f_status_t status = F_none; f_directory_listing_t listing = f_directory_listing_t_initialize; @@ -329,7 +329,7 @@ extern "C" { #endif // !defined(_di_fl_directory_copy_) #if !defined(_di_fl_directory_copy_file_) - f_return_status private_fl_directory_copy_file(const f_string_static_t file, const f_string_static_t source, const f_string_static_t destination, const f_mode_t mode, const fl_directory_recurse_t recurse) { + f_status_t private_fl_directory_copy_file(const f_string_static_t file, const f_string_static_t source, const f_string_static_t destination, const f_mode_t mode, const fl_directory_recurse_t recurse) { char path_source[source.used + file.used + 2]; char path_destination[destination.used + file.used + 2]; @@ -414,7 +414,7 @@ extern "C" { #endif // !defined(_di_fl_directory_copy_file_) #if !defined(_di_fl_directory_list_) - f_return_status private_fl_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), const bool dereference, f_directory_listing_t *listing) { + f_status_t private_fl_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), const bool dereference, f_directory_listing_t *listing) { struct dirent **entity = 0; f_string_length_t size = 0; @@ -569,7 +569,7 @@ extern "C" { #endif // !defined(_di_fl_directory_list_) #if !defined(_di_fl_directory_path_push_) || !defined(_di_fl_directory_path_push_dynamic_) - f_return_status private_fl_directory_path_push(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t private_fl_directory_path_push(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { bool terminated_null = F_false; bool separator_prepend = F_false; bool separator_append = F_false; diff --git a/level_1/fl_directory/c/private-directory.h b/level_1/fl_directory/c/private-directory.h index dab4283..88e3ae1 100644 --- a/level_1/fl_directory/c/private-directory.h +++ b/level_1/fl_directory/c/private-directory.h @@ -41,7 +41,7 @@ extern "C" { * @see fl_directory_clone() */ #if !defined(_di_fl_directory_clone_) - extern f_return_status private_fl_directory_clone(const f_string_static_t source, const f_string_static_t destination, const bool role, const fl_directory_recurse_t recurse, const f_number_unsigned_t depth) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_directory_clone(const f_string_static_t source, const f_string_static_t destination, const bool role, const fl_directory_recurse_t recurse, const f_number_unsigned_t depth) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_directory_clone_) /** @@ -73,7 +73,7 @@ extern "C" { * @see fl_directory_clone() */ #if !defined(_di_fl_directory_clone_file_) - extern f_return_status private_fl_directory_clone_file(const f_string_static_t file, const f_string_static_t source, const f_string_static_t destination, const bool role, const fl_directory_recurse_t recurse) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_directory_clone_file(const f_string_static_t file, const f_string_static_t source, const f_string_static_t destination, const bool role, const fl_directory_recurse_t recurse) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_directory_clone_file_) /** @@ -101,7 +101,7 @@ extern "C" { * @see fl_directory_copy() */ #if !defined(_di_fl_directory_copy_) - extern f_return_status private_fl_directory_copy(const f_string_static_t source, const f_string_static_t destination, const f_mode_t mode, const fl_directory_recurse_t recurse, const f_number_unsigned_t depth) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_directory_copy(const f_string_static_t source, const f_string_static_t destination, const f_mode_t mode, const fl_directory_recurse_t recurse, const f_number_unsigned_t depth) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_directory_copy_) /** @@ -131,7 +131,7 @@ extern "C" { * @see fl_directory_copy() */ #if !defined(_di_fl_directory_copy_file_) - extern f_return_status private_fl_directory_copy_file(const f_string_static_t file, const f_string_static_t source, const f_string_static_t destination, const f_mode_t mode, const fl_directory_recurse_t recurse) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_directory_copy_file(const f_string_static_t file, const f_string_static_t source, const f_string_static_t destination, const f_mode_t mode, const fl_directory_recurse_t recurse) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_directory_copy_file_) /** @@ -171,7 +171,7 @@ extern "C" { * @see fl_directory_list() */ #if !defined(_di_fl_directory_list_) - extern f_return_status private_fl_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), const bool dereference, f_directory_listing_t *listing) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_directory_list(const f_string_t path, int (*filter)(const struct dirent *), int (*sort)(const struct dirent **, const struct dirent **), const bool dereference, f_directory_listing_t *listing) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_directory_list_) /** @@ -202,7 +202,7 @@ extern "C" { * @see fl_directory_path_push_dynamic() */ #if !defined(_di_fl_directory_path_push_) || !defined(_di_fl_directory_path_push_dynamic_) - extern f_return_status private_fl_directory_path_push(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_directory_path_push(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_directory_path_push_) || !defined(_di_fl_directory_path_push_dynamic_) #ifdef __cplusplus diff --git a/level_1/fl_environment/c/environment.c b/level_1/fl_environment/c/environment.c index f6416d2..9e25b8d 100644 --- a/level_1/fl_environment/c/environment.c +++ b/level_1/fl_environment/c/environment.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fl_environment_path_explode_ - f_return_status fl_environment_path_explode(const f_string_t path, f_string_dynamics_t *paths) { + f_status_t fl_environment_path_explode(const f_string_t path, f_string_dynamics_t *paths) { #ifndef _di_level_0_parameter_checking_ if (!paths) return F_status_set_error(F_parameter); if (paths->used > paths->size) return F_status_set_error(F_parameter); @@ -81,7 +81,7 @@ extern "C" { #endif // _di_fl_environment_path_explode_ #ifndef _di_fl_environment_path_explode_dynamic_ - f_return_status fl_environment_path_explode_dynamic(const f_string_static_t path, f_string_dynamics_t *paths) { + f_status_t fl_environment_path_explode_dynamic(const f_string_static_t path, f_string_dynamics_t *paths) { #ifndef _di_level_0_parameter_checking_ if (path.used > path.size) return F_status_set_error(F_parameter); if (!paths) return F_status_set_error(F_parameter); @@ -160,7 +160,7 @@ extern "C" { #endif // _di_fl_environment_path_explode_dynamic_ #ifndef _di_fl_environment_path_explode_reverse_ - f_return_status fl_environment_path_explode_reverse(const f_string_t path, f_string_dynamics_t *paths) { + f_status_t fl_environment_path_explode_reverse(const f_string_t path, f_string_dynamics_t *paths) { #ifndef _di_level_0_parameter_checking_ if (!paths) return F_status_set_error(F_parameter); if (paths->used > paths->size) return F_status_set_error(F_parameter); @@ -257,7 +257,7 @@ extern "C" { #endif // _di_fl_environment_path_explode_reverse_ #ifndef _di_fl_environment_path_explode_reverse_dynamic_ - f_return_status fl_environment_path_explode_reverse_dynamic(const f_string_static_t path, f_string_dynamics_t *paths) { + f_status_t fl_environment_path_explode_reverse_dynamic(const f_string_static_t path, f_string_dynamics_t *paths) { #ifndef _di_level_0_parameter_checking_ if (path.used > path.size) return F_status_set_error(F_parameter); if (!paths) return F_status_set_error(F_parameter); diff --git a/level_1/fl_environment/c/environment.h b/level_1/fl_environment/c/environment.h index e8385e0..4719d6e 100644 --- a/level_1/fl_environment/c/environment.h +++ b/level_1/fl_environment/c/environment.h @@ -46,7 +46,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_environment_path_explode_ - extern f_return_status fl_environment_path_explode(const f_string_t path, f_string_dynamics_t *paths); + extern f_status_t fl_environment_path_explode(const f_string_t path, f_string_dynamics_t *paths); #endif // _di_fl_environment_path_explode_ /** @@ -70,7 +70,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_environment_path_explode_dynamic_ - extern f_return_status fl_environment_path_explode_dynamic(const f_string_static_t path, f_string_dynamics_t *paths); + extern f_status_t fl_environment_path_explode_dynamic(const f_string_static_t path, f_string_dynamics_t *paths); #endif // _di_fl_environment_path_explode_dynamic_ /** @@ -96,7 +96,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_environment_path_explode_reverse_ - extern f_return_status fl_environment_path_explode_reverse(const f_string_t path, f_string_dynamics_t *paths); + extern f_status_t fl_environment_path_explode_reverse(const f_string_t path, f_string_dynamics_t *paths); #endif // _di_fl_environment_path_explode_reverse_ /** @@ -122,7 +122,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_environment_path_explode_reverse_dynamic_ - extern f_return_status fl_environment_path_explode_reverse_dynamic(const f_string_static_t path, f_string_dynamics_t *paths); + extern f_status_t fl_environment_path_explode_reverse_dynamic(const f_string_static_t path, f_string_dynamics_t *paths); #endif // _di_fl_environment_path_explode_reverse_dynamic_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss_basic.c b/level_1/fl_fss/c/fss_basic.c index b6718ca..be0ae5e 100644 --- a/level_1/fl_fss/c/fss_basic.c +++ b/level_1/fl_fss/c/fss_basic.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_fl_fss_basic_object_read_ - f_return_status fl_fss_basic_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quote, f_fss_delimits_t *delimits) { + f_status_t fl_fss_basic_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quote, f_fss_delimits_t *delimits) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -28,7 +28,7 @@ extern "C" { #endif // _di_fl_fss_basic_object_read_ #ifndef _di_fl_fss_basic_content_read_ - f_return_status fl_fss_basic_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits) { + f_status_t fl_fss_basic_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -51,7 +51,7 @@ extern "C" { return F_data_not_stop; } - status = private_fl_fss_ranges_increase(found); + f_macro_string_ranges_t_increase(status, (*found)); if (F_status_is_error(status)) return status; found->array[found->used].start = range->start; @@ -78,7 +78,7 @@ extern "C" { #endif // _di_fl_fss_basic_content_read_ #ifndef _di_fl_fss_basic_object_write_string_ - f_return_status fl_fss_basic_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t fl_fss_basic_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -135,7 +135,7 @@ extern "C" { #endif // _di_fl_fss_basic_object_write_string_ #ifndef _di_fl_fss_basic_content_write_string_ - f_return_status fl_fss_basic_content_write_string(const f_string_static_t content, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t fl_fss_basic_content_write_string(const f_string_static_t content, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); diff --git a/level_1/fl_fss/c/fss_basic.h b/level_1/fl_fss/c/fss_basic.h index 10f1619..213f4b9 100644 --- a/level_1/fl_fss/c/fss_basic.h +++ b/level_1/fl_fss/c/fss_basic.h @@ -71,7 +71,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_basic_object_read_ - extern f_return_status fl_fss_basic_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quote, f_fss_delimits_t *delimits); + extern f_status_t fl_fss_basic_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quote, f_fss_delimits_t *delimits); #endif // _di_fl_fss_basic_object_read_ /** @@ -107,7 +107,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_basic_content_read_ - extern f_return_status fl_fss_basic_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits); + extern f_status_t fl_fss_basic_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits); #endif // _di_fl_fss_basic_content_read_ /** @@ -152,7 +152,7 @@ extern "C" { * Errors (with error bit) from: f_utf_buffer_increment(). */ #ifndef _di_fl_fss_basic_object_write_string_ - extern f_return_status fl_fss_basic_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_basic_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_basic_object_write_string_ /** @@ -187,7 +187,7 @@ extern "C" { * F_string_too_large (with error bit) if appended string length is too large to store in the destination. */ #ifndef _di_fl_fss_basic_content_write_string_ - extern f_return_status fl_fss_basic_content_write_string(const f_string_static_t content, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_basic_content_write_string(const f_string_static_t content, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_basic_content_write_string_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss_basic_list.c b/level_1/fl_fss/c/fss_basic_list.c index a091800..3a2d7d1 100644 --- a/level_1/fl_fss/c/fss_basic_list.c +++ b/level_1/fl_fss/c/fss_basic_list.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_fl_fss_basic_list_object_read_ - f_return_status fl_fss_basic_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits) { + f_status_t fl_fss_basic_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -112,7 +112,7 @@ extern "C" { range->start = slash_first; - status = private_fl_fss_delimits_increase_by((slash_count / 2) + 1, delimits); + f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1); if (F_status_is_error(status)) break; if (slash_count % 2 == 0) { @@ -149,7 +149,7 @@ extern "C" { graph_first = F_false; // comments may only have whitespace before the '#', therefore only the first slash needs to be delimited. - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = slash_first; @@ -231,7 +231,7 @@ extern "C" { #endif // _di_fl_fss_basic_list_object_read_ #ifndef _di_fl_fss_basic_list_content_read_ - f_return_status fl_fss_basic_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { + f_status_t fl_fss_basic_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -247,7 +247,7 @@ extern "C" { 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); + f_macro_string_ranges_t_increase(status, (*found)); if (F_status_is_error(status)) return status; found->array[found->used].start = range->start; @@ -265,7 +265,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol) { if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -324,7 +324,7 @@ extern "C" { return FL_fss_found_content; } - status = private_fl_fss_delimits_increase_by((slash_count / 2) + 1, delimits); + f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1); if (F_status_is_error(status)) break; while (slash_count > 0) { @@ -344,7 +344,7 @@ extern "C" { if (F_status_is_error(status)) break; if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -401,7 +401,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol) { if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -420,7 +420,7 @@ extern "C" { status = f_fss_seek_to_eol(buffer, range); if (F_status_is_error(status)) break; - status = private_fl_fss_ranges_increase(comments); + f_macro_string_ranges_t_increase(status, (*comments)); if (F_status_is_error(status)) break; if (range->start > range->stop || range->start >= buffer.used) { @@ -463,7 +463,7 @@ extern "C" { #endif // _di_fl_fss_basic_list_content_read_ #ifndef _di_fl_fss_basic_list_object_write_string_ - f_return_status fl_fss_basic_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t fl_fss_basic_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -651,7 +651,7 @@ extern "C" { #endif // _di_fl_fss_basic_list_object_write_string_ #ifndef _di_fl_fss_basic_list_content_write_string_ - f_return_status fl_fss_basic_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t fl_fss_basic_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); diff --git a/level_1/fl_fss/c/fss_basic_list.h b/level_1/fl_fss/c/fss_basic_list.h index 0f8ff16..a0504e7 100644 --- a/level_1/fl_fss/c/fss_basic_list.h +++ b/level_1/fl_fss/c/fss_basic_list.h @@ -72,7 +72,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_basic_list_object_read_ - extern f_return_status fl_fss_basic_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits); + extern f_status_t fl_fss_basic_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits); #endif // _di_fl_fss_basic_list_object_read_ /** @@ -120,7 +120,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_basic_list_content_read_ - extern f_return_status fl_fss_basic_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments); + extern f_status_t fl_fss_basic_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments); #endif // _di_fl_fss_basic_list_content_read_ /** @@ -160,7 +160,7 @@ extern "C" { * Errors (with error bit) from: f_utf_buffer_increment(). */ #ifndef _di_fl_fss_basic_list_object_write_string_ - extern f_return_status fl_fss_basic_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_basic_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_basic_list_object_write_string_ /** @@ -203,7 +203,7 @@ extern "C" { * Errors (with error bit) from: f_utf_buffer_increment(). */ #ifndef _di_fl_fss_basic_list_content_write_string_ - extern f_return_status fl_fss_basic_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_basic_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_basic_list_content_write_string_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss_embedded_list.c b/level_1/fl_fss/c/fss_embedded_list.c index 8bcc22a..1342592 100644 --- a/level_1/fl_fss/c/fss_embedded_list.c +++ b/level_1/fl_fss/c/fss_embedded_list.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_fl_fss_embedded_list_object_read_ - f_return_status fl_fss_embedded_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits) { + f_status_t fl_fss_embedded_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -124,7 +124,7 @@ extern "C" { range->start = slash_first; - status = private_fl_fss_delimits_increase_by((slash_count / 2) + 1, delimits); + f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1); if (F_status_is_error(status)) break; if (slash_count % 2 == 0) { @@ -159,7 +159,7 @@ extern "C" { graph_first = F_false; // comments may only have whitespace before the '#', therefore only the first slash needs to be delimited. - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = slash_first; @@ -249,7 +249,7 @@ extern "C" { #endif // _di_fl_fss_embedded_list_object_read_ #ifndef _di_fl_fss_embedded_list_content_read_ - f_return_status fl_fss_embedded_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_nest_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { + f_status_t fl_fss_embedded_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_nest_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -279,7 +279,7 @@ extern "C" { f_macro_fss_objects_t_new(status, objects, f_fss_default_allocation_step); if (F_status_is_error(status)) { - private_fl_fss_string_lengths_delete(&positions_start); + f_macro_string_lengths_t_delete_simple(positions_start); return status; } @@ -314,7 +314,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol) { if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -372,7 +372,7 @@ extern "C" { // When slash is odd and a (delimited) valid open/close is found, then save delimited positions and continue. if (buffer.string[range->start] == f_fss_eol) { if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -398,7 +398,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol) { if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -447,7 +447,7 @@ extern "C" { range->start = slash_first; - status = private_fl_fss_delimits_increase_by((slash_count / 2) + 1, delimits); + f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1); if (F_status_is_error(status)) break; // apply slash delimits, only slashes and placeholders should be present. @@ -487,7 +487,7 @@ extern "C" { } } else { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = slash_last; @@ -559,7 +559,7 @@ extern "C" { objects.array[depth].stop = before_list_open; if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -576,7 +576,7 @@ extern "C" { if (F_status_is_error(status)) break; if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -680,7 +680,7 @@ extern "C" { } if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -696,7 +696,7 @@ extern "C" { private_fl_macro_fss_nest_return_on_overflow_delimited((buffer), (*range), (*found), positions_start, objects, F_none_eos, F_none_stop) - private_fl_fss_string_lengths_delete(&positions_start); + f_macro_string_lengths_t_delete_simple(positions_start); private_fl_fss_objects_delete(&objects); return FL_fss_found_content; @@ -711,7 +711,7 @@ extern "C" { if (buffer.string[range->start] == f_fss_eol) { if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -745,7 +745,7 @@ extern "C" { status = f_fss_seek_to_eol(buffer, range); if (F_status_is_error(status)) break; - status = private_fl_fss_ranges_increase(comments); + f_macro_string_ranges_t_increase(status, (*comments)); if (F_status_is_error(status)) break; if (range->start > range->stop || range->start >= buffer.used) { @@ -753,7 +753,7 @@ extern "C" { } else { if (graph_first == 0x2) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = comment_delimit; @@ -795,7 +795,7 @@ extern "C" { if (F_status_is_error(status)) break; } // while - private_fl_fss_string_lengths_delete(&positions_start); + f_macro_string_lengths_t_delete_simple(positions_start); private_fl_fss_objects_delete(&objects); delimits->used = delimits_used; @@ -822,7 +822,7 @@ extern "C" { #endif // _di_fl_fss_embedded_list_content_read_ #ifndef _di_fl_fss_embedded_list_object_write_string_ - f_return_status fl_fss_embedded_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t fl_fss_embedded_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1028,7 +1028,7 @@ extern "C" { #endif // _di_fl_fss_embedded_list_object_write_string_ #ifndef _di_fl_fss_embedded_list_content_write_string_ - f_return_status fl_fss_embedded_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t fl_fss_embedded_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); diff --git a/level_1/fl_fss/c/fss_embedded_list.h b/level_1/fl_fss/c/fss_embedded_list.h index 09416a9..404503f 100644 --- a/level_1/fl_fss/c/fss_embedded_list.h +++ b/level_1/fl_fss/c/fss_embedded_list.h @@ -72,7 +72,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_embedded_list_object_read_ - extern f_return_status fl_fss_embedded_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits); + extern f_status_t fl_fss_embedded_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits); #endif // _di_fl_fss_embedded_list_object_read_ /** @@ -123,7 +123,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_embedded_list_content_read_ - extern f_return_status fl_fss_embedded_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_nest_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments); + extern f_status_t fl_fss_embedded_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_nest_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments); #endif // _di_fl_fss_embedded_list_content_read_ /** @@ -163,7 +163,7 @@ extern "C" { * Errors (with error bit) from: f_utf_buffer_increment(). */ #ifndef _di_fl_fss_embedded_list_object_write_string_ - extern f_return_status fl_fss_embedded_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_embedded_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_embedded_list_object_write_string_ /** @@ -210,7 +210,7 @@ extern "C" { * Errors (with error bit) from: f_utf_buffer_increment(). */ #ifndef _di_fl_fss_embedded_list_content_write_string_ - extern f_return_status fl_fss_embedded_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_embedded_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_embedded_list_content_write_string_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss_extended.c b/level_1/fl_fss/c/fss_extended.c index 5809d99..640f0fa 100644 --- a/level_1/fl_fss/c/fss_extended.c +++ b/level_1/fl_fss/c/fss_extended.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_fl_fss_extended_object_read_ - f_return_status fl_fss_extended_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quoted, f_fss_delimits_t *delimits) { + f_status_t fl_fss_extended_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quoted, f_fss_delimits_t *delimits) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -33,7 +33,7 @@ extern "C" { #endif // _di_fl_fss_extended_object_read_ #ifndef _di_fl_fss_extended_content_read_ - f_return_status fl_fss_extended_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_quotes_t *quotes, f_fss_delimits_t *delimits) { + f_status_t fl_fss_extended_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_quotes_t *quotes, f_fss_delimits_t *delimits) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -72,7 +72,7 @@ extern "C" { if (status == FL_fss_found_object || status == FL_fss_found_object_content_not) { if (found->used + 1 > found->size) { - status_allocate = private_fl_fss_ranges_increase(found); + f_macro_string_ranges_t_increase(status_allocate, (*found)); if (F_status_is_fine(status_allocate) && quotes) { f_macro_fss_quotes_t_resize(status_allocate, (*quotes), found->size); @@ -140,7 +140,7 @@ extern "C" { #endif // _di_fl_fss_extended_content_read_ #ifndef _di_fl_fss_extended_object_write_string_ -f_return_status fl_fss_extended_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { +f_status_t fl_fss_extended_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -181,7 +181,7 @@ f_return_status fl_fss_extended_object_write_string(const f_string_static_t obje #endif // _di_fl_fss_extended_object_write_string_ #ifndef _di_fl_fss_extended_content_write_string_ - f_return_status fl_fss_extended_content_write_string(const f_string_static_t content, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t fl_fss_extended_content_write_string(const f_string_static_t content, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); diff --git a/level_1/fl_fss/c/fss_extended.h b/level_1/fl_fss/c/fss_extended.h index 9471066..f36f801 100644 --- a/level_1/fl_fss/c/fss_extended.h +++ b/level_1/fl_fss/c/fss_extended.h @@ -71,7 +71,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_extended_object_read_ - extern f_return_status fl_fss_extended_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quoted, f_fss_delimits_t *delimits); + extern f_status_t fl_fss_extended_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quoted, f_fss_delimits_t *delimits); #endif // _di_fl_fss_extended_object_read_ /** @@ -113,7 +113,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_extended_content_read_ - extern f_return_status fl_fss_extended_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_quotes_t *quotes, f_fss_delimits_t *delimits); + extern f_status_t fl_fss_extended_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_quotes_t *quotes, f_fss_delimits_t *delimits); #endif // _di_fl_fss_extended_content_read_ /** @@ -156,7 +156,7 @@ extern "C" { * Errors (with error bit) from: f_utf_buffer_increment(). */ #ifndef _di_fl_fss_extended_object_write_string_ - extern f_return_status fl_fss_extended_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_extended_object_write_string(const f_string_static_t object, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_extended_object_write_string_ /** @@ -200,7 +200,7 @@ extern "C" { * Errors (with error bit) from: f_utf_buffer_increment(). */ #ifndef _di_fl_fss_extended_content_write_string_ - extern f_return_status fl_fss_extended_content_write_string(const f_string_static_t content, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_extended_content_write_string(const f_string_static_t content, const f_fss_quote_t quote, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_extended_content_write_string_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/fss_extended_list.c b/level_1/fl_fss/c/fss_extended_list.c index 3373dbb..731571a 100644 --- a/level_1/fl_fss/c/fss_extended_list.c +++ b/level_1/fl_fss/c/fss_extended_list.c @@ -7,7 +7,7 @@ extern "C" { #endif #ifndef _di_fl_fss_extended_list_object_read_ - f_return_status fl_fss_extended_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits) { + f_status_t fl_fss_extended_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -124,7 +124,7 @@ extern "C" { range->start = slash_first; - status = private_fl_fss_delimits_increase_by((slash_count / 2) + 1, delimits); + f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1); if (F_status_is_error(status)) break; if (slash_count % 2 == 0) { @@ -159,7 +159,7 @@ extern "C" { graph_first = F_false; // comments may only have whitespace before the '#', therefore only the first slash needs to be delimited. - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = slash_first; @@ -249,7 +249,7 @@ extern "C" { #endif // _di_fl_fss_extended_list_object_read_ #ifndef _di_fl_fss_extended_list_content_read_ - f_return_status fl_fss_extended_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { + f_status_t fl_fss_extended_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!found) return F_status_set_error(F_parameter); @@ -265,7 +265,7 @@ extern "C" { 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); + f_macro_string_ranges_t_increase(status, (*found)); if (F_status_is_error(status)) return status; found->array[found->used].start = range->start; @@ -326,7 +326,7 @@ extern "C" { if (range->start > range->stop || range->start >= buffer.used) break; if (buffer.string[range->start] == f_fss_eol) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = slash_first; @@ -334,7 +334,7 @@ extern "C" { } } else if (buffer.string[range->start] == f_fss_comment) { - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) break; delimits->array[delimits->used++] = slash_first; @@ -383,7 +383,7 @@ extern "C" { status = f_fss_seek_to_eol(buffer, range); if (F_status_is_error(status)) break; - status = private_fl_fss_ranges_increase(comments); + f_macro_string_ranges_t_increase(status, (*comments)); if (F_status_is_error(status)) break; if (range->start > range->stop || range->start >= buffer.used) { @@ -414,7 +414,7 @@ extern "C" { #endif // _di_fl_fss_extended_list_content_read_ #ifndef _di_fl_fss_extended_list_object_write_string_ - f_return_status fl_fss_extended_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t fl_fss_extended_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -620,7 +620,7 @@ extern "C" { #endif // _di_fl_fss_extended_list_object_write_string_ #ifndef _di_fl_fss_extended_list_content_write_string_ - f_return_status fl_fss_extended_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t fl_fss_extended_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_string_range_t *range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); diff --git a/level_1/fl_fss/c/fss_extended_list.h b/level_1/fl_fss/c/fss_extended_list.h index 72bbe84..367d4d1 100644 --- a/level_1/fl_fss/c/fss_extended_list.h +++ b/level_1/fl_fss/c/fss_extended_list.h @@ -72,7 +72,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_extended_list_object_read_ - extern f_return_status fl_fss_extended_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits); + extern f_status_t fl_fss_extended_list_object_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_object_t *found, f_fss_delimits_t *delimits); #endif // _di_fl_fss_extended_list_object_read_ /** @@ -121,7 +121,7 @@ extern "C" { * Errors (with error bit) from: f_fss_skip_past_space(). */ #ifndef _di_fl_fss_extended_list_content_read_ - extern f_return_status fl_fss_extended_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments); + extern f_status_t fl_fss_extended_list_content_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_content_t *found, f_fss_delimits_t *delimits, f_fss_comments_t *comments); #endif // _di_fl_fss_extended_list_content_read_ /** @@ -161,7 +161,7 @@ extern "C" { * Errors (with error bit) from: f_utf_buffer_increment(). */ #ifndef _di_fl_fss_extended_list_object_write_string_ - extern f_return_status fl_fss_extended_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_extended_list_object_write_string(const f_string_static_t object, const uint8_t complete, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_extended_list_object_write_string_ /** @@ -208,7 +208,7 @@ extern "C" { * Errors (with error bit) from: f_utf_buffer_increment(). */ #ifndef _di_fl_fss_extended_list_content_write_string_ - extern f_return_status fl_fss_extended_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_string_range_t *range, f_string_dynamic_t *destination); + extern f_status_t fl_fss_extended_list_content_write_string(const f_string_static_t content, const uint8_t complete, const f_string_static_t *prepend, const f_string_ranges_t *ignore, f_string_range_t *range, f_string_dynamic_t *destination); #endif // _di_fl_fss_extended_list_content_write_string_ #ifdef __cplusplus diff --git a/level_1/fl_fss/c/private-fss.c b/level_1/fl_fss/c/private-fss.c index abc5573..bc71c0c 100644 --- a/level_1/fl_fss/c/private-fss.c +++ b/level_1/fl_fss/c/private-fss.c @@ -7,7 +7,7 @@ extern "C" { #endif #if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) - f_return_status private_fl_fss_basic_write_object_trim(const f_fss_quote_t quote, const f_string_length_t used_start, f_string_dynamic_t *destination) { + f_status_t private_fl_fss_basic_write_object_trim(const f_fss_quote_t quote, const f_string_length_t used_start, f_string_dynamic_t *destination) { f_status_t status = F_none; f_string_range_t destination_range = f_macro_string_range_t_initialize(destination->used); f_string_length_t i = 0; @@ -103,7 +103,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) #if !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_content_write_string_) - f_return_status private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_string_range_t *range, f_string_dynamic_t *destination) { f_status_t status = F_none; for (; range->start <= range->stop && range->start < buffer.used; range->start++) { @@ -122,7 +122,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_content_write_string_) #if !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) - f_return_status private_fl_fss_basic_list_write_object_trim(const f_string_length_t used_start, f_string_dynamic_t *destination) { + f_status_t private_fl_fss_basic_list_write_object_trim(const f_string_length_t used_start, f_string_dynamic_t *destination) { f_status_t status = F_none; f_string_range_t destination_range = f_macro_string_range_t_initialize(destination->used); f_string_length_t i = 0; @@ -191,7 +191,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) #if !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) - f_return_status private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quote, f_fss_delimits_t *delimits) { + f_status_t private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quote, f_fss_delimits_t *delimits) { f_status_t status = f_fss_skip_past_space(buffer, range); if (F_status_is_error(status)) return status; @@ -298,7 +298,7 @@ extern "C" { // only the first slash before a quoted needs to be escaped (or not) as once there is a slash before a quoted, this cannot ever be a quote object. // this simplifies the number of slashes needed. - status = private_fl_fss_delimits_increase(delimits); + f_macro_fss_delimits_t_increase(status, (*delimits)); if (F_status_is_error(status)) return status; delimits->array[delimits->used] = first_slash; @@ -428,7 +428,7 @@ extern "C" { range->start = first_slash; if (slash_count % 2 == 0) { - status = private_fl_fss_delimits_increase_by(slash_count / 2, delimits); + f_macro_fss_delimits_t_increase_by(status, (*delimits), slash_count / 2); if (F_status_is_error(status)) return status; while (slash_count > 0) { @@ -499,7 +499,7 @@ extern "C" { return FL_fss_found_object; } else { - status = private_fl_fss_delimits_increase_by((slash_count / 2) + 1, delimits); + f_macro_fss_delimits_t_increase_by(status, (*delimits), (slash_count / 2) + 1); if (F_status_is_error(status)) return status; while (slash_count > 0) { @@ -663,7 +663,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) #if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) - f_return_status private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quote, f_string_range_t *range, f_string_dynamic_t *destination) { + f_status_t private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quote, f_string_range_t *range, f_string_dynamic_t *destination) { f_status_t status = f_fss_skip_past_space(object, range); if (F_status_is_error(status)) return status; @@ -1008,51 +1008,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) #if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - f_return_status private_fl_fss_delimits_increase(f_fss_delimits_t *delimits) { - - if (delimits->used + 1 > delimits->size) { - f_array_length_t size = delimits->used + f_fss_default_allocation_step; - - if (size > f_array_length_t_size) { - if (delimits->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_string_length_t_size; - } - - f_status_t status = F_none; - - f_macro_fss_delimits_t_resize(status, (*delimits), size); - - return status; - } - - return F_none; - } -#endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - -#if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - f_return_status private_fl_fss_delimits_increase_by(const f_array_length_t amount, f_fss_delimits_t *delimits) { - - if (delimits->used + amount > delimits->size) { - if (delimits->used + amount > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - f_status_t status = F_none; - - f_macro_fss_delimits_t_resize(status, (*delimits), delimits->used + amount); - - return status; - } - - return F_none; - } -#endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - -#if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - f_return_status private_fl_fss_destination_increase(f_string_dynamic_t *destination) { + f_status_t private_fl_fss_destination_increase(f_string_dynamic_t *destination) { if (destination->used + 1 > destination->size) { f_array_length_t size = destination->used + f_fss_default_allocation_step; @@ -1077,7 +1033,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) #if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - f_return_status private_fl_fss_destination_increase_by(const f_string_length_t amount, f_string_dynamic_t *destination) { + f_status_t private_fl_fss_destination_increase_by(const f_string_length_t amount, f_string_dynamic_t *destination) { if (destination->used + amount > destination->size) { if (destination->used + amount > f_string_length_t_size) { @@ -1096,7 +1052,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) #if !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) - f_return_status private_fl_fss_destination_prepend(const f_string_static_t *prepend, f_string_dynamic_t *destination) { + f_status_t private_fl_fss_destination_prepend(const f_string_static_t *prepend, f_string_dynamic_t *destination) { if (!prepend || !prepend->used) { return F_none; @@ -1114,7 +1070,7 @@ extern "C" { #endif // !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) #if !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - f_return_status private_fl_fss_nest_increase(f_fss_nest_t *nest) { + f_status_t private_fl_fss_nest_increase(f_fss_nest_t *nest) { if (nest->used + 1 > nest->size) { f_array_length_t size = nest->used + f_fss_default_allocation_step; @@ -1144,37 +1100,6 @@ extern "C" { } #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) { - - if (ranges->used + 1 > ranges->size) { - f_array_length_t size = ranges->used + f_fss_default_allocation_step; - - if (size > f_string_length_t_size) { - if (ranges->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - f_status_t status = F_none; - - f_macro_string_ranges_t_resize(status, (*ranges), size); - - return status; - } - - return F_none; - } -#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 diff --git a/level_1/fl_fss/c/private-fss.h b/level_1/fl_fss/c/private-fss.h index df193fa..89a0891 100644 --- a/level_1/fl_fss/c/private-fss.h +++ b/level_1/fl_fss/c/private-fss.h @@ -35,7 +35,7 @@ extern "C" { * @see fl_fss_extended_object_write_string() */ #if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) - extern f_return_status private_fl_fss_basic_write_object_trim(const f_fss_quote_t quote, const f_string_length_t used_start, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_fss_basic_write_object_trim(const f_fss_quote_t quote, const f_string_length_t used_start, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) /** @@ -59,7 +59,7 @@ extern "C" { * @see private_fl_fss_destination_increase() */ #if !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_content_write_string_) - extern f_return_status private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_string_range_t *range, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_fss_basic_list_write_add_until_end(const f_string_static_t buffer, f_string_range_t *range, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_content_write_string_) /** @@ -79,7 +79,7 @@ extern "C" { * @see fl_fss_extended_list_object_write_string() */ #if !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) - extern f_return_status private_fl_fss_basic_list_write_object_trim(const f_string_length_t used_start, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_fss_basic_list_write_object_trim(const f_string_length_t used_start, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) /** @@ -138,7 +138,7 @@ extern "C" { * @see fl_fss_extended_content_read() */ #if !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) - extern f_return_status private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quoted, f_fss_delimits_t *delimits) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_fss_basic_read(const f_string_static_t buffer, const bool object_as, f_string_range_t *range, f_fss_object_t *found, f_fss_quote_t *quoted, f_fss_delimits_t *delimits) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_fss_basic_object_read_) || !defined(_di_fl_fss_extended_object_read_) || !defined(_di_fl_fss_extended_content_read_) /** @@ -184,64 +184,10 @@ extern "C" { * @see fl_fss_extended_content_write_string() */ #if !defined(fl_fss_basic_object_write_string) || !defined(fl_fss_extended_object_write_string) || !defined(_di_fl_fss_extended_content_write_string_) - extern f_return_status private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quoted, f_string_range_t *range, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_fss_basic_write(const bool object_as, const f_string_static_t object, const f_fss_quote_t quoted, f_string_range_t *range, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(fl_fss_basic_object_write_string) || !defined(fl_fss_extended_object_write_string) || !defined(_di_fl_fss_extended_content_write_string_) /** - * Increase the size of delimits array, but only if necessary. - * - * @param delimits - * The delimits array to increment. - * - * @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. - * - * @see fl_fss_basic_content_write_string() - * @see fl_fss_basic_object_write_string() - * @see fl_fss_basic_list_content_write_string() - * @see fl_fss_basic_list_object_write_string() - * @see fl_fss_embedded_list_content_read() - * @see fl_fss_embedded_list_object_read() - * @see fl_fss_extended_content_write_string() - * @see fl_fss_extended_list_content_write_string() - * @see fl_fss_extended_list_object_write_string() - * @see fl_fss_extended_object_write_string() - */ -#if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - extern f_return_status private_fl_fss_delimits_increase(f_fss_delimits_t *delimits) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - -/** - * Increase the size of delimits array by the given amount, but only if necessary. - * - * @param amount - * The amount to increase by. - * @param delimits - * The delimits array to increment. - * - * @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. - * - * @see fl_fss_basic_content_write_string() - * @see fl_fss_basic_object_write_string() - * @see fl_fss_basic_list_content_write_string() - * @see fl_fss_basic_list_object_write_string() - * @see fl_fss_embedded_list_content_read() - * @see fl_fss_embedded_list_object_read() - * @see fl_fss_extended_content_write_string() - * @see fl_fss_extended_list_content_write_string() - * @see fl_fss_extended_list_object_write_string() - * @see fl_fss_extended_object_write_string() - */ -#if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - extern f_return_status private_fl_fss_delimits_increase_by(const f_array_length_t amount, f_fss_delimits_t *delimits) f_gcc_attribute_visibility_internal; -#endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - -/** * Increase the size of destination buffer, but only if necessary. * * @param destination @@ -265,7 +211,7 @@ extern "C" { * @see fl_fss_extended_object_write_string() */ #if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - extern f_return_status private_fl_fss_destination_increase(f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_fss_destination_increase(f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) /** @@ -294,7 +240,7 @@ extern "C" { * @see fl_fss_extended_object_write_string() */ #if !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - extern f_return_status private_fl_fss_destination_increase_by(const f_string_length_t amount, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_fss_destination_increase_by(const f_string_length_t amount, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_fss_basic_object_write_string_) || !defined(_di_fl_fss_basic_content_write_string_) || !defined(_di_fl_fss_basic_list_object_write_string_) || !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_object_write_string_) || !defined(_di_fl_fss_extended_content_write_string_) || !defined(_di_fl_fss_extended_list_object_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) || !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) /** @@ -315,7 +261,7 @@ extern "C" { * @see fl_fss_extended_list_content_write_string() */ #if !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) - extern f_return_status private_fl_fss_destination_prepend(const f_string_static_t *prepend, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_fss_destination_prepend(const f_string_static_t *prepend, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_fss_basic_list_content_write_string_) || !defined(_di_fl_fss_extended_list_content_write_string_) /** @@ -333,7 +279,7 @@ extern "C" { * @see fl_fss_embedded_list_content_read() */ #if !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) - extern f_return_status private_fl_fss_nest_increase(f_fss_nest_t *nest) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_fss_nest_increase(f_fss_nest_t *nest) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_fss_embedded_list_object_read_) || !defined(_di_fl_fss_embedded_list_content_read_) /** @@ -351,47 +297,6 @@ extern "C" { 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 - * The range buffer to increment. - * - * @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. - * - * @see fl_fss_basic_object_read() - * @see fl_fss_basic_content_read() - * @see fl_fss_basic_list_content_read() - * @see fl_fss_basic_list_object_read - * @see fl_fss_embedded_list_content_read() - * @see fl_fss_embedded_list_object_read() - * @see fl_fss_extended_content_read() - * @see fl_fss_extended_list_content_read() - * @see fl_fss_extended_list_object_read() - * @see fl_fss_extended_object_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_) - 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 diff --git a/level_1/fl_fss/c/private-fss_macro.h b/level_1/fl_fss/c/private-fss_macro.h index ec4977c..141daff 100644 --- a/level_1/fl_fss/c/private-fss_macro.h +++ b/level_1/fl_fss/c/private-fss_macro.h @@ -87,14 +87,14 @@ extern "C" { if (range.start >= buffer.used) { \ delimits.used = delimits_used; \ comments.used = comments_used; \ - private_fl_fss_string_lengths_delete(&positions); \ + f_macro_string_lengths_t_delete_simple(positions); \ private_fl_fss_objects_delete(&objects); \ return eos_status; \ } \ else if (range.start > range.stop) { \ delimits.used = delimits_used; \ comments.used = comments_used; \ - private_fl_fss_string_lengths_delete(&positions); \ + f_macro_string_lengths_t_delete_simple(positions); \ private_fl_fss_objects_delete(&objects); \ return stop_status; \ } @@ -103,12 +103,12 @@ extern "C" { #ifndef _di_fl_macro_fss_nest_return_on_overflow_delimited_ #define private_fl_macro_fss_nest_return_on_overflow_delimited(buffer, range, found, positions, objects, eos_status, stop_status) \ if (range.start >= buffer.used) { \ - private_fl_fss_string_lengths_delete(&positions); \ + f_macro_string_lengths_t_delete_simple(positions); \ private_fl_fss_objects_delete(&objects); \ return eos_status; \ } \ else if (range.start > range.stop) { \ - private_fl_fss_string_lengths_delete(&positions); \ + f_macro_string_lengths_t_delete_simple(positions); \ private_fl_fss_objects_delete(&objects); \ return stop_status; \ } diff --git a/level_1/fl_iki/c/iki.c b/level_1/fl_iki/c/iki.c index bbc9a3f..b93fa82 100644 --- a/level_1/fl_iki/c/iki.c +++ b/level_1/fl_iki/c/iki.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fl_iki_read_ - f_return_status fl_iki_read(f_string_static_t *buffer, f_string_range_t *range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content) { + f_status_t fl_iki_read(f_string_static_t *buffer, f_string_range_t *range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content) { f_status_t status = F_none; do { diff --git a/level_1/fl_iki/c/iki.h b/level_1/fl_iki/c/iki.h index 7f3b59d..6eeade2 100644 --- a/level_1/fl_iki/c/iki.h +++ b/level_1/fl_iki/c/iki.h @@ -62,7 +62,7 @@ extern "C" { * Errors (with error bit) from: f_iki_read(). */ #ifndef _di_fl_iki_read_ - extern f_return_status fl_iki_read(f_string_static_t *buffer, f_string_range_t *range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content); + extern f_status_t fl_iki_read(f_string_static_t *buffer, f_string_range_t *range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content); #endif // _di_fl_iki_read_ #ifdef __cplusplus diff --git a/level_1/fl_print/c/print.c b/level_1/fl_print/c/print.c index 6c847d0..7810579 100644 --- a/level_1/fl_print/c/print.c +++ b/level_1/fl_print/c/print.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_print_trim_except_ - f_return_status fl_print_trim_except(FILE *output, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except) { + f_status_t fl_print_trim_except(FILE *output, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -18,7 +18,7 @@ extern "C" { #endif // _di_fl_print_trim_except_ #ifndef _di_fl_print_trim_except_dynamic_ - f_return_status fl_print_trim_except_dynamic(FILE *output, const f_string_static_t buffer, const f_string_lengths_t except) { + f_status_t fl_print_trim_except_dynamic(FILE *output, const f_string_static_t buffer, const f_string_lengths_t except) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -30,7 +30,7 @@ extern "C" { #endif // _di_fl_print_trim_except_dynamic_ #ifndef _di_fl_print_trim_except_dynamic_partial_ - f_return_status fl_print_trim_except_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except) { + f_status_t fl_print_trim_except_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -48,7 +48,7 @@ extern "C" { #endif // _di_fl_print_trim_except_dynamic_partial_ #ifndef _di_fl_print_trim_except_utf_ - f_return_status fl_print_trim_except_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length, const f_utf_string_lengths_t except) { + f_status_t fl_print_trim_except_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length, const f_utf_string_lengths_t except) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -60,7 +60,7 @@ extern "C" { #endif // _di_fl_print_trim_except_utf_ #ifndef _di_fl_print_trim_except_utf_dynamic_ - f_return_status fl_print_trim_except_utf_dynamic(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_lengths_t except) { + f_status_t fl_print_trim_except_utf_dynamic(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_lengths_t except) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -72,7 +72,7 @@ extern "C" { #endif // _di_fl_print_trim_except_utf_dynamic_ #ifndef _di_fl_print_trim_except_utf_dynamic_partial_ - f_return_status fl_print_trim_except_utf_dynamic_partial(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_range_t range, const f_utf_string_lengths_t except) { + f_status_t fl_print_trim_except_utf_dynamic_partial(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_range_t range, const f_utf_string_lengths_t except) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -90,7 +90,7 @@ extern "C" { #endif // _di_fl_print_trim_except_utf_dynamic_partial_ #ifndef _di_fl_print_trim_ - f_return_status fl_print_trim(FILE *output, const f_string_t string, const f_string_length_t length) { + f_status_t fl_print_trim(FILE *output, const f_string_t string, const f_string_length_t length) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -102,7 +102,7 @@ extern "C" { #endif // _di_fl_print_trim_ #ifndef _di_fl_print_trim_dynamic_ - f_return_status fl_print_trim_dynamic(FILE *output, const f_string_static_t buffer) { + f_status_t fl_print_trim_dynamic(FILE *output, const f_string_static_t buffer) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -114,7 +114,7 @@ extern "C" { #endif // _di_fl_print_trim_dynamic_ #ifndef _di_fl_print_trim_dynamic_partial_ - f_return_status fl_print_trim_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range) { + f_status_t fl_print_trim_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -132,7 +132,7 @@ extern "C" { #endif // _di_fl_print_trim_dynamic_partial_ #ifndef _di_fl_print_trim_utf_ - f_return_status fl_print_trim_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length) { + f_status_t fl_print_trim_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -144,7 +144,7 @@ extern "C" { #endif // _di_fl_print_trim_utf_ #ifndef _di_fl_print_trim_utf_dynamic_ - f_return_status fl_print_trim_utf_dynamic(FILE *output, const f_utf_string_static_t buffer) { + f_status_t fl_print_trim_utf_dynamic(FILE *output, const f_utf_string_static_t buffer) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -156,7 +156,7 @@ extern "C" { #endif // _di_fl_print_trim_utf_dynamic_ #ifndef _di_fl_print_trim_utf_dynamic_partial_ - f_return_status fl_print_trim_utf_dynamic_partial(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_range_t range) { + f_status_t fl_print_trim_utf_dynamic_partial(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_range_t range) { #ifndef _di_level_1_parameter_checking_ if (!output) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_print/c/print.h b/level_1/fl_print/c/print.h index cf40cf7..4af7e08 100644 --- a/level_1/fl_print/c/print.h +++ b/level_1/fl_print/c/print.h @@ -54,7 +54,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). */ #ifndef _di_fl_print_trim_except_ - extern f_return_status fl_print_trim_except(FILE *output, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except); + extern f_status_t fl_print_trim_except(FILE *output, const f_string_t string, const f_string_length_t length, const f_string_lengths_t except); #endif // _di_fl_print_trim_except_ /** @@ -86,7 +86,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). */ #ifndef _di_fl_print_trim_except_dynamic_ - extern f_return_status fl_print_trim_except_dynamic(FILE *output, const f_string_static_t buffer, const f_string_lengths_t except); + extern f_status_t fl_print_trim_except_dynamic(FILE *output, const f_string_static_t buffer, const f_string_lengths_t except); #endif // _di_fl_print_trim_except_dynamic_ /** @@ -120,7 +120,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). */ #ifndef _di_fl_print_trim_except_dynamic_partial_ - extern f_return_status fl_print_trim_except_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except); + extern f_status_t fl_print_trim_except_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range, const f_string_lengths_t except); #endif // _di_fl_print_trim_except_dynamic_partial_ /** @@ -153,7 +153,7 @@ extern "C" { * Errors (with error bit) from: f_utf_character_is_whitespace(). */ #ifndef _di_fl_print_trim_except_utf_ - extern f_return_status fl_print_trim_except_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length, const f_utf_string_lengths_t except); + extern f_status_t fl_print_trim_except_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length, const f_utf_string_lengths_t except); #endif // _di_fl_print_trim_except_utf_ /** @@ -185,7 +185,7 @@ extern "C" { * Errors (with error bit) from: f_utf_character_is_whitespace(). */ #ifndef _di_fl_print_trim_except_utf_dynamic_ - extern f_return_status fl_print_trim_except_utf_dynamic(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_lengths_t except); + extern f_status_t fl_print_trim_except_utf_dynamic(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_lengths_t except); #endif // _di_fl_print_trim_except_utf_dynamic_ /** @@ -219,7 +219,7 @@ extern "C" { * Errors (with error bit) from: f_utf_character_is_whitespace(). */ #ifndef _di_fl_print_trim_except_utf_dynamic_partial_ - extern f_return_status fl_print_trim_except_utf_dynamic_partial(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_range_t range, const f_utf_string_lengths_t except); + extern f_status_t fl_print_trim_except_utf_dynamic_partial(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_range_t range, const f_utf_string_lengths_t except); #endif // _di_fl_print_trim_except_utf_dynamic_partial_ /** @@ -248,7 +248,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). */ #ifndef _di_fl_print_trim_ - extern f_return_status fl_print_trim(FILE *output, const f_string_t string, const f_string_length_t length); + extern f_status_t fl_print_trim(FILE *output, const f_string_t string, const f_string_length_t length); #endif // _di_fl_print_trim_ /** @@ -276,7 +276,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). */ #ifndef _di_fl_print_trim_dynamic_ - extern f_return_status fl_print_trim_dynamic(FILE *output, const f_string_static_t buffer); + extern f_status_t fl_print_trim_dynamic(FILE *output, const f_string_static_t buffer); #endif // _di_fl_print_trim_dynamic_ /** @@ -306,7 +306,7 @@ extern "C" { * Errors (with error bit) from: f_utf_is_whitespace(). */ #ifndef _di_fl_print_trim_dynamic_partial_ - extern f_return_status fl_print_trim_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range); + extern f_status_t fl_print_trim_dynamic_partial(FILE *output, const f_string_static_t buffer, const f_string_range_t range); #endif // _di_fl_print_trim_dynamic_partial_ /** @@ -335,7 +335,7 @@ extern "C" { * Errors (with error bit) from: f_utf_character_is_whitespace(). */ #ifndef _di_fl_print_trim_utf_ - extern f_return_status fl_print_trim_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length); + extern f_status_t fl_print_trim_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length); #endif // _di_fl_print_trim_utf_ /** @@ -363,7 +363,7 @@ extern "C" { * Errors (with error bit) from: f_utf_character_is_whitespace(). */ #ifndef _di_fl_print_trim_utf_dynamic_ - extern f_return_status fl_print_trim_utf_dynamic(FILE *output, const f_utf_string_static_t buffer); + extern f_status_t fl_print_trim_utf_dynamic(FILE *output, const f_utf_string_static_t buffer); #endif // _di_fl_print_trim_utf_dynamic_ /** @@ -393,7 +393,7 @@ extern "C" { * Errors (with error bit) from: f_utf_character_is_whitespace(). */ #ifndef _di_fl_print_trim_utf_dynamic_partial_ - extern f_return_status fl_print_trim_utf_dynamic_partial(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_range_t range); + extern f_status_t fl_print_trim_utf_dynamic_partial(FILE *output, const f_utf_string_static_t buffer, const f_utf_string_range_t range); #endif // _di_fl_print_trim_utf_dynamic_partial_ #ifdef __cplusplus diff --git a/level_1/fl_print/c/private-print.c b/level_1/fl_print/c/private-print.c index bc957fd..4ddbccc 100644 --- a/level_1/fl_print/c/private-print.c +++ b/level_1/fl_print/c/private-print.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) - f_return_status private_fl_print_trim_except(FILE *output, const f_string_t string, const f_string_length_t start, const f_string_length_t stop, const f_string_lengths_t except) { + f_status_t private_fl_print_trim_except(FILE *output, const f_string_t string, const f_string_length_t start, const f_string_length_t stop, const f_string_lengths_t except) { register f_string_length_t i = start; f_string_length_t j = 0; @@ -129,7 +129,7 @@ extern "C" { #endif // !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) #if !defined(_di_fl_print_trim_except_utf_) || !defined(_di_fl_print_trim_except_utf_dynamic_) || !defined(_di_fl_print_trim_except_utf_dynamic_partial_) - f_return_status private_fl_print_trim_except_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t start, const f_utf_string_length_t stop, const f_utf_string_lengths_t except) { + f_status_t private_fl_print_trim_except_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t start, const f_utf_string_length_t stop, const f_utf_string_lengths_t except) { register f_string_length_t i = start; f_string_length_t j = 0; @@ -230,7 +230,7 @@ extern "C" { #endif // !defined(_di_fl_print_trim_except_utf_) || !defined(_di_fl_print_trim_except_utf_dynamic_) || !defined(_di_fl_print_trim_except_utf_dynamic_partial_) #if !defined(_di_fl_print_trim_) || !defined(_di_fl_print_trim_dynamic_) || !defined(_di_fl_print_trim_dynamic_partial_) - f_return_status private_fl_print_trim(FILE *output, const f_string_t string, const f_string_length_t length) { + f_status_t private_fl_print_trim(FILE *output, const f_string_t string, const f_string_length_t length) { register f_string_length_t i = 0; f_string_length_t j = 0; @@ -308,7 +308,7 @@ extern "C" { #endif // !defined(_di_fl_print_trim_) || !defined(_di_fl_print_trim_dynamic_) || !defined(_di_fl_print_trim_dynamic_partial_) #if !defined(_di_fl_print_trim_utf_) || !defined(_di_fl_print_trim_utf_dynamic_) || !defined(_di_fl_print_trim_utf_dynamic_partial_) - f_return_status private_fl_print_trim_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length) { + f_status_t private_fl_print_trim_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length) { register f_string_length_t i = 0; f_string_length_t j = 0; diff --git a/level_1/fl_print/c/private-print.h b/level_1/fl_print/c/private-print.h index b4ff298..6eb75b9 100644 --- a/level_1/fl_print/c/private-print.h +++ b/level_1/fl_print/c/private-print.h @@ -47,7 +47,7 @@ extern "C" { * @see fl_print_trim_except_dynamic_partial() */ #if !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) - extern f_return_status private_fl_print_trim_except(FILE *output, const f_string_t string, const f_string_length_t start, const f_string_length_t stop, const f_string_lengths_t except) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_print_trim_except(FILE *output, const f_string_t string, const f_string_length_t start, const f_string_length_t stop, const f_string_lengths_t except) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_print_trim_except_) || !defined(_di_fl_print_trim_except_dynamic_) || !defined(_di_fl_print_trim_except_dynamic_partial_) /** @@ -82,7 +82,7 @@ extern "C" { * @see fl_print_trim_except_utf_dynamic_partial() */ #if !defined(_di_fl_print_trim_except_utf_) || !defined(_di_fl_print_trim_except_utf_dynamic_) || !defined(_di_fl_print_trim_except_utf_dynamic_partial_) - extern f_return_status private_fl_print_trim_except_utf(FILE *output, const f_utf_string_t string, const f_string_length_t start, const f_utf_string_length_t stop, const f_utf_string_lengths_t except) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_print_trim_except_utf(FILE *output, const f_utf_string_t string, const f_string_length_t start, const f_utf_string_length_t stop, const f_utf_string_lengths_t except) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_print_trim_except_utf_) || !defined(_di_fl_print_trim_except_utf_dynamic_) || !defined(_di_fl_print_trim_except_utf_dynamic_partial_) /** @@ -112,7 +112,7 @@ extern "C" { * @see fl_print_trim_dynamic_partial() */ #if !defined(_di_fl_print_trim_) || !defined(_di_fl_print_trim_dynamic_) || !defined(_di_fl_print_trim_dynamic_partial_) - extern f_return_status private_fl_print_trim(FILE *output, const f_string_t string, const f_string_length_t length) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_print_trim(FILE *output, const f_string_t string, const f_string_length_t length) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_print_trim_) || !defined(_di_fl_print_trim_dynamic_) || !defined(_di_fl_print_trim_dynamic_partial_) /** @@ -142,7 +142,7 @@ extern "C" { * @see fl_print_trim_utf_dynamic_partial() */ #if !defined(_di_fl_print_trim_utf_) || !defined(_di_fl_print_trim_utf_dynamic_) || !defined(_di_fl_print_trim_utf_dynamic_partial_) - extern f_return_status private_fl_print_trim_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_print_trim_utf(FILE *output, const f_utf_string_t string, const f_utf_string_length_t length) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_print_trim_utf_) || !defined(_di_fl_print_trim_utf_dynamic_) || !defined(_di_fl_print_trim_utf_dynamic_partial_) #ifdef __cplusplus diff --git a/level_1/fl_status/c/status.c b/level_1/fl_status/c/status.c index d500c72..101e32f 100644 --- a/level_1/fl_status/c/status.c +++ b/level_1/fl_status/c/status.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fl_status_to_string_ - f_return_status fl_status_to_string(const f_status_t code, f_string_t *string) { + f_status_t fl_status_to_string(const f_status_t code, f_string_t *string) { #ifndef _di_level_1_parameter_checking_ if (!string) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_status/c/status.h b/level_1/fl_status/c/status.h index bf6dec7..cfcd87c 100644 --- a/level_1/fl_status/c/status.h +++ b/level_1/fl_status/c/status.h @@ -911,7 +911,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_status_to_string_ - extern f_return_status fl_status_to_string(const f_status_t code, f_string_t *string); + extern f_status_t fl_status_to_string(const f_status_t code, f_string_t *string); #endif // _di_fl_status_to_string_ #ifdef __cplusplus diff --git a/level_1/fl_string/c/private-string.c b/level_1/fl_string/c/private-string.c index 21682ee..2705be2 100644 --- a/level_1/fl_string/c/private-string.c +++ b/level_1/fl_string/c/private-string.c @@ -6,7 +6,7 @@ extern "C" { #endif #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 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; if (destination->used + length > destination->size) { @@ -22,7 +22,7 @@ extern "C" { #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_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) { + f_status_t 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); @@ -74,7 +74,7 @@ extern "C" { #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) { + f_status_t 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) { f_string_length_t i1 = offset1; f_string_length_t i2 = offset2; @@ -105,7 +105,7 @@ extern "C" { #endif // !defined(_di_fl_string_compare_) || !defined(_di_fl_string_dynamic_compare_) || !defined(_di_fl_string_dynamic_partial_compare_) #if !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_) - f_return_status private_fl_string_compare_except(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, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t private_fl_string_compare_except(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, const f_string_lengths_t except1, const f_string_lengths_t except2) { f_string_length_t i1 = offset1; f_string_length_t i2 = offset2; @@ -166,7 +166,7 @@ extern "C" { #endif // !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_) #if !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_) - f_return_status private_fl_string_compare_except_trim(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, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t private_fl_string_compare_except_trim(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, const f_string_lengths_t except1, const f_string_lengths_t except2) { f_string_length_t i1 = offset1; f_string_length_t i2 = offset2; @@ -380,7 +380,7 @@ extern "C" { #endif // !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_) #if !defined(_di_fl_string_compare_trim_) || !defined(_di_fl_string_dynamic_compare_trim_) || !defined(_di_fl_string_dynamic_partial_compare_trim_) - f_return_status private_fl_string_compare_trim(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) { + f_status_t private_fl_string_compare_trim(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) { f_string_length_t i1 = offset1; f_string_length_t i2 = offset2; @@ -532,7 +532,7 @@ extern "C" { #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) { + f_status_t private_fl_string_dynamic_increase_by(const f_string_length_t amount, f_string_dynamic_t *string) { if (string->used + amount > string->size) { if (string->used + amount > f_string_length_t_size) { @@ -547,7 +547,7 @@ extern "C" { #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_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 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); @@ -563,7 +563,7 @@ extern "C" { #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 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); @@ -572,22 +572,6 @@ extern "C" { } #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)); @@ -595,7 +579,7 @@ extern "C" { #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 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); @@ -605,7 +589,7 @@ extern "C" { #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) { + f_status_t 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); @@ -630,7 +614,7 @@ extern "C" { #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_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) { + f_status_t 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) { return F_status_set_error(F_string_too_large); @@ -696,7 +680,7 @@ extern "C" { #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) { + f_status_t private_fl_string_rip_find_range(const f_string_t source, f_string_length_t *start, f_string_length_t *stop) { const f_string_length_t stop_original = *stop; f_status_t status = F_none; diff --git a/level_1/fl_string/c/private-string.h b/level_1/fl_string/c/private-string.h index c40697d..3c8440c 100644 --- a/level_1/fl_string/c/private-string.h +++ b/level_1/fl_string/c/private-string.h @@ -49,7 +49,7 @@ extern "C" { * @see fl_string_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; + extern f_status_t 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_dynamic_mash_) || !defined(_di_fl_string_mash_) /** @@ -78,7 +78,7 @@ extern "C" { * @see fl_string_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; + extern f_status_t 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_dynamic_mash_nulless_) || !defined(_di_fl_string_mash_nulless_) /** @@ -108,7 +108,7 @@ extern "C" { * @see fl_string_dynamic_partial_compare() */ #if !defined(_di_fl_string_compare_) || !defined(_di_fl_string_dynamic_compare_) || !defined(_di_fl_string_dynamic_partial_compare_) - extern 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) f_gcc_attribute_visibility_internal; + extern f_status_t 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) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_string_compare_) || !defined(_di_fl_string_dynamic_compare_) || !defined(_di_fl_string_dynamic_partial_compare_) /** @@ -144,7 +144,7 @@ extern "C" { * @see fl_string_dynamic_partial_compare_except() */ #if !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_) - extern f_return_status private_fl_string_compare_except(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, const f_string_lengths_t except1, const f_string_lengths_t except2) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_string_compare_except(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, const f_string_lengths_t except1, const f_string_lengths_t except2) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_string_compare_except_) || !defined(_di_fl_string_dynamic_compare_except_) || !defined(_di_fl_string_dynamic_partial_compare_except_) /** @@ -184,7 +184,7 @@ extern "C" { * @see fl_string_dynamic_partial_compare_except_trim() */ #if !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_) - extern f_return_status private_fl_string_compare_except_trim(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, const f_string_lengths_t except1, const f_string_lengths_t except2) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_string_compare_except_trim(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, const f_string_lengths_t except1, const f_string_lengths_t except2) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_string_compare_except_trim_) || !defined(_di_fl_string_dynamic_compare_except_trim_) || !defined(_di_fl_string_dynamic_partial_compare_except_trim_) /** @@ -218,7 +218,7 @@ extern "C" { * @see fl_string_dynamic_partial_compare_trim() */ #if !defined(_di_fl_string_compare_trim_) || !defined(_di_fl_string_dynamic_compare_trim_) || !defined(_di_fl_string_dynamic_partial_compare_trim_) - extern f_return_status private_fl_string_compare_trim(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) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_string_compare_trim(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) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_string_compare_trim_) || !defined(_di_fl_string_dynamic_compare_trim_) || !defined(_di_fl_string_dynamic_partial_compare_trim_) /** @@ -270,7 +270,7 @@ extern "C" { * @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; + extern f_status_t 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_) /** @@ -297,7 +297,7 @@ extern "C" { * @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; + extern f_status_t 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_) /** @@ -340,53 +340,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -426,7 +383,7 @@ extern "C" { * @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; + extern f_status_t 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_) /** @@ -461,7 +418,7 @@ extern "C" { * @see fl_string_prepend() */ #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; + extern f_status_t 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_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_) /** @@ -496,7 +453,7 @@ extern "C" { * @see fl_string_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_) - 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; + extern f_status_t 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_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_) /** @@ -527,7 +484,7 @@ extern "C" { * @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; + extern f_status_t 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; #endif // !defined(_di_fl_string_rip_) || !defined(_di_fl_string_dynamic_rip_) || !defined(_di_fl_string_rip_nulless_) || !defined(_di_fl_string_dynamic_rip_nulless_) #ifdef __cplusplus diff --git a/level_1/fl_string/c/string.c b/level_1/fl_string/c/string.c index ab7c9ed..22e34eb 100644 --- a/level_1/fl_string/c/string.c +++ b/level_1/fl_string/c/string.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_string_append_ - f_return_status fl_string_append(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_append(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -18,7 +18,7 @@ extern "C" { #endif // _di_fl_string_append_ #ifndef _di_fl_string_append_assure_ - f_return_status fl_string_append_assure(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_append_assure(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -53,7 +53,7 @@ extern "C" { #endif // _di_fl_string_append_assure_ #ifndef _di_fl_string_append_assure_nulless_ - f_return_status fl_string_append_assure_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_append_assure_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -91,7 +91,7 @@ extern "C" { #endif // _di_fl_string_append_assure_nulless_ #ifndef _di_fl_string_append_nulless_ - f_return_status fl_string_append_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_append_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -103,31 +103,31 @@ extern "C" { #endif // _di_fl_string_append_nulless_ #ifndef _di_fl_string_compare_ - f_return_status fl_string_compare(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2) { + f_status_t fl_string_compare(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2) { return private_fl_string_compare(string1, string2, 0, 0, length1, length2); } #endif // _di_fl_string_compare_ #ifndef _di_fl_string_compare_except_ - f_return_status fl_string_compare_except(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_compare_except(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2, const f_string_lengths_t except1, const f_string_lengths_t except2) { return private_fl_string_compare_except(string1, string2, 0, 0, length1, length2, except1, except2); } #endif // _di_fl_string_compare_except_ #ifndef _di_fl_string_compare_except_trim_ - f_return_status fl_string_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2, const f_string_lengths_t except1, const f_string_lengths_t except2) { return private_fl_string_compare_except_trim(string1, string2, 0, 0, length1, length2, except1, except2); } #endif // _di_fl_string_compare_except_trim_ #ifndef _di_fl_string_compare_trim_ - f_return_status fl_string_compare_trim(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2) { + f_status_t fl_string_compare_trim(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2) { return private_fl_string_compare_trim(string1, string2, 0, 0, length1, length2); } #endif // _di_fl_string_compare_trim_ #ifndef _di_fl_string_dynamic_append_ - f_return_status fl_string_dynamic_append(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_append(const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -139,7 +139,7 @@ extern "C" { #endif // _di_fl_string_dynamic_append_ #ifndef _di_fl_string_dynamic_append_assure_ - f_return_status fl_string_dynamic_append_assure(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_append_assure(const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -177,7 +177,7 @@ extern "C" { #endif // _di_fl_string_dynamic_append_assure_ #ifndef _di_fl_string_dynamic_append_assure_nulless_ - f_return_status fl_string_dynamic_append_assure_nulless(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_append_assure_nulless(const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -215,7 +215,7 @@ extern "C" { #endif // _di_fl_string_dynamic_append_assure_nulless_ #ifndef _di_fl_string_dynamic_append_nulless_ - f_return_status fl_string_dynamic_append_nulless(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_append_nulless(const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -227,55 +227,55 @@ extern "C" { #endif // _di_fl_string_dynamic_append_nulless_ #ifndef _di_fl_string_dynamic_compare_ - f_return_status fl_string_dynamic_compare(const f_string_static_t string1, const f_string_static_t string2) { + f_status_t fl_string_dynamic_compare(const f_string_static_t string1, const f_string_static_t string2) { return private_fl_string_compare(string1.string, string2.string, 0, 0, string1.used, string2.used); } #endif // _di_fl_string_dynamic_compare_ #ifndef _di_fl_string_dynamic_compare_except_ - f_return_status fl_string_dynamic_compare_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_compare_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_lengths_t except1, const f_string_lengths_t except2) { return private_fl_string_compare_except(string1.string, string2.string, 0, 0, string1.used, string2.used, except1, except2); } #endif // _di_fl_string_dynamic_compare_except_ #ifndef _di_fl_string_dynamic_compare_except_string_ - f_return_status fl_string_dynamic_compare_except_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_compare_except_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_lengths_t except1, const f_string_lengths_t except2) { return private_fl_string_compare_except(string1, string2.string, 0, 0, length1, string2.used, except1, except2); } #endif // _di_fl_string_dynamic_compare_except_string_ #ifndef _di_fl_string_dynamic_compare_except_trim_ - f_return_status fl_string_dynamic_compare_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_compare_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_lengths_t except1, const f_string_lengths_t except2) { return private_fl_string_compare_except_trim(string1.string, string2.string, 0, 0, string1.used, string2.used, except1, except2); } #endif // _di_fl_string_dynamic_compare_except_trim_ #ifndef _di_fl_string_dynamic_compare_except_trim_string_ - f_return_status fl_string_dynamic_compare_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_compare_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_lengths_t except1, const f_string_lengths_t except2) { return private_fl_string_compare_except_trim(string1, string2.string, 0, 0, length1, string2.used, except1, except2); } #endif // _di_fl_string_dynamic_compare_except_trim_string_ #ifndef _di_fl_string_dynamic_compare_string_ - f_return_status fl_string_dynamic_compare_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1) { + f_status_t fl_string_dynamic_compare_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1) { return private_fl_string_compare(string1, string2.string, 0, 0, length1, string2.used); } #endif // _di_fl_string_dynamic_compare_string_ #ifndef _di_fl_string_dynamic_compare_trim_ - f_return_status fl_string_dynamic_compare_trim(const f_string_static_t string1, const f_string_static_t string2) { + f_status_t fl_string_dynamic_compare_trim(const f_string_static_t string1, const f_string_static_t string2) { return private_fl_string_compare_trim(string1.string, string2.string, 0, 0, string1.used, string2.used); } #endif // _di_fl_string_dynamic_compare_trim_ #ifndef _di_fl_string_dynamic_compare_trim_string_ - f_return_status fl_string_dynamic_compare_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1) { + f_status_t fl_string_dynamic_compare_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1) { return private_fl_string_compare_trim(string1, string2.string, 0, 0, length1, string2.used); } #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) { + f_status_t 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_ @@ -291,7 +291,7 @@ extern "C" { #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) { + f_status_t 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); @@ -308,7 +308,7 @@ extern "C" { #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) { + f_status_t 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_ @@ -320,7 +320,7 @@ extern "C" { #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) { + f_status_t 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_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -337,7 +337,7 @@ extern "C" { #endif // _di_fl_string_dynamic_mash_ #ifndef _di_fl_string_dynamic_mash_nulless_ - f_return_status fl_string_dynamic_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_mash_nulless(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_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -354,7 +354,7 @@ extern "C" { #endif // _di_fl_string_dynamic_mash_nulless_ #ifndef _di_fl_string_dynamic_mish_ - f_return_status fl_string_dynamic_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_mish(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_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -371,7 +371,7 @@ extern "C" { #endif // _di_fl_string_dynamic_mish_ #ifndef _di_fl_string_dynamic_mish_nulless_ - f_return_status fl_string_dynamic_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_mish_nulless(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_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -388,7 +388,7 @@ extern "C" { #endif // _di_fl_string_dynamic_mish_nulless_ #ifndef _di_fl_string_dynamic_partial_append_ - f_return_status fl_string_dynamic_partial_append(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_append(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -402,7 +402,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_append_ #ifndef _di_fl_string_dynamic_partial_append_assure_ - f_return_status fl_string_dynamic_partial_append_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_append_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -442,7 +442,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_append_assure_ #ifndef _di_fl_string_dynamic_partial_append_assure_nulless_ - f_return_status fl_string_dynamic_partial_append_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_append_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -482,7 +482,7 @@ extern "C" { #endif // _di_fl_string_dynamic_append_assure_nulless_ #ifndef _di_fl_string_dynamic_partial_append_nulless_ - f_return_status fl_string_dynamic_partial_append_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_append_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -496,7 +496,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_append_nulless_ #ifndef _di_fl_string_dynamic_partial_compare_ - f_return_status fl_string_dynamic_partial_compare(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2) { + f_status_t fl_string_dynamic_partial_compare(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2) { #ifndef _di_level_1_parameter_checking_ if (string1.used <= range1.stop) return F_status_set_error(F_parameter); if (string2.used <= range2.stop) return F_status_set_error(F_parameter); @@ -507,7 +507,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_ #ifndef _di_fl_string_dynamic_partial_compare_dynamic_ - f_return_status fl_string_dynamic_partial_compare_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2) { + f_status_t fl_string_dynamic_partial_compare_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2) { #ifndef _di_level_1_parameter_checking_ if (string2.used <= range2.stop) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -517,7 +517,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_dynamic_ #ifndef _di_fl_string_dynamic_partial_compare_string_ - f_return_status fl_string_dynamic_partial_compare_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2) { + f_status_t fl_string_dynamic_partial_compare_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2) { #ifndef _di_level_1_parameter_checking_ if (string2.used <= range2.stop) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -527,7 +527,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_string_ #ifndef _di_fl_string_dynamic_partial_compare_except_ - f_return_status fl_string_dynamic_partial_compare_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_partial_compare_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { #ifndef _di_level_1_parameter_checking_ if (string1.used <= range1.stop) return F_status_set_error(F_parameter); if (string2.used <= range2.stop) return F_status_set_error(F_parameter); @@ -538,7 +538,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_except_ #ifndef _di_fl_string_dynamic_partial_compare_except_dynamic_ - f_return_status fl_string_dynamic_partial_compare_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_partial_compare_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { #ifndef _di_level_1_parameter_checking_ if (string2.used <= range2.stop) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -548,7 +548,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_except_dynamic_ #ifndef _di_fl_string_dynamic_partial_compare_except_string_ - f_return_status fl_string_dynamic_partial_compare_except_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_partial_compare_except_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { #ifndef _di_level_1_parameter_checking_ if (string2.used <= range2.stop) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -558,7 +558,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_except_string_ #ifndef _di_fl_string_dynamic_partial_compare_except_trim_ - f_return_status fl_string_dynamic_partial_compare_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_partial_compare_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { #ifndef _di_level_1_parameter_checking_ if (string1.used <= range1.stop) return F_status_set_error(F_parameter); if (string2.used <= range2.stop) return F_status_set_error(F_parameter); @@ -569,7 +569,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_except_trim_ #ifndef _di_fl_string_dynamic_partial_compare_except_trim_dynamic_ - f_return_status fl_string_dynamic_partial_compare_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_partial_compare_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { #ifndef _di_level_1_parameter_checking_ if (string2.used <= range2.stop) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -579,7 +579,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_except_trim_dynamic_ #ifndef _di_fl_string_dynamic_partial_compare_except_trim_string_ - f_return_status fl_string_dynamic_partial_compare_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { + f_status_t fl_string_dynamic_partial_compare_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2) { #ifndef _di_level_1_parameter_checking_ if (string2.used <= range2.stop) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -589,7 +589,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_except_trim_string_ #ifndef _di_fl_string_dynamic_partial_compare_trim_ - f_return_status fl_string_dynamic_partial_compare_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2) { + f_status_t fl_string_dynamic_partial_compare_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2) { #ifndef _di_level_1_parameter_checking_ if (string1.used <= range1.stop) return F_status_set_error(F_parameter); if (string2.used <= range2.stop) return F_status_set_error(F_parameter); @@ -600,7 +600,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_trim_ #ifndef _di_fl_string_dynamic_partial_compare_trim_dynamic_ - f_return_status fl_string_dynamic_partial_compare_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2) { + f_status_t fl_string_dynamic_partial_compare_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2) { #ifndef _di_level_1_parameter_checking_ if (string2.used <= range2.stop) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -610,7 +610,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_trim_dynamic_ #ifndef _di_fl_string_dynamic_partial_compare_trim_string_ - f_return_status fl_string_dynamic_partial_compare_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2) { + f_status_t fl_string_dynamic_partial_compare_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2) { #ifndef _di_level_1_parameter_checking_ if (string2.used <= range2.stop) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -620,7 +620,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_compare_trim_string_ #ifndef _di_fl_string_dynamic_partial_mash_ - f_return_status fl_string_dynamic_partial_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -639,7 +639,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_mash_ #ifndef _di_fl_string_dynamic_partial_mash_nulless_ - f_return_status fl_string_dynamic_partial_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -658,7 +658,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_mash_nulless_ #ifndef _di_fl_string_dynamic_partial_mish_ - f_return_status fl_string_partial_dynamic_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_partial_dynamic_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -677,7 +677,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_mish_ #ifndef _di_fl_string_dynamic_partial_mish_nulless_ - f_return_status fl_string_dynamic_partial_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -696,7 +696,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_mish_nulless_ #ifndef _di_fl_string_dynamic_partial_prepend_ - f_return_status fl_string_dynamic_partial_prepend(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_prepend(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -710,7 +710,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_prepend_ #ifndef _di_fl_string_dynamic_partial_prepend_assure_ - f_return_status fl_string_dynamic_partial_prepend_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_prepend_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -752,7 +752,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_prepend_assure_ #ifndef _di_fl_string_dynamic_partial_prepend_assure_nulless_ - f_return_status fl_string_dynamic_partial_prepend_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_prepend_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -794,7 +794,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_prepend_assure_nulless #ifndef _di_fl_string_dynamic_partial_prepend_nulless_ - f_return_status fl_string_dynamic_partial_prepend_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_partial_prepend_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -808,7 +808,7 @@ extern "C" { #endif // _di_fl_string_dynamic_partial_prepend_nulless #ifndef _di_fl_string_dynamic_prepend_ - f_return_status fl_string_dynamic_prepend(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_prepend(const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -820,7 +820,7 @@ extern "C" { #endif // _di_fl_string_dynamic_prepend_ #ifndef _di_fl_string_dynamic_prepend_assure_ - f_return_status fl_string_dynamic_prepend_assure(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_prepend_assure(const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -858,7 +858,7 @@ extern "C" { #endif // _di_fl_string_dynamic_prepend_assure_ #ifndef _di_fl_string_dynamic_prepend_assure_nulless_ - f_return_status fl_string_dynamic_prepend_assure_nulless(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_prepend_assure_nulless(const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -896,7 +896,7 @@ extern "C" { #endif // _di_fl_string_dynamic_prepend_assure_nulless_ #ifndef _di_fl_string_dynamic_prepend_nulless_ - f_return_status fl_string_dynamic_prepend_nulless(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_prepend_nulless(const f_string_static_t source, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -908,7 +908,7 @@ extern "C" { #endif // _di_fl_string_dynamic_prepend_nulless_ #ifndef _di_fl_string_dynamic_rip_ - f_return_status fl_string_dynamic_rip(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_rip(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.start) return F_status_set_error(F_parameter); if (source.used <= range.stop) return F_status_set_error(F_parameter); @@ -934,7 +934,7 @@ extern "C" { #endif // _di_fl_string_dynamic_rip_ #ifndef _di_fl_string_dynamic_rip_nulless_ - f_return_status fl_string_dynamic_rip_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_rip_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.start) return F_status_set_error(F_parameter); if (source.used <= range.stop) return F_status_set_error(F_parameter); @@ -960,7 +960,7 @@ extern "C" { #endif // _di_fl_string_dynamic_rip_nulless_ #ifndef _di_fl_string_dynamic_increase_ - f_return_status fl_string_dynamic_increase(f_string_dynamic_t *string) { + f_status_t fl_string_dynamic_increase(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_ @@ -984,7 +984,7 @@ extern "C" { #endif // _di_fl_string_dynamic_increase_ #ifndef _di_fl_string_dynamic_increase_by_ - f_return_status fl_string_dynamic_increase_by(const f_string_length_t amount, f_string_dynamic_t *string) { + f_status_t fl_string_dynamic_increase_by(const f_string_length_t amount, 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_ @@ -994,7 +994,7 @@ extern "C" { #endif // _di_fl_string_dynamic_increase_by_ #ifndef _di_fl_string_dynamic_seek_line_ - f_return_status fl_string_dynamic_seek_line(const f_string_t string, f_string_range_t *range) { + f_status_t fl_string_dynamic_seek_line(const f_string_t string, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1013,7 +1013,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_line_ #ifndef _di_fl_string_dynamic_seek_line_to_ - f_return_status fl_string_dynamic_seek_line_to(const f_string_t string, const int8_t seek_to_this, f_string_range_t *range) { + f_status_t fl_string_dynamic_seek_line_to(const f_string_t string, const int8_t seek_to_this, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1035,7 +1035,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_line_to_ #ifndef _di_fl_string_dynamic_seek_line_to_utf_character_ - f_return_status fl_string_dynamic_seek_line_to_utf_character(const f_string_t string, const f_utf_character_t seek_to_this, f_string_range_t *range) { + f_status_t fl_string_dynamic_seek_line_to_utf_character(const f_string_t string, const f_utf_character_t seek_to_this, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1091,7 +1091,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_line_to_utf_character_ #ifndef _di_fl_string_dynamic_seek_line_until_graph_ - f_return_status fl_string_dynamic_seek_line_until_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range) { + f_status_t fl_string_dynamic_seek_line_until_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1136,7 +1136,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_line_until_graph_ #ifndef _di_fl_string_dynamic_seek_line_until_non_graph_ - f_return_status fl_string_dynamic_seek_line_until_non_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range) { + f_status_t fl_string_dynamic_seek_line_until_non_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1180,7 +1180,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_line_until_non_graph_ #ifndef _di_fl_string_dynamic_seek_to_ - f_return_status fl_string_dynamic_seek_to(const f_string_t string, const int8_t seek_to_this, f_string_range_t *range) { + f_status_t fl_string_dynamic_seek_to(const f_string_t string, const int8_t seek_to_this, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1199,7 +1199,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_to_ #ifndef _di_fl_string_dynamic_seek_to_utf_character_ - f_return_status fl_string_dynamic_seek_to_utf_character(const f_string_t string, const f_utf_character_t seek_to_this, f_string_range_t *range) { + f_status_t fl_string_dynamic_seek_to_utf_character(const f_string_t string, const f_utf_character_t seek_to_this, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1252,7 +1252,7 @@ extern "C" { #endif // _di_fl_string_dynamic_seek_to_utf_character_ #ifndef _di_fl_string_dynamic_terminate_ - f_return_status fl_string_dynamic_terminate(f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_terminate(f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); if (destination->used > destination->size) return F_status_set_error(F_parameter); @@ -1281,7 +1281,7 @@ extern "C" { #endif // _di_fl_string_dynamic_terminate_ #ifndef _di_fl_string_dynamic_terminate_after_ - f_return_status fl_string_dynamic_terminate_after(f_string_dynamic_t *destination) { + f_status_t fl_string_dynamic_terminate_after(f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); if (destination->used > destination->size) return F_status_set_error(F_parameter); @@ -1313,7 +1313,7 @@ extern "C" { #endif // _di_fl_string_dynamic_terminate_after_ #ifndef _di_fl_string_dynamics_decrease_ - f_return_status fl_string_dynamics_decrease(f_string_dynamics_t *strings) { + f_status_t fl_string_dynamics_decrease(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_ @@ -1329,7 +1329,7 @@ extern "C" { #endif // _di_fl_string_dynamics_decrease_ #ifndef _di_fl_string_dynamics_decrease_by_ - f_return_status fl_string_dynamics_decrease_by(const f_array_length_t amount, f_string_dynamics_t *strings) { + f_status_t fl_string_dynamics_decrease_by(const f_array_length_t amount, f_string_dynamics_t *strings) { #ifndef _di_level_1_parameter_checking_ if (!amount) return F_status_set_error(F_parameter); if (!strings) return F_status_set_error(F_parameter); @@ -1346,7 +1346,7 @@ extern "C" { #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) { + f_status_t 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_ @@ -1358,7 +1358,7 @@ extern "C" { #endif // _di_fl_string_dynamics_delete_ #ifndef _di_fl_string_dynamics_increase_ - f_return_status fl_string_dynamics_increase(f_string_dynamics_t *strings) { + f_status_t fl_string_dynamics_increase(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_ @@ -1382,7 +1382,7 @@ extern "C" { #endif // _di_fl_string_dynamics_increase_ #ifndef _di_fl_string_dynamics_increase_by_ - f_return_status fl_string_dynamics_increase_by(const f_array_length_t amount, f_string_dynamics_t *strings) { + f_status_t fl_string_dynamics_increase_by(const f_array_length_t amount, 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_ @@ -1399,96 +1399,8 @@ extern "C" { } #endif // _di_fl_string_dynamics_increase_by_ -#ifndef _di_fl_string_lengths_decrease_ - f_return_status fl_string_lengths_decrease(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_ - - if (lengths->size > 1) { - return private_fl_string_lengths_resize(lengths->size - 1, lengths); - } - - private_fl_string_lengths_delete(lengths); - - return F_none; - } -#endif // _di_fl_string_lengths_decrease_ - -#ifndef _di_fl_string_lengths_decrease_by_ - f_return_status fl_string_lengths_decrease_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_ - - if (lengths->size - amount > 0) { - return private_fl_string_lengths_resize(lengths->size - amount, lengths); - } - - 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_ - 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; - - if (size > f_array_length_t_size) { - if (lengths->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } - - 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_ - - 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 private_fl_string_lengths_resize(lengths->used + amount, lengths); - } - - return F_none; - } -#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) { + f_status_t fl_string_maps_decrease(f_string_maps_t *maps) { #ifndef _di_level_1_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1504,7 +1416,7 @@ extern "C" { #endif // _di_fl_string_maps_decrease_ #ifndef _di_fl_string_maps_decrease_by_ - f_return_status fl_string_maps_decrease_by(const f_array_length_t amount, f_string_maps_t *maps) { + f_status_t fl_string_maps_decrease_by(const f_array_length_t amount, f_string_maps_t *maps) { #ifndef _di_level_1_parameter_checking_ if (!amount) return F_status_set_error(F_parameter); if (!maps) return F_status_set_error(F_parameter); @@ -1521,7 +1433,7 @@ extern "C" { #endif // _di_fl_string_maps_decrease_by_ #ifndef _di_fl_string_maps_delete_ - f_return_status fl_string_maps_delete(f_string_maps_t *maps) { + f_status_t fl_string_maps_delete(f_string_maps_t *maps) { #ifndef _di_level_1_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1533,7 +1445,7 @@ extern "C" { #endif // _di_fl_string_maps_delete_ #ifndef _di_fl_string_maps_increase_ - f_return_status fl_string_maps_increase(f_string_maps_t *maps) { + f_status_t fl_string_maps_increase(f_string_maps_t *maps) { #ifndef _di_level_1_parameter_checking_ if (!maps) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1557,7 +1469,7 @@ extern "C" { #endif // _di_fl_string_maps_increase_ #ifndef _di_fl_string_maps_increase_by_ - f_return_status fl_string_maps_increase_by(const f_array_length_t amount, f_string_maps_t *maps) { + f_status_t fl_string_maps_increase_by(const f_array_length_t amount, f_string_maps_t *maps) { #ifndef _di_level_1_parameter_checking_ if (!amount) return F_status_set_error(F_parameter); if (!maps) return F_status_set_error(F_parameter); @@ -1576,7 +1488,7 @@ extern "C" { #endif // _di_fl_string_maps_increase_by_ #ifndef _di_fl_string_mash_ - f_return_status fl_string_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1593,7 +1505,7 @@ extern "C" { #endif // _di_fl_string_mash_ #ifndef _di_fl_string_mash_nulless_ - f_return_status fl_string_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1610,7 +1522,7 @@ extern "C" { #endif // _di_fl_string_mash_nulless_ #ifndef _di_fl_string_mish_ - f_return_status fl_string_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1627,7 +1539,7 @@ extern "C" { #endif // _di_fl_string_mish_ #ifndef _di_fl_string_mish_nulless_ - f_return_status fl_string_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1644,7 +1556,7 @@ extern "C" { #endif // _di_fl_string_mish_nulless_ #ifndef _di_fl_string_prepend_ - f_return_status fl_string_prepend(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_prepend(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1656,7 +1568,7 @@ extern "C" { #endif // _di_fl_string_prepend_ #ifndef _di_fl_string_prepend_assure_ - f_return_status fl_string_prepend_assure(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_prepend_assure(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1689,7 +1601,7 @@ extern "C" { #endif // _di_fl_string_prepend_assure_ #ifndef _di_fl_string_prepend_assure_nulless_ - f_return_status fl_string_prepend_assure_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_prepend_assure_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1722,7 +1634,7 @@ extern "C" { #endif // _di_fl_string_prepend_assure_nulless_ #ifndef _di_fl_string_prepend_nulless_ - f_return_status fl_string_prepend_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_prepend_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1734,7 +1646,7 @@ extern "C" { #endif // _di_fl_string_prepend_nulless_ #ifndef _di_fl_string_rip_ - f_return_status fl_string_rip(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_rip(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1754,7 +1666,7 @@ extern "C" { #endif // _di_fl_string_rip_ #ifndef _di_fl_string_rip_nulless_ - f_return_status fl_string_rip_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { + f_status_t fl_string_rip_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1774,7 +1686,7 @@ extern "C" { #endif // _di_fl_string_rip_nulless_ #ifndef _di_fl_string_seek_line_to_ - f_return_status fl_string_seek_line_to(const f_string_t string, const int8_t seek_to, f_string_range_t *range) { + f_status_t fl_string_seek_line_to(const f_string_t string, const int8_t seek_to, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1794,7 +1706,7 @@ extern "C" { #endif // _di_fl_string_seek_line_to_ #ifndef _di_fl_string_seek_line_to_utf_character_ - f_return_status fl_string_seek_line_to_utf_character(const f_string_t string, const f_utf_character_t seek_to, f_string_range_t *range) { + f_status_t fl_string_seek_line_to_utf_character(const f_string_t string, const f_utf_character_t seek_to, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1845,7 +1757,7 @@ extern "C" { #endif // _di_fl_string_seek_line_to_utf_character_ #ifndef _di_fl_string_seek_line_until_graph_ - f_return_status fl_string_seek_line_until_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range) { + f_status_t fl_string_seek_line_until_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1888,7 +1800,7 @@ extern "C" { #endif // _di_fl_string_seek_line_until_graph_ #ifndef _di_fl_string_seek_line_until_non_graph_ - f_return_status fl_string_seek_line_until_non_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range) { + f_status_t fl_string_seek_line_until_non_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1934,7 +1846,7 @@ extern "C" { #endif // _di_fl_string_seek_line_until_non_graph_ #ifndef _di_fl_string_seek_to_ - f_return_status fl_string_seek_to(const f_string_t string, const int8_t seek_to, f_string_range_t *range) { + f_status_t fl_string_seek_to(const f_string_t string, const int8_t seek_to, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1952,7 +1864,7 @@ extern "C" { #endif // _di_fl_string_seek_to_ #ifndef _di_fl_string_seek_to_utf_character_ - f_return_status fl_string_seek_to_utf_character(const f_string_t string, const f_utf_character_t seek_to, f_string_range_t *range) { + f_status_t fl_string_seek_to_utf_character(const f_string_t string, const f_utf_character_t seek_to, f_string_range_t *range) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_string/c/string.h b/level_1/fl_string/c/string.h index c1ffe5e..9364dbe 100644 --- a/level_1/fl_string/c/string.h +++ b/level_1/fl_string/c/string.h @@ -53,7 +53,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_append_ - extern f_return_status fl_string_append(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_append(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_append_ /** @@ -77,7 +77,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_append_assure_ - extern f_return_status fl_string_append_assure(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_append_assure(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_append_assure_ /** @@ -102,7 +102,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_append_assure_nulless_ - extern f_return_status fl_string_append_assure_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_append_assure_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_append_assure_nulless_ /** @@ -126,7 +126,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_append_nulless_ - extern f_return_status fl_string_append_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_append_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_append_nulless_ /** @@ -150,7 +150,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_compare_ - extern f_return_status fl_string_compare(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2); + extern f_status_t fl_string_compare(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2); #endif // _di_fl_string_compare_ /** @@ -181,7 +181,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_compare_except_ - extern f_return_status fl_string_compare_except(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_compare_except(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_compare_except_ /** @@ -217,7 +217,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_compare_except_trim_ - extern f_return_status fl_string_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_compare_except_trim(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_compare_except_trim_ /** @@ -246,7 +246,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_compare_trim_ - extern f_return_status fl_string_compare_trim(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2); + extern f_status_t fl_string_compare_trim(const f_string_t string1, const f_string_t string2, const f_string_length_t length1, const f_string_length_t length2); #endif // _di_fl_string_compare_trim_ /** @@ -266,7 +266,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_append_ - extern f_return_status fl_string_dynamic_append(const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_append(const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_append_ /** @@ -286,7 +286,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_append_assure_ - extern f_return_status fl_string_dynamic_append_assure(const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_append_assure(const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_append_assure_ /** @@ -308,7 +308,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_append_assure_nulless_ - extern f_return_status fl_string_dynamic_append_assure_nulless(const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_append_assure_nulless(const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_append_assure_nulless_ /** @@ -330,7 +330,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_append_nulless_ - extern f_return_status fl_string_dynamic_append_nulless(const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_append_nulless(const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_append_nulless_ /** @@ -350,7 +350,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_compare_ - extern f_return_status fl_string_dynamic_compare(const f_string_static_t string1, const f_string_static_t string2); + extern f_status_t fl_string_dynamic_compare(const f_string_static_t string1, const f_string_static_t string2); #endif // _di_fl_string_dynamic_compare_ /** @@ -377,7 +377,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_compare_except_ - extern f_return_status fl_string_dynamic_compare_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_compare_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_compare_except_ /** @@ -413,7 +413,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_compare_except_string_ - extern f_return_status fl_string_dynamic_compare_except_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_compare_except_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_compare_except_string_ /** @@ -445,7 +445,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_compare_except_trim_ - extern f_return_status fl_string_dynamic_compare_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_compare_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_compare_except_trim_ /** @@ -481,7 +481,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_compare_except_trim_string_ - extern f_return_status fl_string_dynamic_compare_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_compare_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_compare_except_trim_string_ /** @@ -510,7 +510,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_compare_string_ - extern f_return_status fl_string_dynamic_compare_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1); + extern f_status_t fl_string_dynamic_compare_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1); #endif // _di_fl_string_dynamic_compare_string_ /** @@ -535,7 +535,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_compare_trim_ - extern f_return_status fl_string_dynamic_compare_trim(const f_string_static_t string1, const f_string_static_t string2); + extern f_status_t fl_string_dynamic_compare_trim(const f_string_static_t string1, const f_string_static_t string2); #endif // _di_fl_string_dynamic_compare_trim_ /** @@ -564,7 +564,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_compare_trim_string_ - extern f_return_status fl_string_dynamic_compare_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1); + extern f_status_t fl_string_dynamic_compare_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1); #endif // _di_fl_string_dynamic_compare_trim_string_ /** @@ -583,7 +583,7 @@ extern "C" { * 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); + extern f_status_t fl_string_dynamic_decrease(f_string_dynamic_t *string); #endif // _di_fl_string_dynamic_decrease_ /** @@ -605,7 +605,7 @@ extern "C" { * 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); + extern f_status_t fl_string_dynamic_decrease_by(const f_string_length_t amount, f_string_dynamic_t *string); #endif // _di_fl_string_dynamic_decrease_by_ /** @@ -619,7 +619,7 @@ extern "C" { * 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); + extern f_status_t fl_string_dynamic_delete(f_string_dynamic_t *string); #endif // _di_fl_string_dynamic_delete_ /** @@ -645,7 +645,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_mash_ - extern 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); + extern f_status_t 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); #endif // _di_fl_string_dynamic_mash_ /** @@ -673,7 +673,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_mash_nulless_ - extern f_return_status fl_string_dynamic_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_mash_nulless_ /** @@ -699,7 +699,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_mish_ - extern f_return_status fl_string_dynamic_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_mish_ /** @@ -727,7 +727,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_mish_nulless_ - extern f_return_status fl_string_dynamic_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_mish_nulless_ /** @@ -750,7 +750,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_append_ - extern f_return_status fl_string_dynamic_partial_append(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_append(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_append_ /** @@ -775,7 +775,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_append_assure_ - extern f_return_status fl_string_dynamic_partial_append_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_append_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_append_assure_ /** @@ -802,7 +802,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_append_assure_nulless_ - extern f_return_status fl_string_dynamic_partial_append_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_append_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_append_assure_nulless_ /** @@ -827,7 +827,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_append_nulless_ - extern f_return_status fl_string_dynamic_partial_append_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_append_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_append_nulless_ /** @@ -851,7 +851,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_partial_compare_ - extern f_return_status fl_string_dynamic_partial_compare(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2); + extern f_status_t fl_string_dynamic_partial_compare(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2); #endif // _di_fl_string_dynamic_partial_compare_ /** @@ -882,7 +882,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_partial_compare_except_ - extern f_return_status fl_string_dynamic_partial_compare_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_partial_compare_except(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_partial_compare_except_ /** @@ -911,7 +911,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_partial_compare_except_dynamic_ - extern f_return_status fl_string_dynamic_partial_compare_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_partial_compare_except_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_partial_compare_except_dynamic_ /** @@ -944,7 +944,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_partial_compare_except_string_ - extern f_return_status fl_string_dynamic_partial_compare_except_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_partial_compare_except_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_partial_compare_except_string_ /** @@ -978,7 +978,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_partial_compare_except_trim_dynamic_ - extern f_return_status fl_string_dynamic_partial_compare_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_partial_compare_except_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_partial_compare_except_trim_dynamic_ /** @@ -1016,7 +1016,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_partial_compare_except_trim_string_ - extern f_return_status fl_string_dynamic_partial_compare_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_partial_compare_except_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_partial_compare_except_trim_string_ /** @@ -1052,7 +1052,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_partial_compare_except_trim_ - extern f_return_status fl_string_dynamic_partial_compare_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); + extern f_status_t fl_string_dynamic_partial_compare_except_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2, const f_string_lengths_t except1, const f_string_lengths_t except2); #endif // _di_fl_string_dynamic_partial_compare_except_trim_ /** @@ -1074,7 +1074,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_partial_compare_dynamic_ - extern f_return_status fl_string_dynamic_partial_compare_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2); + extern f_status_t fl_string_dynamic_partial_compare_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2); #endif // _di_fl_string_dynamic_partial_compare_dynamic_ /** @@ -1100,7 +1100,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_partial_compare_string_ - extern f_return_status fl_string_dynamic_partial_compare_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2); + extern f_status_t fl_string_dynamic_partial_compare_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2); #endif // _di_fl_string_dynamic_partial_compare_string_ /** @@ -1127,7 +1127,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_partial_compare_trim_dynamic_ - extern f_return_status fl_string_dynamic_partial_compare_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2); + extern f_status_t fl_string_dynamic_partial_compare_trim_dynamic(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range2); #endif // _di_fl_string_dynamic_partial_compare_trim_dynamic_ /** @@ -1158,7 +1158,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_partial_compare_trim_string_ - extern f_return_status fl_string_dynamic_partial_compare_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2); + extern f_status_t fl_string_dynamic_partial_compare_trim_string(const f_string_t string1, const f_string_static_t string2, const f_string_length_t length1, const f_string_range_t range2); #endif // _di_fl_string_dynamic_partial_compare_trim_string_ /** @@ -1187,7 +1187,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_dynamic_partial_compare_trim_ - extern f_return_status fl_string_dynamic_partial_compare_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2); + extern f_status_t fl_string_dynamic_partial_compare_trim(const f_string_static_t string1, const f_string_static_t string2, const f_string_range_t range1, const f_string_range_t range2); #endif // _di_fl_string_dynamic_partial_compare_trim_ /** @@ -1216,7 +1216,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_mash_ - extern f_return_status fl_string_dynamic_partial_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_mash_ /** @@ -1247,7 +1247,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_mash_nulless_ - extern f_return_status fl_string_dynamic_partial_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_mash_nulless_ /** @@ -1276,7 +1276,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_mish_ - extern f_return_status fl_string_dynamic_partial_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_mish_ /** @@ -1307,7 +1307,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_mish_nulless_ - extern f_return_status fl_string_dynamic_partial_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_mish_nulless_ /** @@ -1332,7 +1332,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_prepend_ - extern f_return_status fl_string_dynamic_partial_prepend(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_prepend(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_prepend_ /** @@ -1359,7 +1359,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_prepend_assure_ - extern f_return_status fl_string_dynamic_partial_prepend_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_prepend_assure(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_prepend_assure_ /** @@ -1386,7 +1386,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_prepend_assure_nulless_ - extern f_return_status fl_string_dynamic_partial_prepend_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_prepend_assure_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_prepend_assure_nulless_ /** @@ -1411,7 +1411,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_partial_prepend_nulless_ - extern f_return_status fl_string_dynamic_partial_prepend_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_partial_prepend_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_partial_prepend_nulless_ /** @@ -1434,7 +1434,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_prepend_ - extern f_return_status fl_string_dynamic_prepend(const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_prepend(const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_prepend_ /** @@ -1459,7 +1459,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_prepend_assure_ - extern f_return_status fl_string_dynamic_prepend_assure(const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_prepend_assure(const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_prepend_assure_ /** @@ -1484,7 +1484,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_prepend_assure_nulless_ - extern f_return_status fl_string_dynamic_prepend_assure_nulless(const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_prepend_assure_nulless(const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_prepend_assure_nulless_ /** @@ -1507,7 +1507,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_prepend_nulless_ - extern f_return_status fl_string_dynamic_prepend_nulless(const f_string_static_t source, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_prepend_nulless(const f_string_static_t source, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_prepend_nulless_ /** @@ -1534,7 +1534,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_rip_ - extern f_return_status fl_string_dynamic_rip(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_rip(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_rip_ /** @@ -1562,7 +1562,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_rip_nulless_ - extern f_return_status fl_string_dynamic_rip_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_rip_nulless(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_rip_nulless_ /** @@ -1585,7 +1585,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_increase_ - extern f_return_status fl_string_dynamic_increase(f_string_dynamic_t *string); + extern f_status_t fl_string_dynamic_increase(f_string_dynamic_t *string); #endif // _di_fl_string_dynamic_increase_ /** @@ -1608,7 +1608,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_dynamic_increase_by_ - extern f_return_status fl_string_dynamic_increase_by(const f_string_length_t amount, f_string_dynamic_t *string); + extern f_status_t fl_string_dynamic_increase_by(const f_string_length_t amount, f_string_dynamic_t *string); #endif // _di_fl_string_dynamic_increase_by_ /** @@ -1628,7 +1628,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_seek_line_ - extern f_return_status fl_string_dynamic_seek_line(const f_string_t string, f_string_range_t *range); + extern f_status_t fl_string_dynamic_seek_line(const f_string_t string, f_string_range_t *range); #endif // _di_fl_string_dynamic_seek_line_ /** @@ -1651,7 +1651,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_seek_line_to_ - extern f_return_status fl_string_dynamic_seek_line_to(const f_string_t string, const int8_t seek_to_this, f_string_range_t *range); + extern f_status_t fl_string_dynamic_seek_line_to(const f_string_t string, const int8_t seek_to_this, f_string_range_t *range); #endif // _di_fl_string_dynamic_seek_line_to_ /** @@ -1681,7 +1681,7 @@ extern "C" { * @see f_utf_char_to_character() */ #ifndef _di_fl_string_dynamic_seek_line_to_utf_character_ - extern f_return_status fl_string_dynamic_seek_line_to_utf_character(const f_string_t string, const f_utf_character_t seek_to_this, f_string_range_t *range); + extern f_status_t fl_string_dynamic_seek_line_to_utf_character(const f_string_t string, const f_utf_character_t seek_to_this, f_string_range_t *range); #endif // _di_fl_string_dynamic_seek_line_to_utf_character_ /** @@ -1711,7 +1711,7 @@ extern "C" { * @see f_utf_is_graph() */ #ifndef _di_fl_string_dynamic_seek_line_until_graph_ - extern f_return_status fl_string_dynamic_seek_line_until_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range); + extern f_status_t fl_string_dynamic_seek_line_until_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range); #endif // _di_fl_string_dynamic_seek_line_until_graph_ /** @@ -1741,7 +1741,7 @@ extern "C" { * @see f_utf_is_graph() */ #ifndef _di_fl_string_dynamic_seek_line_until_non_graph_ - extern f_return_status fl_string_dynamic_seek_line_until_non_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range); + extern f_status_t fl_string_dynamic_seek_line_until_non_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range); #endif // _di_fl_string_dynamic_seek_line_until_non_graph_ /** @@ -1765,7 +1765,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamic_seek_to_ - extern f_return_status fl_string_dynamic_seek_to(const f_string_t string, const int8_t seek_to_this, f_string_range_t *range); + extern f_status_t fl_string_dynamic_seek_to(const f_string_t string, const int8_t seek_to_this, f_string_range_t *range); #endif // _di_fl_string_dynamic_seek_to_ /** @@ -1794,7 +1794,7 @@ extern "C" { * @see f_utf_char_to_character() */ #ifndef _di_fl_string_dynamic_seek_to_utf_character_ - extern f_return_status fl_string_dynamic_seek_to_utf_character(const f_string_t string, const f_utf_character_t seek_to_this, f_string_range_t *range); + extern f_status_t fl_string_dynamic_seek_to_utf_character(const f_string_t string, const f_utf_character_t seek_to_this, f_string_range_t *range); #endif // _di_fl_string_dynamic_seek_to_utf_character_ /** @@ -1815,7 +1815,7 @@ extern "C" { * F_string_too_large (with error bit) if string is too large to fit into the buffer. */ #ifndef _di_fl_string_dynamic_terminate_ - extern f_return_status fl_string_dynamic_terminate(f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_terminate(f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_terminate_ /** @@ -1838,7 +1838,7 @@ extern "C" { * F_string_too_large (with error bit) if string is too large to fit into the buffer. */ #ifndef _di_fl_string_dynamic_terminate_after_ - extern f_return_status fl_string_dynamic_terminate_after(f_string_dynamic_t *destination); + extern f_status_t fl_string_dynamic_terminate_after(f_string_dynamic_t *destination); #endif // _di_fl_string_dynamic_terminate_after_ /** @@ -1857,7 +1857,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamics_decrease_ - extern f_return_status fl_string_dynamics_decrease(f_string_dynamics_t *strings); + extern f_status_t fl_string_dynamics_decrease(f_string_dynamics_t *strings); #endif // _di_fl_string_dynamics_decrease_ /** @@ -1879,7 +1879,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_dynamics_decrease_by_ - extern f_return_status fl_string_dynamics_decrease_by(const f_array_length_t amount, f_string_dynamics_t *strings); + extern f_status_t fl_string_dynamics_decrease_by(const f_array_length_t amount, f_string_dynamics_t *strings); #endif // _di_fl_string_dynamics_decrease_by_ /** @@ -1893,7 +1893,7 @@ extern "C" { * 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); + extern f_status_t fl_string_dynamics_delete(f_string_dynamics_t *strings); #endif // _di_fl_string_dynamics_delete_ /** @@ -1913,7 +1913,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_fl_string_dynamics_increase_ - extern f_return_status fl_string_dynamics_increase(f_string_dynamics_t *strings); + extern f_status_t fl_string_dynamics_increase(f_string_dynamics_t *strings); #endif // _di_fl_string_dynamics_increase_ /** @@ -1936,108 +1936,10 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_fl_string_dynamics_increase_by_ - extern f_return_status fl_string_dynamics_increase_by(const f_array_length_t amount, f_string_dynamics_t *strings); + extern f_status_t fl_string_dynamics_increase_by(const f_array_length_t amount, f_string_dynamics_t *strings); #endif // _di_fl_string_dynamics_increase_by_ /** - * Resize the string lengths array 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 lengths - * The string lengths array 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_lengths_decrease_ - extern f_return_status fl_string_lengths_decrease(f_string_lengths_t *lengths); -#endif // _di_fl_string_lengths_decrease_ - -/** - * Resize the string lengths array to a smaller size. - * - * This will resize making the array 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 lengths - * The string lengths array 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_lengths_decrease_by_ - extern f_return_status fl_string_lengths_decrease_by(const f_array_length_t amount, f_string_lengths_t *lengths); -#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). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param lengths - * The string lengths array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_fl_string_lengths_increase_ - extern f_return_status fl_string_lengths_increase(f_string_lengths_t *lengths); -#endif // _di_fl_string_lengths_increase_ - -/** - * Resize the string lengths array to a larger size. - * - * This will resize making the string larger based on the given length. - * If the given length is too large for the buffer, then attempt to set max buffer size (f_array_length_t_size). - * If already set to the maximum buffer size, then the resize will fail. - * - * @param amount - * A positive number representing how much to increase the size by. - * @param lengths - * The string lengths array 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. - * F_array_too_large (with error bit) if the new array length is too large. - */ -#ifndef _di_fl_string_lengths_increase_by_ - extern f_return_status fl_string_lengths_increase_by(const f_array_length_t amount, f_string_lengths_t *lengths); -#endif // _di_fl_string_lengths_increase_by_ - -/** * Resize the string maps array to a smaller size, by 1. * * This will shrink the size by size - 1. @@ -2053,7 +1955,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_maps_decrease_ - extern f_return_status fl_string_maps_decrease(f_string_maps_t *maps); + extern f_status_t fl_string_maps_decrease(f_string_maps_t *maps); #endif // _di_fl_string_maps_decrease_ /** @@ -2075,7 +1977,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_maps_decrease_by_ - extern f_return_status fl_string_maps_decrease_by(const f_array_length_t amount, f_string_maps_t *maps); + extern f_status_t fl_string_maps_decrease_by(const f_array_length_t amount, f_string_maps_t *maps); #endif // _di_fl_string_maps_decrease_by_ /** @@ -2089,7 +1991,7 @@ extern "C" { * 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); + extern f_status_t fl_string_maps_delete(f_string_maps_t *maps); #endif // _di_fl_string_maps_delete_ /** @@ -2109,7 +2011,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_maps_increase_ - extern f_return_status fl_string_maps_increase(f_string_maps_t *maps); + extern f_status_t fl_string_maps_increase(f_string_maps_t *maps); #endif // _di_fl_string_maps_increase_ /** @@ -2132,7 +2034,7 @@ extern "C" { * F_array_too_large (with error bit) if the new array length is too large. */ #ifndef _di_fl_string_maps_increase_by_ - extern f_return_status fl_string_maps_increase_by(const f_array_length_t amount, f_string_maps_t *maps); + extern f_status_t fl_string_maps_increase_by(const f_array_length_t amount, f_string_maps_t *maps); #endif // _di_fl_string_maps_increase_by_ /** @@ -2160,7 +2062,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_mash_ - extern f_return_status fl_string_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_mash_ /** @@ -2190,7 +2092,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_mash_nulless_ - extern f_return_status fl_string_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_mash_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_mash_nulless_ /** @@ -2218,7 +2120,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_mish_ - extern f_return_status fl_string_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_mish(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_mish_ /** @@ -2248,7 +2150,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_mish_nulless_ - extern f_return_status fl_string_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_mish_nulless(const f_string_t glue, const f_string_length_t glue_length, const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_mish_nulless_ /** @@ -2272,7 +2174,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_prepend_ - extern f_return_status fl_string_prepend(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_prepend(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_prepend_ /** @@ -2298,7 +2200,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_prepend_assure_ - extern f_return_status fl_string_prepend_assure(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_prepend_assure(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_prepend_assure_ /** @@ -2325,7 +2227,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_prepend_assure_nulless_ - extern f_return_status fl_string_prepend_assure_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_prepend_assure_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_prepend_assure_nulless_ /** @@ -2352,7 +2254,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_string_prepend_nulless_ - extern f_return_status fl_string_prepend_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_prepend_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_prepend_nulless_ /** @@ -2381,7 +2283,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_rip_ - extern f_return_status fl_string_rip(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_rip(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_rip_ /** @@ -2412,7 +2314,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_rip_nulless_ - extern f_return_status fl_string_rip_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); + extern f_status_t fl_string_rip_nulless(const f_string_t source, const f_string_length_t length, f_string_dynamic_t *destination); #endif // _di_fl_string_rip_nulless_ /** @@ -2434,7 +2336,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_seek_line_to_ - extern f_return_status fl_string_seek_line_to(const f_string_t string, const int8_t seek_to, f_string_range_t *range); + extern f_status_t fl_string_seek_line_to(const f_string_t string, const int8_t seek_to, f_string_range_t *range); #endif // _di_fl_string_seek_line_to_ /** @@ -2462,7 +2364,7 @@ extern "C" { * @see f_utf_char_to_character() */ #ifndef _di_fl_string_seek_line_to_utf_character_ - extern f_return_status fl_string_seek_line_to_utf_character(const f_string_t string, const f_utf_character_t seek_to, f_string_range_t *range); + extern f_status_t fl_string_seek_line_to_utf_character(const f_string_t string, const f_utf_character_t seek_to, f_string_range_t *range); #endif // _di_fl_string_seek_line_to_utf_character_ /** @@ -2491,7 +2393,7 @@ extern "C" { * @see f_utf_is_graph() */ #ifndef _di_fl_string_seek_line_until_graph_ - extern f_return_status fl_string_seek_line_until_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range); + extern f_status_t fl_string_seek_line_until_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range); #endif // _di_fl_string_seek_line_until_graph_ /** @@ -2521,7 +2423,7 @@ extern "C" { * @see f_utf_is_whitespace() */ #ifndef _di_fl_string_seek_line_until_non_graph_ - extern f_return_status fl_string_seek_line_until_non_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range); + extern f_status_t fl_string_seek_line_until_non_graph(const f_string_t string, const int8_t placeholder, f_string_range_t *range); #endif // _di_fl_string_seek_line_until_non_graph_ /** @@ -2544,7 +2446,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_string_seek_to_ - extern f_return_status fl_string_seek_to(const f_string_t string, const int8_t seek_to, f_string_range_t *range); + extern f_status_t fl_string_seek_to(const f_string_t string, const int8_t seek_to, f_string_range_t *range); #endif // _di_fl_string_seek_to_ /** @@ -2572,7 +2474,7 @@ extern "C" { * @see f_utf_char_to_character() */ #ifndef _di_fl_string_seek_to_utf_character_ - extern f_return_status fl_string_seek_to_utf_character(const f_string_t string, const f_utf_character_t seek_to, f_string_range_t *range); + extern f_status_t fl_string_seek_to_utf_character(const f_string_t string, const f_utf_character_t seek_to, f_string_range_t *range); #endif // _di_fl_string_seek_to_utf_character_ #ifdef __cplusplus diff --git a/level_1/fl_type/c/private-type.c b/level_1/fl_type/c/private-type.c index 64c2a3b..464e00c 100644 --- a/level_1/fl_type/c/private-type.c +++ b/level_1/fl_type/c/private-type.c @@ -5,22 +5,6 @@ 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)); @@ -28,7 +12,7 @@ extern "C" { #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 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); @@ -37,22 +21,6 @@ extern "C" { } #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)); @@ -60,7 +28,7 @@ extern "C" { #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 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); @@ -69,22 +37,6 @@ extern "C" { } #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)); @@ -92,7 +44,7 @@ extern "C" { #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 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); @@ -101,22 +53,6 @@ extern "C" { } #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)); @@ -124,7 +60,7 @@ extern "C" { #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 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); @@ -133,22 +69,6 @@ extern "C" { } #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)); @@ -156,7 +76,7 @@ extern "C" { #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 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); @@ -165,22 +85,6 @@ extern "C" { } #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)); @@ -188,7 +92,7 @@ extern "C" { #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 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); @@ -197,22 +101,6 @@ extern "C" { } #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)); @@ -220,7 +108,7 @@ extern "C" { #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 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); @@ -229,22 +117,6 @@ extern "C" { } #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)); @@ -252,7 +124,7 @@ extern "C" { #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 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); @@ -261,22 +133,6 @@ extern "C" { } #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)); @@ -284,7 +140,7 @@ extern "C" { #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 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); @@ -293,22 +149,6 @@ extern "C" { } #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)); @@ -316,7 +156,7 @@ extern "C" { #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 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); @@ -325,22 +165,6 @@ extern "C" { } #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)); @@ -348,7 +172,7 @@ extern "C" { #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 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); @@ -357,22 +181,6 @@ extern "C" { } #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)); @@ -380,7 +188,7 @@ extern "C" { #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 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); diff --git a/level_1/fl_type/c/private-type.h b/level_1/fl_type/c/private-type.h index 016ee1a..faba54e 100644 --- a/level_1/fl_type/c/private-type.h +++ b/level_1/fl_type/c/private-type.h @@ -16,39 +16,6 @@ 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. @@ -78,43 +45,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -144,43 +78,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -210,43 +111,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -276,43 +144,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -342,43 +177,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -408,43 +210,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -474,43 +243,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -540,43 +276,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -606,43 +309,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -672,43 +342,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -738,43 +375,10 @@ extern "C" { * @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; + extern f_status_t 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. @@ -804,7 +408,7 @@ extern "C" { * @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; + extern f_status_t 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 diff --git a/level_1/fl_type/c/type.c b/level_1/fl_type/c/type.c index e30014f..b413e48 100644 --- a/level_1/fl_type/c/type.c +++ b/level_1/fl_type/c/type.c @@ -6,61 +6,49 @@ extern "C" { #endif #ifndef _di_fl_type_cells_delete_ - f_return_status fl_type_cells_delete(f_cells_t *cells) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_cells_t_delete(status, (*cells)); + + return status; } #endif // _di_fl_type_cells_delete_ #ifndef _di_fl_type_cells_increase_ - f_return_status fl_type_cells_increase(f_cells_t *cells) { + f_status_t 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; - - if (size > f_array_length_t_size) { - if (cells->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_status_t status = F_none; - private_fl_type_cells_resize(size, cells); - } + f_macro_cells_t_increase(status, (*cells)); - return F_none; + return status; } #endif // _di_fl_type_cells_increase_ #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) { + f_status_t 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; - private_fl_type_cells_resize(cells->used + amount, cells); - } + f_macro_cells_t_increase_by(status, (*cells), amount); - return F_none; + return status; } #endif // _di_fl_type_cells_increase_by_ #ifndef _di_fl_type_cellss_delete_ - f_return_status fl_type_cellss_delete(f_cellss_t *cellss) { + f_status_t 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_ @@ -72,7 +60,7 @@ extern "C" { #endif // _di_fl_type_cellss_delete_ #ifndef _di_fl_type_cellss_increase_ - f_return_status fl_type_cellss_increase(f_cellss_t *cellss) { + f_status_t 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_ @@ -96,7 +84,7 @@ extern "C" { #endif // _di_fl_type_cellss_increase_ #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) { + f_status_t 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_ @@ -114,61 +102,49 @@ extern "C" { #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) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_array_lengths_t_delete(status, (*lengths)); + + return status; } #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) { + f_status_t 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; + f_status_t status = F_none; - if (size > f_array_length_t_size) { - if (lengths->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_macro_array_lengths_t_increase(status, (*lengths)); - private_fl_type_array_lengths_resize(size, lengths); - } - - return F_none; + return status; } #endif // _di_fl_type_array_lengths_increase_ #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) { + f_status_t 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; - private_fl_type_array_lengths_resize(lengths->used + amount, lengths); - } + f_macro_array_lengths_t_increase_by(status, (*lengths), amount); - return F_none; + return status; } #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) { + f_status_t 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_ @@ -180,7 +156,7 @@ extern "C" { #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) { + f_status_t 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_ @@ -204,7 +180,7 @@ extern "C" { #endif // _di_fl_type_array_lengthss_increase_ #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) { + f_status_t 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_ @@ -222,61 +198,49 @@ extern "C" { #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) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_int8s_t_delete(status, (*int8s)); + + return status; } #endif // _di_fl_type_int8s_delete_ #ifndef _di_fl_type_int8s_increase_ - f_return_status fl_type_int8s_increase(f_int8s_t *int8s) { + f_status_t 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; - - if (size > f_array_length_t_size) { - if (int8s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_status_t status = F_none; - private_fl_type_int8s_resize(size, int8s); - } + f_macro_int8s_t_increase(status, (*int8s)); - return F_none; + return status; } #endif // _di_fl_type_int8s_increase_ #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) { + f_status_t 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; - private_fl_type_int8s_resize(int8s->used + amount, int8s); - } + f_macro_int8s_t_increase_by(status, (*int8s), amount); - return F_none; + return status; } #endif // _di_fl_type_int8s_increase_by_ #ifndef _di_fl_type_int8ss_delete_ - f_return_status fl_type_int8ss_delete(f_int8ss_t *int8ss) { + f_status_t 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_ @@ -288,7 +252,7 @@ extern "C" { #endif // _di_fl_type_int8ss_delete_ #ifndef _di_fl_type_int8ss_increase_ - f_return_status fl_type_int8ss_increase(f_int8ss_t *int8ss) { + f_status_t 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_ @@ -312,7 +276,7 @@ extern "C" { #endif // _di_fl_type_int8ss_increase_ #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) { + f_status_t 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_ @@ -330,61 +294,49 @@ extern "C" { #endif // _di_fl_type_int8ss_increase_by_ #ifndef _di_fl_type_uint8s_delete_ - f_return_status fl_type_uint8s_delete(f_uint8s_t *uint8s) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_uint8s_t_delete(status, (*uint8s)); + + return status; } #endif // _di_fl_type_uint8s_delete_ #ifndef _di_fl_type_uint8s_increase_ - f_return_status fl_type_uint8s_increase(f_uint8s_t *uint8s) { + f_status_t 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; - - if (size > f_array_length_t_size) { - if (uint8s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_status_t status = F_none; - private_fl_type_uint8s_resize(size, uint8s); - } + f_macro_uint8s_t_increase(status, (*uint8s)); - return F_none; + return status; } #endif // _di_fl_type_uint8s_increase_ #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) { + f_status_t 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; - private_fl_type_uint8s_resize(uint8s->used + amount, uint8s); - } + f_macro_uint8s_t_increase_by(status, (*uint8s), amount); - return F_none; + return status; } #endif // _di_fl_type_uint8s_increase_by_ #ifndef _di_fl_type_uint8ss_delete_ - f_return_status fl_type_uint8ss_delete(f_uint8ss_t *uint8ss) { + f_status_t 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_ @@ -396,7 +348,7 @@ extern "C" { #endif // _di_fl_type_uint8ss_delete_ #ifndef _di_fl_type_uint8ss_increase_ - f_return_status fl_type_uint8ss_increase(f_uint8ss_t *uint8ss) { + f_status_t 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_ @@ -420,7 +372,7 @@ extern "C" { #endif // _di_fl_type_uint8ss_increase_ #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) { + f_status_t 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_ @@ -438,61 +390,49 @@ extern "C" { #endif // _di_fl_type_uint8ss_increase_by_ #ifndef _di_fl_type_int16s_delete_ - f_return_status fl_type_int16s_delete(f_int16s_t *int16s) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_int16s_t_delete(status, (*int16s)); + + return status; } #endif // _di_fl_type_int16s_delete_ #ifndef _di_fl_type_int16s_increase_ - f_return_status fl_type_int16s_increase(f_int16s_t *int16s) { + f_status_t 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; + f_status_t status = F_none; - if (size > f_array_length_t_size) { - if (int16s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_macro_int16s_t_increase(status, (*int16s)); - private_fl_type_int16s_resize(size, int16s); - } - - return F_none; + return status; } #endif // _di_fl_type_int16s_increase_ #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) { + f_status_t 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; - private_fl_type_int16s_resize(int16s->used + amount, int16s); - } + f_macro_int16s_t_increase_by(status, (*int16s), amount); - return F_none; + return status; } #endif // _di_fl_type_int16s_increase_by_ #ifndef _di_fl_type_int16ss_delete_ - f_return_status fl_type_int16ss_delete(f_int16ss_t *int16ss) { + f_status_t 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_ @@ -504,7 +444,7 @@ extern "C" { #endif // _di_fl_type_int16ss_delete_ #ifndef _di_fl_type_int16ss_increase_ - f_return_status fl_type_int16ss_increase(f_int16ss_t *int16ss) { + f_status_t 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_ @@ -528,7 +468,7 @@ extern "C" { #endif // _di_fl_type_int16ss_increase_ #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) { + f_status_t 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_ @@ -546,61 +486,49 @@ extern "C" { #endif // _di_fl_type_int16ss_increase_by_ #ifndef _di_fl_type_uint16s_delete_ - f_return_status fl_type_uint16s_delete(f_uint16s_t *uint16s) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_uint16s_t_delete(status, (*uint16s)); + + return status; } #endif // _di_fl_type_uint16s_delete_ #ifndef _di_fl_type_uint16s_increase_ - f_return_status fl_type_uint16s_increase(f_uint16s_t *uint16s) { + f_status_t 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; - - if (size > f_array_length_t_size) { - if (uint16s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_status_t status = F_none; - private_fl_type_uint16s_resize(size, uint16s); - } + f_macro_uint16s_t_increase(status, (*uint16s)); - return F_none; + return status; } #endif // _di_fl_type_uint16s_increase_ #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) { + f_status_t 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; - private_fl_type_uint16s_resize(uint16s->used + amount, uint16s); - } + f_macro_uint16s_t_increase_by(status, (*uint16s), amount); - return F_none; + return status; } #endif // _di_fl_type_uint16s_increase_by_ #ifndef _di_fl_type_uint16ss_delete_ - f_return_status fl_type_uint16ss_delete(f_uint16ss_t *uint16ss) { + f_status_t 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_ @@ -612,7 +540,7 @@ extern "C" { #endif // _di_fl_type_uint16ss_delete_ #ifndef _di_fl_type_uint16ss_increase_ - f_return_status fl_type_uint16ss_increase(f_uint16ss_t *uint16ss) { + f_status_t 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_ @@ -636,7 +564,7 @@ extern "C" { #endif // _di_fl_type_uint16ss_increase_ #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) { + f_status_t 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_ @@ -654,61 +582,49 @@ extern "C" { #endif // _di_fl_type_uint16ss_increase_by_ #ifndef _di_fl_type_int32s_delete_ - f_return_status fl_type_int32s_delete(f_int32s_t *int32s) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_int32s_t_delete(status, (*int32s)); + + return status; } #endif // _di_fl_type_int32s_delete_ #ifndef _di_fl_type_int32s_increase_ - f_return_status fl_type_int32s_increase(f_int32s_t *int32s) { + f_status_t 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; - - if (size > f_array_length_t_size) { - if (int32s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_status_t status = F_none; - private_fl_type_int32s_resize(size, int32s); - } + f_macro_int32s_t_increase(status, (*int32s)); - return F_none; + return status; } #endif // _di_fl_type_int32s_increase_ #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) { + f_status_t 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; - private_fl_type_int32s_resize(int32s->used + amount, int32s); - } + f_macro_int32s_t_increase_by(status, (*int32s), amount); - return F_none; + return status; } #endif // _di_fl_type_int32s_increase_by_ #ifndef _di_fl_type_int32ss_delete_ - f_return_status fl_type_int32ss_delete(f_int32ss_t *int32ss) { + f_status_t 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_ @@ -720,7 +636,7 @@ extern "C" { #endif // _di_fl_type_int32ss_delete_ #ifndef _di_fl_type_int32ss_increase_ - f_return_status fl_type_int32ss_increase(f_int32ss_t *int32ss) { + f_status_t 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_ @@ -744,7 +660,7 @@ extern "C" { #endif // _di_fl_type_int32ss_increase_ #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) { + f_status_t 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_ @@ -762,61 +678,49 @@ extern "C" { #endif // _di_fl_type_int32ss_increase_by_ #ifndef _di_fl_type_uint32s_delete_ - f_return_status fl_type_uint32s_delete(f_uint32s_t *uint32s) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_uint32s_t_delete(status, (*uint32s)); + + return status; } #endif // _di_fl_type_uint32s_delete_ #ifndef _di_fl_type_uint32s_increase_ - f_return_status fl_type_uint32s_increase(f_uint32s_t *uint32s) { + f_status_t 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; + f_status_t status = F_none; - if (size > f_array_length_t_size) { - if (uint32s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_macro_uint32s_t_increase(status, (*uint32s)); - private_fl_type_uint32s_resize(size, uint32s); - } - - return F_none; + return status; } #endif // _di_fl_type_uint32s_increase_ #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) { + f_status_t 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; - private_fl_type_uint32s_resize(uint32s->used + amount, uint32s); - } + f_macro_uint32s_t_increase_by(status, (*uint32s), amount); - return F_none; + return status; } #endif // _di_fl_type_uint32s_increase_by_ #ifndef _di_fl_type_uint32ss_delete_ - f_return_status fl_type_uint32ss_delete(f_uint32ss_t *uint32ss) { + f_status_t 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_ @@ -828,7 +732,7 @@ extern "C" { #endif // _di_fl_type_uint32ss_delete_ #ifndef _di_fl_type_uint32ss_increase_ - f_return_status fl_type_uint32ss_increase(f_uint32ss_t *uint32ss) { + f_status_t 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_ @@ -852,7 +756,7 @@ extern "C" { #endif // _di_fl_type_uint32ss_increase_ #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) { + f_status_t 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_ @@ -870,61 +774,49 @@ extern "C" { #endif // _di_fl_type_uint32ss_increase_by_ #ifndef _di_fl_type_int64s_delete_ - f_return_status fl_type_int64s_delete(f_int64s_t *int64s) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_int64s_t_delete(status, (*int64s)); + + return status; } #endif // _di_fl_type_int64s_delete_ #ifndef _di_fl_int64s_increase_ - f_return_status fl_int64s_increase(f_int64s_t *int64s) { + f_status_t 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; - - if (size > f_array_length_t_size) { - if (int64s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_status_t status = F_none; - private_fl_type_int64s_resize(size, int64s); - } + f_macro_int64s_t_increase(status, (*int64s)); - return F_none; + return status; } #endif // _di_fl_int64s_increase_ #ifndef _di_fl_int64s_increase_by_ - f_return_status fl_int64s_increase_by(const f_array_length_t amount, f_int64s_t *int64s) { + f_status_t 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; - private_fl_type_int64s_resize(int64s->used + amount, int64s); - } + f_macro_int64s_t_increase_by(status, (*int64s), amount); - return F_none; + return status; } #endif // _di_fl_int64s_increase_by_ #ifndef _di_fl_type_int64ss_delete_ - f_return_status fl_type_int64ss_delete(f_int64ss_t *int64ss) { + f_status_t 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_ @@ -936,7 +828,7 @@ extern "C" { #endif // _di_fl_type_int64ss_delete_ #ifndef _di_fl_int64ss_increase_ - f_return_status fl_int64ss_increase(f_int64ss_t *int64ss) { + f_status_t 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_ @@ -960,7 +852,7 @@ extern "C" { #endif // _di_fl_int64ss_increase_ #ifndef _di_fl_int64ss_increase_by_ - f_return_status fl_int64ss_increase_by(const f_array_length_t amount, f_int64ss_t *int64ss) { + f_status_t 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_ @@ -978,61 +870,49 @@ extern "C" { #endif // _di_fl_int64ss_increase_by_ #ifndef _di_fl_type_uint64s_delete_ - f_return_status fl_type_uint64s_delete(f_uint64s_t *uint64s) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_uint64s_t_delete(status, (*uint64s)); + + return status; } #endif // _di_fl_type_uint64s_delete_ #ifndef _di_fl_uint64s_increase_ - f_return_status fl_uint64s_increase(f_uint64s_t *uint64s) { + f_status_t 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; - - if (size > f_array_length_t_size) { - if (uint64s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_status_t status = F_none; - private_fl_type_uint64s_resize(size, uint64s); - } + f_macro_uint64s_t_increase(status, (*uint64s)); - return F_none; + return status; } #endif // _di_fl_uint64s_increase_ #ifndef _di_fl_uint64s_increase_by_ - f_return_status fl_uint64s_increase_by(const f_array_length_t amount, f_uint64s_t *uint64s) { + f_status_t 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; - private_fl_type_uint64s_resize(uint64s->used + amount, uint64s); - } + f_macro_uint64s_t_increase_by(status, (*uint64s), amount); - return F_none; + return status; } #endif // _di_fl_uint64s_increase_by_ #ifndef _di_fl_type_uint64ss_delete_ - f_return_status fl_type_uint64ss_delete(f_uint64ss_t *uint64ss) { + f_status_t 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_ @@ -1044,7 +924,7 @@ extern "C" { #endif // _di_fl_type_uint64ss_delete_ #ifndef _di_fl_uint64ss_increase_ - f_return_status fl_uint64ss_increase(f_uint64ss_t *uint64ss) { + f_status_t 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_ @@ -1068,7 +948,7 @@ extern "C" { #endif // _di_fl_uint64ss_increase_ #ifndef _di_fl_uint64ss_increase_by_ - f_return_status fl_uint64ss_increase_by(const f_array_length_t amount, f_uint64ss_t *uint64ss) { + f_status_t 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_ @@ -1086,61 +966,49 @@ extern "C" { #endif // _di_fl_uint64ss_increase_by_ #ifndef _di_fl_type_int128s_delete_ - f_return_status fl_type_int128s_delete(f_int128s_t *int128s) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_int128s_t_delete(status, (*int128s)); + + return status; } #endif // _di_fl_type_int128s_delete_ #ifndef _di_fl_type_int128s_increase_ - f_return_status fl_type_int128s_increase(f_int128s_t *int128s) { + f_status_t 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; + f_status_t status = F_none; - if (size > f_array_length_t_size) { - if (int128s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_macro_int128s_t_increase(status, (*int128s)); - private_fl_type_int128s_resize(size, int128s); - } - - return F_none; + return status; } #endif // _di_fl_type_int128s_increase_ #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) { + f_status_t 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; - private_fl_type_int128s_resize(int128s->used + amount, int128s); - } + f_macro_int128s_t_increase_by(status, (*int128s), amount); - return F_none; + return status; } #endif // _di_fl_type_int128s_increase_by_ #ifndef _di_fl_type_int128ss_delete_ - f_return_status fl_type_int128ss_delete(f_int128ss_t *int128ss) { + f_status_t 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_ @@ -1152,7 +1020,7 @@ extern "C" { #endif // _di_fl_type_int128ss_delete_ #ifndef _di_fl_type_int128ss_increase_ - f_return_status fl_type_int128ss_increase(f_int128ss_t *int128ss) { + f_status_t 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_ @@ -1176,7 +1044,7 @@ extern "C" { #endif // _di_fl_type_int128ss_increase_ #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) { + f_status_t 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_ @@ -1196,61 +1064,49 @@ extern "C" { #endif // _di_fl_type_int128ss_increase_by_ #ifndef _di_fl_type_uint128s_delete_ - f_return_status fl_type_uint128s_delete(f_uint128s_t *uint128s) { + f_status_t 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); + f_status_t status = F_none; - return F_none; + f_macro_uint128s_t_delete(status, (*uint128s)); + + return status; } #endif // _di_fl_type_uint128s_delete_ #ifndef _di_fl_type_uint128s_increase_ - f_return_status fl_type_uint128s_increase(f_uint128s_t *uint128s) { + f_status_t 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; - - if (size > f_array_length_t_size) { - if (uint128s->used + 1 > f_array_length_t_size) { - return F_status_set_error(F_array_too_large); - } - - size = f_array_length_t_size; - } + f_status_t status = F_none; - private_fl_type_uint128s_resize(size, uint128s); - } + f_macro_uint128s_t_increase(status, (*uint128s)); - return F_none; + return status; } #endif // _di_fl_type_uint128s_increase_ #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) { + f_status_t 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; - private_fl_type_uint128s_resize(uint128s->used + amount, uint128s); - } + f_macro_uint128s_t_increase_by(status, (*uint128s), amount); - return F_none; + return status; } #endif // _di_fl_type_uint128s_increase_by_ #ifndef _di_fl_type_uint128ss_delete_ - f_return_status fl_type_uint128ss_delete(f_uint128ss_t *uint128ss) { + f_status_t 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_ @@ -1262,7 +1118,7 @@ extern "C" { #endif // _di_fl_type_uint128ss_delete_ #ifndef _di_fl_type_uint128ss_increase_ - f_return_status fl_type_uint128ss_increase(f_uint128ss_t *uint128ss) { + f_status_t 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_ @@ -1286,7 +1142,7 @@ extern "C" { #endif // _di_fl_type_uint128ss_increase_ #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) { + f_status_t 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_ diff --git a/level_1/fl_type/c/type.h b/level_1/fl_type/c/type.h index 085906f..4440a56 100644 --- a/level_1/fl_type/c/type.h +++ b/level_1/fl_type/c/type.h @@ -35,7 +35,7 @@ extern "C" { * @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); + extern f_status_t fl_type_cells_delete(f_cells_t *cells); #endif // _di_fl_type_cells_delete_ /** @@ -51,7 +51,7 @@ extern "C" { * 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); + extern f_status_t fl_type_cells_increase(f_cells_t *cells); #endif // _di_fl_type_cells_increase_ /** @@ -69,7 +69,7 @@ extern "C" { * 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); + extern f_status_t fl_type_cells_increase_by(const f_array_length_t amount, f_cells_t *cells); #endif // _di_fl_type_cells_increase_by_ /** @@ -85,7 +85,7 @@ extern "C" { * @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); + extern f_status_t fl_type_cellss_delete(f_cellss_t *cellss); #endif // _di_fl_type_cellss_delete_ /** @@ -101,7 +101,7 @@ extern "C" { * 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); + extern f_status_t fl_type_cellss_increase(f_cellss_t *cellss); #endif // _di_fl_type_cellss_increase_ /** @@ -119,7 +119,7 @@ extern "C" { * 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); + extern f_status_t fl_type_cellss_increase_by(const f_array_length_t amount, f_cellss_t *cellss); #endif // _di_fl_type_cellss_increase_by_ /** @@ -135,7 +135,7 @@ extern "C" { * @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); + extern f_status_t fl_type_array_lengths_delete(f_array_lengths_t *array_lengths); #endif // _di_fl_type_array_lengths_delete_ /** @@ -151,7 +151,7 @@ extern "C" { * 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); + extern f_status_t fl_type_array_lengths_increase(f_array_lengths_t *array_lengths); #endif // _di_fl_type_array_lengths_increase_ /** @@ -169,7 +169,7 @@ extern "C" { * 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); + extern f_status_t 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_ /** @@ -185,7 +185,7 @@ extern "C" { * @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); + extern f_status_t fl_type_array_lengthss_delete(f_array_lengthss_t *array_lengthss); #endif // _di_fl_type_array_lengthss_delete_ /** @@ -201,7 +201,7 @@ extern "C" { * 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); + extern f_status_t fl_type_array_lengthss_increase(f_array_lengthss_t *array_lengthss); #endif // _di_fl_type_array_lengthss_increase_ /** @@ -219,7 +219,7 @@ extern "C" { * 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); + extern f_status_t 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_ /** @@ -235,7 +235,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int8s_delete(f_int8s_t *int8s); #endif // _di_fl_type_int8s_delete_ /** @@ -251,7 +251,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int8s_increase(f_int8s_t *int8s); #endif // _di_fl_type_int8s_increase_ /** @@ -269,7 +269,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int8s_increase_by(const f_array_length_t amount, f_int8s_t *int8s); #endif // _di_fl_type_int8s_increase_by_ /** @@ -285,7 +285,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int8ss_delete(f_int8ss_t *int8ss); #endif // _di_fl_type_int8ss_delete_ /** @@ -301,7 +301,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int8ss_increase(f_int8ss_t *int8ss); #endif // _di_fl_type_int8ss_increase_ /** @@ -319,7 +319,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int8ss_increase_by(const f_array_length_t amount, f_int8ss_t *int8ss); #endif // _di_fl_type_int8ss_increase_by_ /** @@ -335,7 +335,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint8s_delete(f_uint8s_t *uint8s); #endif // _di_fl_type_uint8s_delete_ /** @@ -351,7 +351,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint8s_increase(f_uint8s_t *uint8s); #endif // _di_fl_type_uint8s_increase_ /** @@ -369,7 +369,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint8s_increase_by(const f_array_length_t amount, f_uint8s_t *uint8s); #endif // _di_fl_type_uint8s_increase_by_ /** @@ -385,7 +385,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint8ss_delete(f_uint8ss_t *uint8ss); #endif // _di_fl_type_uint8ss_delete_ /** @@ -401,7 +401,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint8ss_increase(f_uint8ss_t *uint8ss); #endif // _di_fl_type_uint8ss_increase_ /** @@ -419,7 +419,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint8ss_increase_by(const f_array_length_t amount, f_uint8ss_t *uint8ss); #endif // _di_fl_type_uint8ss_increase_by_ /** @@ -435,7 +435,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int16s_delete(f_int16s_t *int16s); #endif // _di_fl_type_int16s_delete_ /** @@ -451,7 +451,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int16s_increase(f_int16s_t *int16s); #endif // _di_fl_type_int16s_increase_ /** @@ -469,7 +469,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int16s_increase_by(const f_array_length_t amount, f_int16s_t *int16s); #endif // _di_fl_type_int16s_increase_by_ /** @@ -485,7 +485,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int16ss_delete(f_int16ss_t *int16ss); #endif // _di_fl_type_int16ss_delete_ /** @@ -501,7 +501,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int16ss_increase(f_int16ss_t *int16ss); #endif // _di_fl_type_int16ss_increase_ /** @@ -519,7 +519,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int16ss_increase_by(const f_array_length_t amount, f_int16ss_t *int16ss); #endif // _di_fl_type_int16ss_increase_by_ /** @@ -535,7 +535,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint16s_delete(f_uint16s_t *uint16s); #endif // _di_fl_type_uint16s_delete_ /** @@ -551,7 +551,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint16s_increase(f_uint16s_t *uint16s); #endif // _di_fl_type_uint16s_increase_ /** @@ -569,7 +569,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint16s_increase_by(const f_array_length_t amount, f_uint16s_t *uint16s); #endif // _di_fl_type_uint16s_increase_by_ /** @@ -585,7 +585,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint16ss_delete(f_uint16ss_t *uint16ss); #endif // _di_fl_type_uint16ss_delete_ /** @@ -601,7 +601,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint16ss_increase(f_uint16ss_t *uint16ss); #endif // _di_fl_type_uint16ss_increase_ /** @@ -619,7 +619,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint16ss_increase_by(const f_array_length_t amount, f_uint16ss_t *uint16ss); #endif // _di_fl_type_uint16ss_increase_by_ /** @@ -635,7 +635,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int32s_delete(f_int32s_t *int32s); #endif // _di_fl_type_int32s_delete_ /** @@ -651,7 +651,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int32s_increase(f_int32s_t *int32s); #endif // _di_fl_type_int32s_increase_ /** @@ -669,7 +669,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int32s_increase_by(const f_array_length_t amount, f_int32s_t *int32s); #endif // _di_fl_type_int32s_increase_by_ /** @@ -685,7 +685,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int32ss_delete(f_int32ss_t *int32ss); #endif // _di_fl_type_int32ss_delete_ /** @@ -701,7 +701,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int32ss_increase(f_int32ss_t *int32ss); #endif // _di_fl_type_int32ss_increase_ /** @@ -719,7 +719,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int32ss_increase_by(const f_array_length_t amount, f_int32ss_t *int32ss); #endif // _di_fl_type_int32ss_increase_by_ /** @@ -735,7 +735,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint32s_delete(f_uint32s_t *uint32s); #endif // _di_fl_type_uint32s_delete_ /** @@ -751,7 +751,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint32s_increase(f_uint32s_t *uint32s); #endif // _di_fl_type_uint32s_increase_ /** @@ -769,7 +769,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint32s_increase_by(const f_array_length_t amount, f_uint32s_t *uint32s); #endif // _di_fl_type_uint32s_increase_by_ /** @@ -785,7 +785,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint32ss_delete(f_uint32ss_t *uint32ss); #endif // _di_fl_type_uint32ss_delete_ /** @@ -801,7 +801,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint32ss_increase(f_uint32ss_t *uint32ss); #endif // _di_fl_type_uint32ss_increase_ /** @@ -819,7 +819,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint32ss_increase_by(const f_array_length_t amount, f_uint32ss_t *uint32ss); #endif // _di_fl_type_uint32ss_increase_by_ /** @@ -835,7 +835,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int64s_delete(f_int64s_t *int64s); #endif // _di_fl_type_int64s_delete_ /** @@ -851,7 +851,7 @@ extern "C" { * 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); + extern f_status_t fl_int64s_increase(f_int64s_t *int64s); #endif // _di_fl_int64s_increase_ /** @@ -869,7 +869,7 @@ extern "C" { * 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); + extern f_status_t fl_int64s_increase_by(const f_array_length_t amount, f_int64s_t *int64s); #endif // _di_fl_int64s_increase_by_ /** @@ -885,7 +885,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int64ss_delete(f_int64ss_t *int64ss); #endif // _di_fl_type_int64ss_delete_ /** @@ -901,7 +901,7 @@ extern "C" { * 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); + extern f_status_t fl_int64ss_increase(f_int64ss_t *int64ss); #endif // _di_fl_int64ss_increase_ /** @@ -919,7 +919,7 @@ extern "C" { * 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); + extern f_status_t fl_int64ss_increase_by(const f_array_length_t amount, f_int64ss_t *int64ss); #endif // _di_fl_int64ss_increase_by_ /** @@ -935,7 +935,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint64s_delete(f_uint64s_t *uint64s); #endif // _di_fl_type_uint64s_delete_ /** @@ -951,7 +951,7 @@ extern "C" { * 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); + extern f_status_t fl_uint64s_increase(f_uint64s_t *uint64s); #endif // _di_fl_uint64s_increase_ /** @@ -969,7 +969,7 @@ extern "C" { * 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); + extern f_status_t fl_uint64s_increase_by(const f_array_length_t amount, f_uint64s_t *uint64s); #endif // _di_fl_uint64s_increase_by_ /** @@ -985,7 +985,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint64ss_delete(f_uint64ss_t *uint64ss); #endif // _di_fl_type_uint64ss_delete_ /** @@ -1001,7 +1001,7 @@ extern "C" { * 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); + extern f_status_t fl_uint64ss_increase(f_uint64ss_t *uint64ss); #endif // _di_fl_uint64ss_increase_ /** @@ -1019,7 +1019,7 @@ extern "C" { * 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); + extern f_status_t fl_uint64ss_increase_by(const f_array_length_t amount, f_uint64ss_t *uint64ss); #endif // _di_fl_uint64ss_increase_by_ /** @@ -1035,7 +1035,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int128s_delete(f_int128s_t *int128s); #endif // _di_fl_type_int128s_delete_ /** @@ -1051,7 +1051,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int128s_increase(f_int128s_t *int128s); #endif // _di_fl_type_int128s_increase_ /** @@ -1069,7 +1069,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int128s_increase_by(const f_array_length_t amount, f_int128s_t *int128s); #endif // _di_fl_type_int128s_increase_by_ /** @@ -1085,7 +1085,7 @@ extern "C" { * @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); + extern f_status_t fl_type_int128ss_delete(f_int128ss_t *int128ss); #endif // _di_fl_type_int128ss_delete_ /** @@ -1101,7 +1101,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int128ss_increase(f_int128ss_t *int128ss); #endif // _di_fl_type_int128ss_increase_ /** @@ -1119,7 +1119,7 @@ extern "C" { * 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); + extern f_status_t fl_type_int128ss_increase_by(const f_array_length_t amount, f_int128ss_t *int128ss); #endif // _di_fl_type_int128ss_increase_by_ /** @@ -1135,7 +1135,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint128s_delete(f_uint128s_t *uint128s); #endif // _di_fl_type_uint128s_delete_ /** @@ -1151,7 +1151,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint128s_increase(f_uint128s_t *uint128s); #endif // _di_fl_type_uint128s_increase_ /** @@ -1169,7 +1169,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint128s_increase_by(const f_array_length_t amount, f_uint128s_t *uint128s); #endif // _di_fl_type_uint128s_increase_by_ /** @@ -1185,7 +1185,7 @@ extern "C" { * @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); + extern f_status_t fl_type_uint128ss_delete(f_uint128ss_t *uint128ss); #endif // _di_fl_type_uint128ss_delete_ /** @@ -1201,7 +1201,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint128ss_increase(f_uint128ss_t *uint128ss); #endif // _di_fl_type_uint128ss_increase_ /** @@ -1219,7 +1219,7 @@ extern "C" { * 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); + extern f_status_t fl_type_uint128ss_increase_by(const f_array_length_t amount, f_uint128ss_t *uint128ss); #endif // _di_fl_type_uint128ss_increase_by_ #ifdef __cplusplus diff --git a/level_1/fl_utf/c/private-utf.c b/level_1/fl_utf/c/private-utf.c index fb1b68f..912f926 100644 --- a/level_1/fl_utf/c/private-utf.c +++ b/level_1/fl_utf/c/private-utf.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fl_utf_string_append_) || !defined(_di_fl_utf_string_dynamic_append_) || !defined(_di_fl_utf_string_append_mash_) || !defined(_di_fl_utf_string_dynamic_mash_) - f_return_status private_fl_utf_string_append(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t private_fl_utf_string_append(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { if (destination->used + length > f_utf_string_t_size_max) return F_status_set_error(F_string_too_large); @@ -27,7 +27,7 @@ extern "C" { #endif // !defined(_di_fl_utf_string_append_) || !defined(_di_fl_utf_string_dynamic_append_) || !defined(_di_fl_utf_string_append_mash_) || !defined(_di_fl_utf_string_dynamic_mash_) #if !defined(_di_fl_utf_string_append_nulless_) || !defined(_di_fl_utf_string_dynamic_append_nulless_) || !defined(_di_fl_utf_string_mash_nulless_) || !defined(_di_fl_utf_string_dynamic_mash_nulless_) - f_return_status private_fl_utf_string_append_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t private_fl_utf_string_append_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { if (destination->used + length > f_utf_string_t_size_max) return F_status_set_error(F_string_too_large); @@ -94,7 +94,7 @@ extern "C" { #endif // !defined(_di_fl_utf_string_append_nulless_) || !defined(_di_fl_utf_string_dynamic_append_nulless_) || !defined(_di_fl_utf_string_mash_nulless_) || !defined(_di_fl_utf_string_dynamic_mash_nulless_) #if !defined(_di_fl_utf_string_compare_) || !defined(_di_fl_utf_string_dynamic_compare_) || !defined(_di_fl_utf_string_dynamic_partial_compare_) - f_return_status private_fl_utf_string_compare(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t offset1, const f_utf_string_length_t offset2, const f_utf_string_length_t stop1, const f_utf_string_length_t stop2) { + f_status_t private_fl_utf_string_compare(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t offset1, const f_utf_string_length_t offset2, const f_utf_string_length_t stop1, const f_utf_string_length_t stop2) { f_utf_string_length_t i1 = offset1; f_utf_string_length_t i2 = offset2; @@ -125,7 +125,7 @@ extern "C" { #endif // !defined(_di_fl_utf_string_compare_) || !defined(_di_fl_utf_string_dynamic_compare_) || !defined(_di_fl_utf_string_dynamic_partial_compare_) #if !defined(_di_fl_utf_string_compare_trim_) || !defined(_di_fl_utf_string_dynamic_compare_trim_) || !defined(_di_fl_utf_string_dynamic_partial_compare_trim_) - f_return_status private_fl_utf_string_compare_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t offset1, const f_utf_string_length_t offset2, const f_utf_string_length_t stop1, const f_utf_string_length_t stop2) { + f_status_t private_fl_utf_string_compare_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t offset1, const f_utf_string_length_t offset2, const f_utf_string_length_t stop1, const f_utf_string_length_t stop2) { f_utf_string_length_t i1 = offset1; f_utf_string_length_t i2 = offset2; @@ -251,7 +251,7 @@ extern "C" { #endif // !defined(_di_fl_utf_string_compare_trim_) || !defined(_di_fl_utf_string_dynamic_compare_trim_) || !defined(_di_fl_utf_string_dynamic_partial_compare_trim_) #if !defined(_di_fl_utf_string_prepend_) || !defined(_di_fl_utf_string_dynamic_prepend_) - f_return_status private_fl_utf_string_prepend(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t private_fl_utf_string_prepend(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { if (destination->used + length > f_utf_string_t_size_max) { return F_status_set_error(F_string_too_large); @@ -280,7 +280,7 @@ extern "C" { #endif // !defined(_di_fl_utf_string_prepend_) || !defined(_di_fl_utf_string_dynamic_prepend_) #if !defined(_di_fl_utf_string_prepend_nulless_) || !defined(_di_fl_utf_string_dynamic_prepend_nulless_) - f_return_status private_fl_utf_string_prepend_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t private_fl_utf_string_prepend_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { if (destination->used + length > f_utf_string_t_size_max) { return F_status_set_error(F_string_too_large); @@ -357,7 +357,7 @@ extern "C" { #endif // !defined(_di_fl_utf_string_prepend_nulless_) || !defined(_di_fl_utf_string_dynamic_prepend_nulless_) #if !defined(_di_fl_utf_string_rip_) || !defined(_di_fl_utf_string_dynamic_rip_) || !defined(_di_fl_utf_string_rip_nulless_) || !defined(_di_fl_utf_string_dynamic_rip_nulless_) - f_return_status private_fl_utf_string_rip_find_range(const f_utf_string_t source, f_utf_string_length_t *start, f_utf_string_length_t *stop) { + f_status_t private_fl_utf_string_rip_find_range(const f_utf_string_t source, f_utf_string_length_t *start, f_utf_string_length_t *stop) { f_status_t status = F_none; diff --git a/level_1/fl_utf/c/private-utf.h b/level_1/fl_utf/c/private-utf.h index 579bc1a..cfcc4a2 100644 --- a/level_1/fl_utf/c/private-utf.h +++ b/level_1/fl_utf/c/private-utf.h @@ -41,7 +41,7 @@ extern "C" { * @see fl_utf_string_dynamic_mash() */ #if !defined(_di_fl_utf_string_append_) || !defined(_di_fl_utf_string_dynamic_append_) || !defined(_di_fl_utf_string_append_mash_) || !defined(_di_fl_utf_string_dynamic_mash_) - extern f_return_status private_fl_utf_string_append(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_utf_string_append(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_utf_string_append_) || !defined(_di_fl_utf_string_dynamic_append_) || !defined(_di_fl_utf_string_append_mash_) || !defined(_di_fl_utf_string_dynamic_mash_) /** @@ -70,7 +70,7 @@ extern "C" { * @see fl_utf_string_dynamic_mash_nulless() */ #if !defined(_di_fl_utf_string_append_nulless_) || !defined(_di_fl_utf_string_dynamic_append_nulless_) || !defined(_di_fl_utf_string_mash_nulless_) || !defined(_di_fl_utf_string_dynamic_mash_nulless_) - extern f_return_status private_fl_utf_string_append_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_utf_string_append_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_utf_string_append_nulless_) || !defined(_di_fl_utf_string_dynamic_append_nulless_) || !defined(_di_fl_utf_string_mash_nulless_) || !defined(_di_fl_utf_string_dynamic_mash_nulless_) /** @@ -101,7 +101,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_compare() */ #if !defined(_di_fl_utf_string_compare_) || !defined(_di_fl_utf_string_dynamic_compare_) || !defined(_di_fl_utf_string_dynamic_partial_compare_) - extern f_return_status private_fl_utf_string_compare(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t offset1, const f_utf_string_length_t offset2, const f_utf_string_length_t stop1, const f_utf_string_length_t stop2) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_utf_string_compare(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t offset1, const f_utf_string_length_t offset2, const f_utf_string_length_t stop1, const f_utf_string_length_t stop2) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_utf_string_compare_) || !defined(_di_fl_utf_string_dynamic_compare_) || !defined(_di_fl_utf_string_dynamic_partial_compare_) /** @@ -132,7 +132,7 @@ extern "C" { * @see fl_utf_string_dynamic_partial_compare_trim() */ #if !defined(_di_fl_utf_string_compare_trim_) || !defined(_di_fl_utf_string_dynamic_compare_trim_) || !defined(_di_fl_utf_string_dynamic_partial_compare_trim_) - extern f_return_status private_fl_utf_string_compare_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t offset1, const f_utf_string_length_t offset2, const f_utf_string_length_t stop1, const f_utf_string_length_t stop2) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_utf_string_compare_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t offset1, const f_utf_string_length_t offset2, const f_utf_string_length_t stop1, const f_utf_string_length_t stop2) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_utf_string_compare_trim_) || !defined(_di_fl_utf_string_dynamic_compare_trim_) || !defined(_di_fl_utf_string_dynamic_partial_compare_trim_) /** @@ -158,7 +158,7 @@ extern "C" { * @see fl_utf_string_dynamic_prepend() */ #if !defined(_di_fl_utf_string_prepend_) || !defined(_di_fl_utf_string_dynamic_prepend_) || !defined(_di_fl_utf_string_append_mish_) || !defined(_di_fl_utf_string_dynamic_mish_) - extern f_return_status private_fl_utf_string_prepend(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_utf_string_prepend(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_utf_string_prepend_) || !defined(_di_fl_utf_string_dynamic_prepend_) || !defined(_di_fl_utf_string_append_mish_) || !defined(_di_fl_utf_string_dynamic_mish_) /** @@ -184,7 +184,7 @@ extern "C" { * @see fl_utf_string_dynamic_prepend_nulless() */ #if !defined(_di_fl_utf_string_prepend_nulless_) || !defined(_di_fl_utf_string_dynamic_prepend_nulless_) || !defined(_di_fl_utf_string_append_mish_) || !defined(_di_fl_utf_string_dynamic_mish_) - extern f_return_status private_fl_utf_string_prepend_nulless(const f_utf_string_t source, f_utf_string_length_t length, f_utf_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_utf_string_prepend_nulless(const f_utf_string_t source, f_utf_string_length_t length, f_utf_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_utf_string_prepend_nulless_) || !defined(_di_fl_utf_string_dynamic_prepend_nulless_) || !defined(_di_fl_utf_string_append_mish_) || !defined(_di_fl_utf_string_dynamic_mish_) /** @@ -212,7 +212,7 @@ extern "C" { * @see fl_utf_string_rip() */ #if !defined(_di_fl_utf_string_rip_) || !defined(_di_fl_utf_string_dynamic_rip_) || !defined(_di_fl_utf_string_rip_nulless_) || !defined(_di_fl_utf_string_dynamic_rip_nulless_) - extern f_return_status private_fl_utf_string_rip_find_range(const f_utf_string_t source, f_utf_string_length_t *start, f_utf_string_length_t *stop) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_utf_string_rip_find_range(const f_utf_string_t source, f_utf_string_length_t *start, f_utf_string_length_t *stop) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_utf_string_rip_) || !defined(_di_fl_utf_string_dynamic_rip_) || !defined(_di_fl_utf_string_rip_nulless_) || !defined(_di_fl_utf_string_dynamic_rip_nulless_) #ifdef __cplusplus diff --git a/level_1/fl_utf/c/utf.c b/level_1/fl_utf/c/utf.c index 7f75bad..dc09db0 100644 --- a/level_1/fl_utf/c/utf.c +++ b/level_1/fl_utf/c/utf.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_utf_string_append_ - f_return_status fl_utf_string_append(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_append(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -18,7 +18,7 @@ extern "C" { #endif // _di_fl_utf_string_append_ #ifndef _di_fl_utf_string_append_assure_ - f_return_status fl_utf_string_append_assure(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_append_assure(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -57,7 +57,7 @@ extern "C" { #endif // _di_fl_utf_string_append_assure_ #ifndef _di_fl_utf_string_append_assure_nulless_ - f_return_status fl_utf_string_append_assure_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_append_assure_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -96,7 +96,7 @@ extern "C" { #endif // _di_fl_utf_string_append_assure_nulless_ #ifndef _di_fl_utf_string_append_nulless_ - f_return_status fl_utf_string_append_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_append_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -108,19 +108,19 @@ extern "C" { #endif // _di_fl_utf_string_append_nulless_ #ifndef _di_fl_utf_string_compare_ - f_return_status fl_utf_string_compare(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t length1, const f_utf_string_length_t length2) { + f_status_t fl_utf_string_compare(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t length1, const f_utf_string_length_t length2) { return private_fl_utf_string_compare(string1, string2, 0, 0, length1, length2); } #endif // _di_fl_utf_string_compare_ #ifndef _di_fl_utf_string_compare_trim_ - f_return_status fl_utf_string_compare_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t length1, const f_utf_string_length_t length2) { + f_status_t fl_utf_string_compare_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t length1, const f_utf_string_length_t length2) { return private_fl_utf_string_compare_trim(string1, string2, 0, 0, length1, length2); } #endif // _di_fl_utf_string_compare_trim_ #ifndef _di_fl_utf_string_dynamic_append_ - f_return_status fl_utf_string_dynamic_append(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_append(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -132,7 +132,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_append_ #ifndef _di_fl_utf_string_dynamic_append_assure_ - f_return_status fl_utf_string_dynamic_append_assure(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_append_assure(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -171,7 +171,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_append_assure_ #ifndef _di_fl_utf_string_dynamic_append_assure_nulless_ - f_return_status fl_utf_string_dynamic_append_assure_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_append_assure_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -210,7 +210,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_append_assure_nulless_ #ifndef _di_fl_utf_string_dynamic_append_nulless_ - f_return_status fl_utf_string_dynamic_append_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_append_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -222,19 +222,19 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_append_nulless_ #ifndef _di_fl_utf_string_dynamic_compare_ - f_return_status fl_utf_string_dynamic_compare(const f_utf_string_static_t string1, const f_utf_string_static_t string2) { + f_status_t fl_utf_string_dynamic_compare(const f_utf_string_static_t string1, const f_utf_string_static_t string2) { return private_fl_utf_string_compare(string1.string, string2.string, 0, 0, string1.used, string2.used); } #endif // _di_fl_utf_string_dynamic_compare_ #ifndef _di_f_utf_string_dynamic_compare_trim_ - f_return_status f_utf_string_dynamic_compare_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2) { + f_status_t f_utf_string_dynamic_compare_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2) { return private_fl_utf_string_compare_trim(string1.string, string2.string, 0, 0, string1.used, string2.used); } #endif // _di_f_utf_string_dynamic_compare_trim_ #ifndef _di_fl_utf_string_dynamic_mash_ - f_return_status fl_utf_string_dynamic_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -251,7 +251,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_mash_ #ifndef _di_fl_utf_string_dynamic_mash_nulless_ - f_return_status fl_utf_string_dynamic_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -268,7 +268,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_mash_nulless_ #ifndef _di_fl_utf_string_dynamic_mish_ - f_return_status fl_utf_string_dynamic_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -285,7 +285,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_mish_ #ifndef _di_fl_utf_string_dynamic_mish_nulless_ - f_return_status fl_utf_string_dynamic_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -302,7 +302,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_mish_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_append_ - f_return_status fl_utf_string_dynamic_partial_append(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_append(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -316,7 +316,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_append_ #ifndef _di_fl_utf_string_dynamic_partial_append_assure_ - f_return_status fl_utf_string_dynamic_partial_append_assure(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_append_assure(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -357,7 +357,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_append_assure_ #ifndef _di_fl_utf_string_dynamic_partial_append_assure_nulless_ - f_return_status fl_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -398,7 +398,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_append_assure_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_append_nulless_ - f_return_status fl_utf_string_dynamic_partial_append_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_append_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -412,7 +412,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_append_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_compare_ - f_return_status fl_utf_string_dynamic_partial_compare(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_utf_string_range_t range1, const f_utf_string_range_t range2) { + f_status_t fl_utf_string_dynamic_partial_compare(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_utf_string_range_t range1, const f_utf_string_range_t range2) { #ifndef _di_level_1_parameter_checking_ if (string1.used <= range1.stop) return F_status_set_error(F_parameter); if (string2.used <= range2.stop) return F_status_set_error(F_parameter); @@ -423,7 +423,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_compare_ #ifndef _di_fl_utf_string_dynamic_partial_compare_trim_ - f_return_status fl_utf_string_dynamic_partial_comparetrim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_utf_string_range_t range1, const f_utf_string_range_t range2) { + f_status_t fl_utf_string_dynamic_partial_comparetrim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_utf_string_range_t range1, const f_utf_string_range_t range2) { #ifndef _di_level_1_parameter_checking_ if (string1.used <= range1.stop) return F_status_set_error(F_parameter); if (string2.used <= range2.stop) return F_status_set_error(F_parameter); @@ -434,7 +434,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_compare_trim_ #ifndef _di_fl_utf_string_dynamic_partial_mash_ - f_return_status fl_utf_string_dynamic_partial_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -453,7 +453,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_mash_ #ifndef _di_fl_utf_string_dynamic_partial_mash_nulless_ - f_return_status fl_utf_string_dynamic_partial_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -472,7 +472,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_mash_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_mish_ - f_return_status fl_utf_string_dynamic_partial_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -491,7 +491,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_mish_ #ifndef _di_fl_utf_string_dynamic_partial_mish_nulless_ - f_return_status fl_utf_string_dynamic_partial_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -510,7 +510,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_mish_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_prepend_ - f_return_status fl_utf_string_dynamic_partial_prepend(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_prepend(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -524,7 +524,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_prepend_ #ifndef _di_fl_utf_string_dynamic_partial_prepend_assure_ - f_return_status fl_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -567,7 +567,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_prepend_assure_ #ifndef _di_fl_utf_string_dynamic_partial_prepend_assure_nulless_ - f_return_status fl_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -610,7 +610,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_prepend_assure_nulless_ #ifndef _di_fl_utf_string_dynamic_partial_prepend_nulless_ - f_return_status fl_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.stop) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -624,7 +624,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_partial_prepend_nulless_ #ifndef _di_fl_utf_string_dynamic_prepend_ - f_return_status fl_utf_string_dynamic_prepend(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_prepend(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -636,7 +636,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_prepend_ #ifndef _di_fl_utf_string_dynamic_prepend_assure_ - f_return_status fl_utf_string_dynamic_prepend_assure(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_prepend_assure(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -675,7 +675,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_prepend_assure_ #ifndef _di_fl_utf_string_dynamic_prepend_assure_nulless_ - f_return_status fl_utf_string_dynamic_prepend_assure_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_prepend_assure_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -714,7 +714,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_prepend_assure_nulless_ #ifndef _di_fl_utf_string_dynamic_prepend_nulless_ - f_return_status fl_utf_string_dynamic_prepend_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_prepend_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -726,7 +726,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_prepend_nulless_ #ifndef _di_fl_utf_string_dynamic_rip_ - f_return_status fl_utf_string_dynamic_rip(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_rip(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.start) return F_status_set_error(F_parameter); if (source.used <= range.stop) return F_status_set_error(F_parameter); @@ -741,7 +741,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_rip_ #ifndef _di_fl_utf_string_dynamic_rip_nulless_ - f_return_status fl_utf_string_dynamic_rip_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_rip_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (source.used <= range.start) return F_status_set_error(F_parameter); if (source.used <= range.stop) return F_status_set_error(F_parameter); @@ -756,7 +756,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_rip_nulless_ #ifndef _di_fl_utf_string_dynamic_seek_line_to_ - f_return_status fl_utf_string_dynamic_seek_line_to(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this) { + f_status_t fl_utf_string_dynamic_seek_line_to(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -789,7 +789,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_line_to_ #ifndef _di_fl_utf_string_dynamic_seek_line_to_char_ - f_return_status fl_utf_string_dynamic_seek_line_to_char(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const int8_t seek_to_this) { + f_status_t fl_utf_string_dynamic_seek_line_to_char(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const int8_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -826,7 +826,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_line_to_character_ #ifndef _di_fl_utf_string_dynamic_seek_line_until_graph_ - f_return_status fl_utf_string_dynamic_seek_line_until_graph(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t placeholder) { + f_status_t fl_utf_string_dynamic_seek_line_until_graph(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t placeholder) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -864,7 +864,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_line_until_graph_ #ifndef _di_fl_utf_string_dynamic_seek_line_until_non_graph_ - f_return_status fl_utf_string_dynamic_seek_line_until_non_graph(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t placeholder) { + f_status_t fl_utf_string_dynamic_seek_line_until_non_graph(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t placeholder) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -902,7 +902,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_line_until_non_graph_ #ifndef _di_fl_utf_string_dynamic_seek_to_ - f_return_status fl_utf_string_dynamic_seek_to(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this) { + f_status_t fl_utf_string_dynamic_seek_to(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -932,7 +932,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_to_ #ifndef _di_fl_utf_string_dynamic_seek_to_char_ - f_return_status fl_utf_string_dynamic_seek_to_char(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const int8_t seek_to_this) { + f_status_t fl_utf_string_dynamic_seek_to_char(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const int8_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (buffer.used <= range->start) return F_status_set_error(F_parameter); @@ -964,7 +964,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_seek_to_char_ #ifndef _di_fl_utf_string_dynamic_terminate_ - f_return_status fl_utf_string_dynamic_terminate(f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_terminate(f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); if (destination->used > destination->size) return F_status_set_error(F_parameter); @@ -995,7 +995,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_terminate_ #ifndef _di_fl_utf_string_dynamic_terminate_after_ - f_return_status fl_utf_string_dynamic_terminate_after(f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_dynamic_terminate_after(f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); if (destination->used > destination->size) return F_status_set_error(F_parameter); @@ -1029,7 +1029,7 @@ extern "C" { #endif // _di_fl_utf_string_dynamic_terminate_after_ #ifndef _di_fl_utf_string_mash_ - f_return_status fl_utf_string_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1046,7 +1046,7 @@ extern "C" { #endif // _di_fl_utf_string_mash_ #ifndef _di_fl_utf_string_mash_nulless_ - f_return_status fl_utf_string_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1063,7 +1063,7 @@ extern "C" { #endif // _di_fl_utf_string_mash_nulless_ #ifndef _di_fl_utf_string_mish_ - f_return_status fl_utf_string_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1080,7 +1080,7 @@ extern "C" { #endif // _di_fl_utf_string_mish_ #ifndef _di_fl_utf_string_mish_nulless_ - f_return_status fl_utf_string_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1097,7 +1097,7 @@ extern "C" { #endif // _di_fl_utf_string_mish_nulless_ #ifndef _di_fl_utf_string_prepend_ - f_return_status fl_utf_string_prepend(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_prepend(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1109,7 +1109,7 @@ extern "C" { #endif // _di_fl_utf_string_prepend_ #ifndef _di_fl_utf_string_prepend_assure_ - f_return_status fl_utf_string_prepend_assure(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_prepend_assure(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1148,7 +1148,7 @@ extern "C" { #endif // _di_fl_utf_string_prepend_assure_ #ifndef _di_fl_utf_string_prepend_assure_nulless_ - f_return_status fl_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1187,7 +1187,7 @@ extern "C" { #endif // _di_fl_utf_string_prepend_assure_nulless_ #ifndef _di_fl_utf_string_prepend_nulless_ - f_return_status fl_utf_string_prepend_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_prepend_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1199,7 +1199,7 @@ extern "C" { #endif // _di_fl_utf_string_prepend_nulless_ #ifndef _di_fl_utf_string_rip_ - f_return_status fl_utf_string_rip(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_rip(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1219,7 +1219,7 @@ extern "C" { #endif // _di_fl_utf_string_rip_ #ifndef _di_fl_utf_string_rip_nulless_ - f_return_status fl_utf_string_rip_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { + f_status_t fl_utf_string_rip_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination) { #ifndef _di_level_1_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1239,7 +1239,7 @@ extern "C" { #endif // _di_fl_utf_string_rip_nulless_ #ifndef _di_fl_utf_string_seek_line_to_ - f_return_status fl_utf_string_seek_line_to(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t seek_to_this) { + f_status_t fl_utf_string_seek_line_to(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1270,7 +1270,7 @@ extern "C" { #endif // _di_fl_utf_string_seek_line_to_ #ifndef _di_fl_utf_string_seek_line_to_char_ - f_return_status fl_utf_string_seek_line_to_char(const f_utf_string_t string, f_utf_string_range_t *range, const int8_t seek_to_this) { + f_status_t fl_utf_string_seek_line_to_char(const f_utf_string_t string, f_utf_string_range_t *range, const int8_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1294,7 +1294,7 @@ extern "C" { #endif // _di_fl_utf_string_seek_line_to_char_ #ifndef _di_fl_utf_string_seek_line_until_graph_ - f_return_status fl_utf_string_seek_line_until_graph(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t placeholder) { + f_status_t fl_utf_string_seek_line_until_graph(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t placeholder) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1328,7 +1328,7 @@ extern "C" { #endif // _di_fl_utf_string_seek_line_until_graph_ #ifndef _di_fl_utf_string_seek_line_until_non_graph_ - f_return_status fl_utf_string_seek_line_until_non_graph(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t placeholder) { + f_status_t fl_utf_string_seek_line_until_non_graph(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t placeholder) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1360,7 +1360,7 @@ extern "C" { #endif // _di_fl_utf_string_seek_line_until_non_graph_ #ifndef _di_fl_utf_string_seek_to_ - f_return_status fl_utf_string_seek_to(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t seek_to_this) { + f_status_t fl_utf_string_seek_to(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ @@ -1386,7 +1386,7 @@ extern "C" { #endif // _di_fl_utf_string_seek_to_ #ifndef _di_fl_utf_string_seek_to_char_ - f_return_status fl_utf_string_seek_to_char(const f_utf_string_t string, f_utf_string_range_t *range, const int8_t seek_to_this) { + f_status_t fl_utf_string_seek_to_char(const f_utf_string_t string, f_utf_string_range_t *range, const int8_t seek_to_this) { #ifndef _di_level_1_parameter_checking_ if (!range) return F_status_set_error(F_parameter); #endif // _di_level_1_parameter_checking_ diff --git a/level_1/fl_utf/c/utf.h b/level_1/fl_utf/c/utf.h index beab328..bd1d417 100644 --- a/level_1/fl_utf/c/utf.h +++ b/level_1/fl_utf/c/utf.h @@ -53,7 +53,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_append_ - extern f_return_status fl_utf_string_append(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_append(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_append_ /** @@ -78,7 +78,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_append_assure_ - extern f_return_status fl_utf_string_append_assure(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_append_assure(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_append_assure_ /** @@ -103,7 +103,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_append_assure_nulless_ - extern f_return_status fl_utf_string_append_assure_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_append_assure_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_append_assure_nulless_ /** @@ -127,7 +127,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_append_nulless_ - extern f_return_status fl_utf_string_append_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_append_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_append_nulless_ /** @@ -151,7 +151,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_utf_string_compare_ - extern f_return_status fl_utf_string_compare(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t length1, const f_utf_string_length_t length2); + extern f_status_t fl_utf_string_compare(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t length1, const f_utf_string_length_t length2); #endif // _di_fl_utf_string_compare_ /** @@ -180,7 +180,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_fl_utf_string_compare_trim_ - extern f_return_status fl_utf_string_compare_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t length1, const f_utf_string_length_t length2); + extern f_status_t fl_utf_string_compare_trim(const f_utf_string_t string1, const f_utf_string_t string2, const f_utf_string_length_t length1, const f_utf_string_length_t length2); #endif // _di_fl_utf_string_compare_trim_ /** @@ -200,7 +200,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_append_ - extern f_return_status fl_utf_string_dynamic_append(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_append(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_append_ /** @@ -220,7 +220,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_append_assure_ - extern f_return_status fl_utf_string_dynamic_append_assure(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_append_assure(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_append_assure_ /** @@ -242,7 +242,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_append_assure_nulless_ - extern f_return_status fl_utf_string_dynamic_append_assure_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_append_assure_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_append_assure_nulless_ /** @@ -264,7 +264,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_append_nulless_ - extern f_return_status fl_utf_string_dynamic_append_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_append_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_append_nulless_ /** @@ -285,7 +285,7 @@ extern "C" { * F_utf (with error bit) if a character in the string is an invalid UTF-8 character. */ #ifndef _di_fl_utf_string_dynamic_compare_ - extern f_return_status fl_utf_string_dynamic_compare(const f_utf_string_static_t string1, const f_utf_string_static_t string2); + extern f_status_t fl_utf_string_dynamic_compare(const f_utf_string_static_t string1, const f_utf_string_static_t string2); #endif // _di_fl_utf_string_dynamic_compare_ /** @@ -311,7 +311,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_f_utf_string_dynamic_compare_trim_ - extern f_return_status f_utf_string_dynamic_compare_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2); + extern f_status_t f_utf_string_dynamic_compare_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2); #endif // _di_f_utf_string_dynamic_compare_trim_ /** @@ -337,7 +337,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_mash_ - extern f_return_status fl_utf_string_dynamic_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_mash_ /** @@ -365,7 +365,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_mash_nulless_ - extern f_return_status fl_utf_string_dynamic_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_mash_nulless_ /** @@ -391,7 +391,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_mish_ - extern f_return_status fl_utf_string_dynamic_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_mish_ /** @@ -419,7 +419,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_mish_nulless_ - extern f_return_status fl_utf_string_dynamic_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_mish_nulless_ /** @@ -442,7 +442,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_append_ - extern f_return_status fl_utf_string_dynamic_partial_append(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_append(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_append_ /** @@ -467,7 +467,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_append_assure_ - extern f_return_status fl_utf_string_dynamic_partial_append_assure(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_append_assure(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_append_assure_ /** @@ -494,7 +494,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_append_assure_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_append_assure_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_append_assure_nulless_ /** @@ -519,7 +519,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_append_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_append_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_append_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_append_nulless_ /** @@ -543,7 +543,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_utf_string_dynamic_partial_compare_ - extern f_return_status fl_utf_string_dynamic_partial_compare(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_utf_string_range_t range1, const f_utf_string_range_t range2); + extern f_status_t fl_utf_string_dynamic_partial_compare(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_utf_string_range_t range1, const f_utf_string_range_t range2); #endif // _di_fl_utf_string_dynamic_partial_compare_ /** @@ -572,7 +572,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_fl_utf_string_dynamic_partial_compare_trim_ - extern f_return_status fl_utf_string_dynamic_partial_compare_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_utf_string_range_t range1, const f_utf_string_range_t range2); + extern f_status_t fl_utf_string_dynamic_partial_compare_trim(const f_utf_string_static_t string1, const f_utf_string_static_t string2, const f_utf_string_range_t range1, const f_utf_string_range_t range2); #endif // _di_fl_utf_string_dynamic_partial_compare_trim_ /** @@ -601,7 +601,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_mash_ - extern f_return_status fl_utf_string_dynamic_partial_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_mash_ /** @@ -632,7 +632,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_mash_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_mash_nulless_ /** @@ -661,7 +661,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_mish_ - extern f_return_status fl_utf_string_dynamic_partial_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_mish_ /** @@ -692,7 +692,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_mish_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_mish_nulless_ /** @@ -717,7 +717,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_prepend_ - extern f_return_status fl_utf_string_dynamic_partial_prepend(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_prepend(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_prepend_ /** @@ -744,7 +744,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_prepend_assure_ - extern f_return_status fl_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_prepend_assure(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_prepend_assure_ /** @@ -771,7 +771,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_prepend_assure_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_prepend_assure_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_prepend_assure_nulless_ /** @@ -796,7 +796,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_partial_prepend_nulless_ - extern f_return_status fl_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_partial_prepend_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_partial_prepend_nulless_ /** @@ -819,7 +819,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_prepend_ - extern f_return_status fl_utf_string_dynamic_prepend(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_prepend(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_prepend_ /** @@ -844,7 +844,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_prepend_assure_ - extern f_return_status fl_utf_string_dynamic_prepend_assure(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_prepend_assure(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_prepend_assure_ /** @@ -869,7 +869,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_prepend_assure_nulless_ - extern f_return_status fl_utf_string_dynamic_prepend_assure_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_prepend_assure_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_prepend_assure_nulless_ /** @@ -892,7 +892,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_prepend_nulless_ - extern f_return_status fl_utf_string_dynamic_prepend_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_prepend_nulless(const f_utf_string_static_t source, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_prepend_nulless_ /** @@ -918,7 +918,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_dynamic_rip_ - extern f_return_status fl_utf_string_dynamic_rip(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_rip(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_rip_ /** @@ -945,7 +945,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_utf_string_dynamic_rip_nulless_ - extern f_return_status fl_utf_string_dynamic_rip_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_rip_nulless(const f_utf_string_static_t source, const f_utf_string_range_t range, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_rip_nulless_ /** @@ -970,7 +970,7 @@ extern "C" { * F_utf (with error bit) if a character in the buffer is an invalid UTF-8 character. */ #ifndef _di_fl_utf_string_dynamic_seek_line_to_ - extern f_return_status fl_utf_string_dynamic_seek_line_to(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); + extern f_status_t fl_utf_string_dynamic_seek_line_to(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); #endif // _di_fl_utf_string_dynamic_seek_line_to_ /** @@ -994,7 +994,7 @@ extern "C" { * F_utf (with error bit) if a character in the buffer is an invalid UTF-8 character. */ #ifndef _di_fl_utf_string_seek_line_to_char_ - extern f_return_status fl_utf_string_dynamic_seek_line_to_char(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const int8_t seek_to_this); + extern f_status_t fl_utf_string_dynamic_seek_line_to_char(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const int8_t seek_to_this); #endif // _di_fl_utf_string_seek_line_to_char_ /** @@ -1021,7 +1021,7 @@ extern "C" { * @see f_utf_character_is_graph() */ #ifndef _di_fl_utf_string_dynamic_seek_line_until_graph_ - extern f_return_status fl_utf_string_dynamic_seek_line_until_graph(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t placeholder); + extern f_status_t fl_utf_string_dynamic_seek_line_until_graph(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t placeholder); #endif // _di_fl_utf_string_dynamic_seek_line_until_graph_ /** @@ -1049,7 +1049,7 @@ extern "C" { * @see f_utf_character_is_graph() */ #ifndef _di_fl_utf_string_dynamic_seek_line_until_non_graph_ - extern f_return_status fl_utf_string_dynamic_seek_line_until_non_graph(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t placeholder); + extern f_status_t fl_utf_string_dynamic_seek_line_until_non_graph(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t placeholder); #endif // _di_fl_utf_string_dynamic_seek_line_until_non_graph_ /** @@ -1073,7 +1073,7 @@ extern "C" { * F_utf (with error bit) if a character in the buffer is an invalid UTF-8 character. */ #ifndef _di_fl_utf_string_dynamic_seek_to_ - extern f_return_status fl_utf_string_dynamic_seek_to(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); + extern f_status_t fl_utf_string_dynamic_seek_to(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); #endif // _di_fl_utf_string_dynamic_seek_to_ /** @@ -1097,7 +1097,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_utf_string_dynamic_seek_to_char_ - extern f_return_status fl_utf_string_dynamic_seek_to_char(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const int8_t seek_to_this); + extern f_status_t fl_utf_string_dynamic_seek_to_char(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const int8_t seek_to_this); #endif // _di_fl_utf_string_dynamic_seek_to_char_ /** @@ -1124,7 +1124,7 @@ extern "C" { * F_utf (with error bit) if character is an invalid UTF-8 character. */ #ifndef _di_fl_utf_string_dynamic_seek_to_utf_character_ - extern f_return_status fl_utf_string_dynamic_seek_to_utf_character(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); + extern f_status_t fl_utf_string_dynamic_seek_to_utf_character(const f_utf_string_static_t buffer, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); #endif // _di_fl_utf_string_dynamic_seek_to_utf_character_ /** @@ -1145,7 +1145,7 @@ extern "C" { * F_string_too_large (with error bit) if string is too large to fit into the buffer. */ #ifndef _di_fl_utf_string_dynamic_terminate_ - extern f_return_status fl_utf_string_dynamic_terminate(f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_terminate(f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_terminate_ /** @@ -1168,7 +1168,7 @@ extern "C" { * F_string_too_large (with error bit) if string is too large to fit into the buffer. */ #ifndef _di_fl_utf_string_dynamic_terminate_after_ - extern f_return_status fl_utf_string_dynamic_terminate_after(f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_dynamic_terminate_after(f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_dynamic_terminate_after_ /** @@ -1196,7 +1196,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_mash_ - extern f_return_status fl_utf_string_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_mash(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_mash_ /** @@ -1226,7 +1226,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_mash_nulless_ - extern f_return_status fl_utf_string_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_mash_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_mash_nulless_ /** @@ -1254,7 +1254,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_mish_ - extern f_return_status fl_utf_string_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_mish(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_mish_ /** @@ -1284,7 +1284,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_mish_nulless_ - extern f_return_status fl_utf_string_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_mish_nulless(const f_utf_string_t glue, const f_utf_string_length_t glue_length, const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_mish_nulless_ /** @@ -1308,7 +1308,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_prepend_ - extern f_return_status fl_utf_string_prepend(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_prepend(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_prepend_ /** @@ -1334,7 +1334,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_prepend_assure_ - extern f_return_status fl_utf_string_prepend_assure(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_prepend_assure(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_prepend_assure_ /** @@ -1361,7 +1361,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_prepend_assure_nulless_ - extern f_return_status fl_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_prepend_assure_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_prepend_assure_nulless_ /** @@ -1388,7 +1388,7 @@ extern "C" { * F_string_too_large (with error bit) if the combined string is too large. */ #ifndef _di_fl_utf_string_prepend_nulless_ - extern f_return_status fl_utf_string_prepend_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_prepend_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_prepend_nulless_ /** @@ -1416,7 +1416,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_fl_utf_string_rip_ - extern f_return_status fl_utf_string_rip(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_rip(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_rip_ /** @@ -1446,7 +1446,7 @@ extern "C" { * @see f_utf_character_is_whitespace() */ #ifndef _di_fl_utf_string_rip_nulless_ - extern f_return_status fl_utf_string_rip_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); + extern f_status_t fl_utf_string_rip_nulless(const f_utf_string_t source, const f_utf_string_length_t length, f_utf_string_dynamic_t *destination); #endif // _di_fl_utf_string_rip_nulless_ /** @@ -1468,7 +1468,7 @@ extern "C" { * F_parameter (with error bit) if a parameter is invalid. */ #ifndef _di_fl_utf_string_seek_line_to_ - extern f_return_status fl_utf_string_seek_line_to(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); + extern f_status_t fl_utf_string_seek_line_to(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); #endif // _di_fl_utf_string_seek_line_to_ /** @@ -1491,7 +1491,7 @@ extern "C" { * F_utf (with error bit) if a character in the buffer is an invalid UTF-8 character. */ #ifndef _di_fl_utf_string_seek_line_to_char_ - extern f_return_status fl_utf_string_seek_line_to_char(const f_utf_string_t string, f_utf_string_range_t *range, const int8_t seek_to_this); + extern f_status_t fl_utf_string_seek_line_to_char(const f_utf_string_t string, f_utf_string_range_t *range, const int8_t seek_to_this); #endif // _di_fl_utf_string_seek_line_to_char_ /** @@ -1521,7 +1521,7 @@ extern "C" { * @see f_utf_character_is_graph() */ #ifndef _di_fl_utf_string_seek_line_until_graph_ - extern f_return_status fl_utf_string_seek_line_until_graph(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t placeholder); + extern f_status_t fl_utf_string_seek_line_until_graph(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t placeholder); #endif // _di_fl_utf_string_seek_line_until_graph_ /** @@ -1552,7 +1552,7 @@ extern "C" { * @see f_utf_character_is_graph() */ #ifndef _di_fl_utf_string_seek_line_until_non_graph_ - extern f_return_status fl_utf_string_seek_line_until_non_graph(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t placeholder); + extern f_status_t fl_utf_string_seek_line_until_non_graph(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t placeholder); #endif // _di_fl_utf_string_seek_line_until_non_graph_ /** @@ -1574,7 +1574,7 @@ extern "C" { * F_utf (with error bit) if a character in the buffer is an invalid UTF-8 character. */ #ifndef _di_fl_utf_string_seek_to_ - extern f_return_status fl_utf_string_seek_to(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); + extern f_status_t fl_utf_string_seek_to(const f_utf_string_t string, f_utf_string_range_t *range, const f_utf_character_t seek_to_this); #endif // _di_fl_utf_string_seek_to_ /** @@ -1597,7 +1597,7 @@ extern "C" { * F_utf (with error bit) if a character in the buffer is an invalid UTF-8 character. */ #ifndef _di_fl_utf_string_seek_to_character_ - extern f_return_status fl_utf_string_seek_to_char(const f_utf_string_t string, f_utf_string_range_t *range, const int8_t seek_to_this); + extern f_status_t fl_utf_string_seek_to_char(const f_utf_string_t string, f_utf_string_range_t *range, const int8_t seek_to_this); #endif // _di_fl_utf_string__seek_to_character_ #ifdef __cplusplus diff --git a/level_1/fl_utf_file/c/private-utf_file.c b/level_1/fl_utf_file/c/private-utf_file.c index 12e1c33..7431c0a 100644 --- a/level_1/fl_utf_file/c/private-utf_file.c +++ b/level_1/fl_utf_file/c/private-utf_file.c @@ -70,7 +70,7 @@ extern "C" { #endif // !defined(_di_fl_utf_file_read_) || !defined(_di_fl_utf_file_read_until_) || !defined(_di_fl_utf_file_read_range_) #if !defined(_di_fl_utf_file_write_) || !defined(_di_fl_utf_file_write_until_) || !defined(fl_utf_file_write_range) - f_return_status private_fl_utf_file_write_until(const f_file_t file, const f_utf_string_t string, const f_utf_string_length_t total, f_utf_string_length_t *written) { + f_status_t private_fl_utf_file_write_until(const f_file_t file, const f_utf_string_t string, const f_utf_string_length_t total, f_utf_string_length_t *written) { *written = 0; f_status_t status = F_none; diff --git a/level_1/fl_utf_file/c/private-utf_file.h b/level_1/fl_utf_file/c/private-utf_file.h index ef7d5b4..204e92a 100644 --- a/level_1/fl_utf_file/c/private-utf_file.h +++ b/level_1/fl_utf_file/c/private-utf_file.h @@ -77,7 +77,7 @@ extern "C" { * @see fl_utf_file_write_until() */ #if !defined(_di_fl_utf_file_write_) || !defined(_di_fl_utf_file_write_until_) || !defined(_di_fl_utf_file_write_range_) - extern f_return_status private_fl_utf_file_write_until(const f_file_t file, const f_utf_string_t string, const f_utf_string_length_t total, f_utf_string_length_t *written) f_gcc_attribute_visibility_internal; + extern f_status_t private_fl_utf_file_write_until(const f_file_t file, const f_utf_string_t string, const f_utf_string_length_t total, f_utf_string_length_t *written) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fl_utf_file_write_) || !defined(_di_fl_utf_file_write_until_) || !defined(_di_fl_utf_file_write_range_) #ifdef __cplusplus diff --git a/level_1/fl_utf_file/c/utf_file.c b/level_1/fl_utf_file/c/utf_file.c index 839750c..68bfc3e 100644 --- a/level_1/fl_utf_file/c/utf_file.c +++ b/level_1/fl_utf_file/c/utf_file.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fl_utf_file_read_ - f_return_status fl_utf_file_read(const f_file_t file, f_utf_string_dynamic_t *buffer) { + f_status_t fl_utf_file_read(const f_file_t file, f_utf_string_dynamic_t *buffer) { #ifndef _di_level_1_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (buffer->used > buffer->size) return F_status_set_error(F_parameter); @@ -67,7 +67,7 @@ extern "C" { #endif // _di_fl_utf_file_read_ #ifndef _di_fl_utf_file_read_block_ - f_return_status fl_utf_file_read_block(const f_file_t file, f_utf_string_dynamic_t *buffer) { + f_status_t fl_utf_file_read_block(const f_file_t file, f_utf_string_dynamic_t *buffer) { #ifndef _di_level_1_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (buffer->used > buffer->size) return F_status_set_error(F_parameter); @@ -127,7 +127,7 @@ extern "C" { #endif // _di_fl_utf_file_read_block_ #ifndef _di_fl_utf_file_read_until_ - f_return_status fl_utf_file_read_until(const f_file_t file, const f_utf_string_length_t total, f_utf_string_dynamic_t *buffer) { + f_status_t fl_utf_file_read_until(const f_file_t file, const f_utf_string_length_t total, f_utf_string_dynamic_t *buffer) { #ifndef _di_level_1_parameter_checking_ if (!file.size_read) return F_status_set_error(F_parameter); if (buffer->used > buffer->size) return F_status_set_error(F_parameter); @@ -195,7 +195,7 @@ extern "C" { #endif // _di_fl_utf_file_read_until_ #ifndef _di_fl_utf_file_write_ - f_return_status fl_utf_file_write(const f_file_t file, const f_utf_string_static_t buffer, f_utf_string_length_t *written) { + f_status_t fl_utf_file_write(const f_file_t file, const f_utf_string_static_t buffer, f_utf_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -219,7 +219,7 @@ extern "C" { #endif // _di_fl_utf_file_write_ #ifndef _di_fl_utf_file_write_block_ - f_return_status fl_utf_file_write_block(const f_file_t file, const f_utf_string_static_t buffer, f_utf_string_length_t *written) { + f_status_t fl_utf_file_write_block(const f_file_t file, const f_utf_string_static_t buffer, f_utf_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -249,7 +249,7 @@ extern "C" { #endif // _di_fl_utf_file_write_block_ #ifndef _di_fl_utf_file_write_until_ - f_return_status fl_utf_file_write_until(const f_file_t file, const f_utf_string_static_t buffer, const f_utf_string_length_t total, f_utf_string_length_t *written) { + f_status_t fl_utf_file_write_until(const f_file_t file, const f_utf_string_static_t buffer, const f_utf_string_length_t total, f_utf_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); @@ -279,7 +279,7 @@ extern "C" { #endif // _di_fl_utf_file_write_until_ #ifndef _di_fl_utf_file_write_range_ - f_return_status fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t buffer, const f_utf_string_range_t range, f_utf_string_length_t *written) { + f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t buffer, const f_utf_string_range_t range, f_utf_string_length_t *written) { #ifndef _di_level_0_parameter_checking_ if (!file.size_write) return F_status_set_error(F_parameter); if (buffer.used > buffer.size) return F_status_set_error(F_parameter); diff --git a/level_1/fl_utf_file/c/utf_file.h b/level_1/fl_utf_file/c/utf_file.h index 6d3bc76..85c08ec 100644 --- a/level_1/fl_utf_file/c/utf_file.h +++ b/level_1/fl_utf_file/c/utf_file.h @@ -55,7 +55,7 @@ extern "C" { * @see read() */ #ifndef _di_fl_utf_file_read_ - extern f_return_status fl_utf_file_read(const f_file_t file, f_utf_string_dynamic_t *buffer); + extern f_status_t fl_utf_file_read(const f_file_t file, f_utf_string_dynamic_t *buffer); #endif // _di_fl_utf_file_read_ /** @@ -88,7 +88,7 @@ extern "C" { * @see read() */ #ifndef _di_fl_utf_file_read_block_ - extern f_return_status fl_utf_file_read_block(const f_file_t file, f_utf_string_dynamic_t *buffer); + extern f_status_t fl_utf_file_read_block(const f_file_t file, f_utf_string_dynamic_t *buffer); #endif // _di_fl_utf_file_read_block_ /** @@ -122,7 +122,7 @@ extern "C" { * @see read() */ #ifndef _di_fl_utf_file_read_until_ - extern f_return_status fl_utf_file_read_until(const f_file_t file, const f_utf_string_length_t total, f_utf_string_dynamic_t *buffer); + extern f_status_t fl_utf_file_read_until(const f_file_t file, const f_utf_string_length_t total, f_utf_string_dynamic_t *buffer); #endif // _di_fl_utf_file_read_until_ /** @@ -154,7 +154,7 @@ extern "C" { * @see write() */ #ifndef _di_fl_utf_file_write_ - extern f_return_status fl_utf_file_write(const f_file_t file, const f_utf_string_static_t buffer, f_utf_string_length_t *written); + extern f_status_t fl_utf_file_write(const f_file_t file, const f_utf_string_static_t buffer, f_utf_string_length_t *written); #endif // _di_fl_utf_file_write_ /** @@ -188,7 +188,7 @@ extern "C" { * @see write() */ #ifndef _di_fl_utf_file_write_block_ - extern f_return_status fl_utf_file_write_block(const f_file_t file, const f_utf_string_static_t buffer, f_utf_string_length_t *written); + extern f_status_t fl_utf_file_write_block(const f_file_t file, const f_utf_string_static_t buffer, f_utf_string_length_t *written); #endif // _di_fl_utf_file_write_block_ /** @@ -222,7 +222,7 @@ extern "C" { * @see write() */ #ifndef _di_fl_utf_file_write_until_ - extern f_return_status fl_utf_file_write_until(const f_file_t file, const f_utf_string_static_t buffer, const f_utf_string_length_t total, f_utf_string_length_t *written); + extern f_status_t fl_utf_file_write_until(const f_file_t file, const f_utf_string_static_t buffer, const f_utf_string_length_t total, f_utf_string_length_t *written); #endif // _di_fl_utf_file_write_until_ /** @@ -256,7 +256,7 @@ extern "C" { * @see write() */ #ifndef _di_fl_utf_file_write_range_ - extern f_return_status fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t buffer, const f_utf_string_range_t range, f_utf_string_length_t *written); + extern f_status_t fl_utf_file_write_range(const f_file_t file, const f_utf_string_static_t buffer, const f_utf_string_range_t range, f_utf_string_length_t *written); #endif // _di_fl_utf_file_write_range_ #ifdef __cplusplus diff --git a/level_2/fll_control_group/c/control_group.c b/level_2/fll_control_group/c/control_group.c index 6aa95a0..7604981 100644 --- a/level_2/fll_control_group/c/control_group.c +++ b/level_2/fll_control_group/c/control_group.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_control_group_prepare_ - f_return_status fll_control_group_prepare(const f_control_group_t control_group) { + f_status_t fll_control_group_prepare(const f_control_group_t control_group) { f_status_t status = F_none; if (control_group.path.used) { diff --git a/level_2/fll_control_group/c/control_group.h b/level_2/fll_control_group/c/control_group.h index ba06370..5561c4e 100644 --- a/level_2/fll_control_group/c/control_group.h +++ b/level_2/fll_control_group/c/control_group.h @@ -50,7 +50,7 @@ extern "C" { * @see fl_directory_create() */ #ifndef _di_fll_control_group_prepare_ - extern f_return_status fll_control_group_prepare(const f_control_group_t control_group); + extern f_status_t fll_control_group_prepare(const f_control_group_t control_group); #endif // _di_fll_control_group_prepare_ #ifdef __cplusplus diff --git a/level_2/fll_environment/c/environment.c b/level_2/fll_environment/c/environment.c index 61df4e8..e359de6 100644 --- a/level_2/fll_environment/c/environment.c +++ b/level_2/fll_environment/c/environment.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_environment_load_name_ - f_return_status fll_environment_load_name(const f_string_t name, const f_string_length_t length, f_string_maps_t *environment) { + f_status_t fll_environment_load_name(const f_string_t name, const f_string_length_t length, f_string_maps_t *environment) { #ifndef _di_level_2_parameter_checking_ if (!name) return F_status_set_error(F_parameter); if (!environment) return F_status_set_error(F_parameter); @@ -45,7 +45,7 @@ extern "C" { #endif // _di_fll_environment_load_name_ #ifndef _di_fll_environment_load_names_ - f_return_status fll_environment_load_names(const f_string_dynamics_t names, f_string_maps_t *environment) { + f_status_t fll_environment_load_names(const f_string_dynamics_t names, f_string_maps_t *environment) { #ifndef _di_level_2_parameter_checking_ if (!environment) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_environment/c/environment.h b/level_2/fll_environment/c/environment.h index 743d717..9970964 100644 --- a/level_2/fll_environment/c/environment.h +++ b/level_2/fll_environment/c/environment.h @@ -56,7 +56,7 @@ extern "C" { * @see fl_string_maps_increase_by() */ #ifndef _di_fll_environment_load_name_ - extern f_return_status fll_environment_load_name(const f_string_t name, const f_string_length_t length, f_string_maps_t *environment); + extern f_status_t fll_environment_load_name(const f_string_t name, const f_string_length_t length, f_string_maps_t *environment); #endif // _di_fll_environment_load_name_ /** @@ -86,7 +86,7 @@ extern "C" { * @see fl_string_maps_increase_by() */ #ifndef _di_fll_environment_load_names_ - extern f_return_status fll_environment_load_names(const f_string_dynamics_t names, f_string_maps_t *environment); + extern f_status_t fll_environment_load_names(const f_string_dynamics_t names, f_string_maps_t *environment); #endif // _di_fll_environment_load_names_ #ifdef __cplusplus diff --git a/level_2/fll_error/c/error.c b/level_2/fll_error/c/error.c index 345c0b1..6a7c959 100644 --- a/level_2/fll_error/c/error.c +++ b/level_2/fll_error/c/error.c @@ -6,13 +6,13 @@ extern "C" { #endif #ifndef _di_fll_error_print_ - f_return_status fll_error_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback) { + f_status_t fll_error_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback) { return private_fll_error_print(error, status, function, fallback); } #endif // _di_fll_error_print_ #ifndef _di_fll_error_file_print_ - f_return_status fll_error_file_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback, const f_string_t name, const f_string_t operation, const uint8_t type) { + f_status_t fll_error_file_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback, const f_string_t name, const f_string_t operation, const uint8_t type) { const char *type_name = fll_error_file_type_string_file; if (type == fll_error_file_type_directory) { @@ -259,7 +259,7 @@ extern "C" { #endif // _di_fll_error_file_print_ #ifndef _di_fll_error_parameter_integer_print_ - f_return_status fll_error_parameter_integer_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback, const f_string_t parameter, const f_string_t argument) { + f_status_t fll_error_parameter_integer_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback, const f_string_t parameter, const f_string_t argument) { if (status == F_data_not) { if (error.verbosity != f_console_verbosity_quiet) { diff --git a/level_2/fll_error/c/error.h b/level_2/fll_error/c/error.h index 94fdd34..8674fe6 100644 --- a/level_2/fll_error/c/error.h +++ b/level_2/fll_error/c/error.h @@ -52,7 +52,7 @@ extern "C" { * F_true is returned if the status code is unknown. */ #ifndef _di_fll_error_print_ - extern f_return_status fll_error_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback); + extern f_status_t fll_error_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback); #endif // _di_fll_error_print_ /** @@ -80,7 +80,7 @@ extern "C" { * F_false is returned on successful print of known errors. */ #ifndef _di_fll_error_file_print_ - extern f_return_status fll_error_file_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback, const f_string_t name, const f_string_t operation, const uint8_t type); + extern f_status_t fll_error_file_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback, const f_string_t name, const f_string_t operation, const uint8_t type); #endif // _di_fll_error_file_print_ /** @@ -106,7 +106,7 @@ extern "C" { * F_false is returned on successful print of known errors. */ #ifndef _di_fll_error_parameter_integer_print_ - extern f_return_status fll_error_parameter_integer_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback, const f_string_t parameter, const f_string_t argument); + extern f_status_t fll_error_parameter_integer_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback, const f_string_t parameter, const f_string_t argument); #endif // _di_fll_error_parameter_integer_print_ #ifdef __cplusplus diff --git a/level_2/fll_error/c/private-error.c b/level_2/fll_error/c/private-error.c index 2bcd8a5..f5bd390 100644 --- a/level_2/fll_error/c/private-error.c +++ b/level_2/fll_error/c/private-error.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fll_error_print_) || !defined(_di_fll_error_file_print_) || !defined(_di_fll_error_number_print_) - f_return_status private_fll_error_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback) { + f_status_t private_fll_error_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback) { if (status == F_array_too_large) { if (error.verbosity != f_console_verbosity_quiet) { diff --git a/level_2/fll_error/c/private-error.h b/level_2/fll_error/c/private-error.h index 7044dc2..7fcd4d5 100644 --- a/level_2/fll_error/c/private-error.h +++ b/level_2/fll_error/c/private-error.h @@ -39,7 +39,7 @@ extern "C" { * @see fll_error_file_print() */ #if !defined(_di_fll_error_print_) || !defined(_di_fll_error_file_print_) || !defined(_di_fll_error_number_print_) - extern f_return_status private_fll_error_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_error_print(const fll_error_print_t error, const f_status_t status, const f_string_t function, const bool fallback) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_error_print_) || !defined(_di_fll_error_file_print_) || !defined(_di_fll_error_number_print_) /** diff --git a/level_2/fll_execute/c/execute.c b/level_2/fll_execute/c/execute.c index 79ddaac..03c3cac 100644 --- a/level_2/fll_execute/c/execute.c +++ b/level_2/fll_execute/c/execute.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fll_execute_arguments_add_ - f_return_status fll_execute_arguments_add(const f_string_t source, const f_string_length_t length, f_string_dynamics_t *arguments) { + f_status_t fll_execute_arguments_add(const f_string_t source, const f_string_length_t length, f_string_dynamics_t *arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -19,7 +19,7 @@ extern "C" { #endif // _di_fll_execute_arguments_add_ #ifndef _di_fll_execute_arguments_add_parameter_ - f_return_status fll_execute_arguments_add_parameter(const f_string_t prefix, const f_string_length_t prefix_length, const f_string_t name, const f_string_length_t name_length, const f_string_t value, const f_string_length_t value_length, f_string_dynamics_t *arguments) { + f_status_t fll_execute_arguments_add_parameter(const f_string_t prefix, const f_string_length_t prefix_length, const f_string_t name, const f_string_length_t name_length, const f_string_t value, const f_string_length_t value_length, f_string_dynamics_t *arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -32,7 +32,7 @@ extern "C" { #endif // _di_fll_execute_arguments_add_parameter_ #ifndef _di_fll_execute_arguments_add_parameter_set_ - f_return_status fll_execute_arguments_add_parameter_set(const f_string_t prefix[], const f_string_length_t prefix_length[], const f_string_t name[], const f_string_length_t name_length[], const f_string_t value[], const f_string_length_t value_length[], const f_array_length_t size, f_string_dynamics_t *arguments) { + f_status_t fll_execute_arguments_add_parameter_set(const f_string_t prefix[], const f_string_length_t prefix_length[], const f_string_t name[], const f_string_length_t name_length[], const f_string_t value[], const f_string_length_t value_length[], const f_array_length_t size, f_string_dynamics_t *arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -50,7 +50,7 @@ extern "C" { #endif // _di_fll_execute_arguments_add_parameter_set_ #ifndef _di_fll_execute_arguments_add_set_ - f_return_status fll_execute_arguments_add_set(const f_string_t source[], const f_string_length_t length[], const f_array_length_t size, f_string_dynamics_t *arguments) { + f_status_t fll_execute_arguments_add_set(const f_string_t source[], const f_string_length_t length[], const f_array_length_t size, f_string_dynamics_t *arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -68,7 +68,7 @@ extern "C" { #endif // _di_fll_execute_arguments_add_set_ #ifndef _di_fll_execute_arguments_dynamic_add_ - f_return_status fll_execute_arguments_dynamic_add(const f_string_static_t source, f_string_dynamics_t *arguments) { + f_status_t fll_execute_arguments_dynamic_add(const f_string_static_t source, f_string_dynamics_t *arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -81,7 +81,7 @@ extern "C" { #endif // _di_fll_execute_arguments_dynamic_add_ #ifndef _di_fll_execute_arguments_dynamic_add_parameter_ - f_return_status fll_execute_arguments_dynamic_add_parameter(const f_string_static_t prefix, const f_string_static_t name, const f_string_static_t value, f_string_dynamics_t *arguments) { + f_status_t fll_execute_arguments_dynamic_add_parameter(const f_string_static_t prefix, const f_string_static_t name, const f_string_static_t value, f_string_dynamics_t *arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -94,7 +94,7 @@ extern "C" { #endif // _di_fll_execute_arguments_dynamic_add_parameter_ #ifndef _di_fll_execute_arguments_dynamic_add_parameter_set_ - f_return_status fll_execute_arguments_dynamic_add_parameter_set(const f_string_static_t prefix[], const f_string_static_t name[], const f_string_static_t value[], const f_array_length_t size, f_string_dynamics_t *arguments) { + f_status_t fll_execute_arguments_dynamic_add_parameter_set(const f_string_static_t prefix[], const f_string_static_t name[], const f_string_static_t value[], const f_array_length_t size, f_string_dynamics_t *arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -112,7 +112,7 @@ extern "C" { #endif // _di_fll_execute_arguments_dynamic_add_parameter_set_ #ifndef _di_fll_execute_arguments_dynamic_add_set_ - f_return_status fll_execute_arguments_dynamic_add_set(const f_string_static_t source[], const f_array_length_t size, f_string_dynamics_t *arguments) { + f_status_t fll_execute_arguments_dynamic_add_set(const f_string_static_t source[], const f_array_length_t size, f_string_dynamics_t *arguments) { #ifndef _di_level_2_parameter_checking_ if (!arguments) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -130,7 +130,7 @@ extern "C" { #endif // _di_fll_execute_arguments_dynamic_add_set_ #ifndef _di_fll_execute_into_ - f_return_status fll_execute_into(const f_string_t program, const f_string_statics_t arguments, const uint8_t option, int *result) { + f_status_t fll_execute_into(const f_string_t program, const f_string_statics_t arguments, const uint8_t option, int *result) { #ifndef _di_level_2_parameter_checking_ if (!program && !arguments.used) return F_status_set_error(F_parameter); if (!result) return F_status_set_error(F_parameter); @@ -168,7 +168,7 @@ extern "C" { #endif // _di_fll_execute_into_ #ifndef _di_fll_execute_program_ - f_return_status fll_execute_program(const f_string_t program, const f_string_statics_t arguments, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) { + f_status_t fll_execute_program(const f_string_t program, const f_string_statics_t arguments, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) { #ifndef _di_level_2_parameter_checking_ if (!program && !arguments.used) return F_status_set_error(F_parameter); if (!result) return F_status_set_error(F_parameter); diff --git a/level_2/fll_execute/c/execute.h b/level_2/fll_execute/c/execute.h index f3d752c..c12bde5 100644 --- a/level_2/fll_execute/c/execute.h +++ b/level_2/fll_execute/c/execute.h @@ -84,7 +84,7 @@ extern "C" { * @see fl_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_add_ - extern f_return_status fll_execute_arguments_add(const f_string_t source, const f_string_length_t length, f_string_dynamics_t *arguments); + extern f_status_t fll_execute_arguments_add(const f_string_t source, const f_string_length_t length, f_string_dynamics_t *arguments); #endif // _di_fll_execute_arguments_add_ /** @@ -128,7 +128,7 @@ extern "C" { * @see fl_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_add_parameter_ - extern f_return_status fll_execute_arguments_add_parameter(const f_string_t prefix, const f_string_length_t prefix_length, const f_string_t name, const f_string_length_t name_length, const f_string_t value, const f_string_length_t value_length, f_string_dynamics_t *arguments); + extern f_status_t fll_execute_arguments_add_parameter(const f_string_t prefix, const f_string_length_t prefix_length, const f_string_t name, const f_string_length_t name_length, const f_string_t value, const f_string_length_t value_length, f_string_dynamics_t *arguments); #endif // _di_fll_execute_arguments_add_parameter_ /** @@ -174,7 +174,7 @@ extern "C" { * @see fl_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_add_parameter_set_ - extern f_return_status fll_execute_arguments_add_parameter_set(const f_string_t prefix[], const f_string_length_t prefix_length[], const f_string_t name[], const f_string_length_t name_length[], const f_string_t value[], const f_string_length_t value_length[], const f_array_length_t size, f_string_dynamics_t *arguments); + extern f_status_t fll_execute_arguments_add_parameter_set(const f_string_t prefix[], const f_string_length_t prefix_length[], const f_string_t name[], const f_string_length_t name_length[], const f_string_t value[], const f_string_length_t value_length[], const f_array_length_t size, f_string_dynamics_t *arguments); #endif // _di_fll_execute_arguments_add_parameter_set_ /** @@ -206,7 +206,7 @@ extern "C" { * @see fl_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_add_set_ - extern f_return_status fll_execute_arguments_add_set(const f_string_t source[], const f_string_length_t length[], const f_array_length_t size, f_string_dynamics_t *arguments); + extern f_status_t fll_execute_arguments_add_set(const f_string_t source[], const f_string_length_t length[], const f_array_length_t size, f_string_dynamics_t *arguments); #endif // _di_fll_execute_arguments_add_set_ /** @@ -234,7 +234,7 @@ extern "C" { * @see fl_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_dynamic_add_ - extern f_return_status fll_execute_arguments_dynamic_add(const f_string_static_t source, f_string_dynamics_t *arguments); + extern f_status_t fll_execute_arguments_dynamic_add(const f_string_static_t source, f_string_dynamics_t *arguments); #endif // _di_fll_execute_arguments_dynamic_add_ /** @@ -272,7 +272,7 @@ extern "C" { * @see fl_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_dynamic_add_parameter_ - extern f_return_status fll_execute_arguments_dynamic_add_parameter(const f_string_static_t prefix, const f_string_static_t name, const f_string_static_t value, f_string_dynamics_t *arguments); + extern f_status_t fll_execute_arguments_dynamic_add_parameter(const f_string_static_t prefix, const f_string_static_t name, const f_string_static_t value, f_string_dynamics_t *arguments); #endif // _di_fll_execute_arguments_dynamic_add_parameter_ /** @@ -312,7 +312,7 @@ extern "C" { * @see fl_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_dynamic_add_parameter_set_ - extern f_return_status fll_execute_arguments_dynamic_add_parameter_set(const f_string_static_t prefix[], const f_string_static_t name[], const f_string_static_t value[], const f_array_length_t size, f_string_dynamics_t *arguments); + extern f_status_t fll_execute_arguments_dynamic_add_parameter_set(const f_string_static_t prefix[], const f_string_static_t name[], const f_string_static_t value[], const f_array_length_t size, f_string_dynamics_t *arguments); #endif // _di_fll_execute_arguments_dynamic_add_parameter_set_ /** @@ -342,7 +342,7 @@ extern "C" { * @see fl_string_dynamics_increase() */ #ifndef _di_fll_execute_arguments_dynamic_add_set_ - extern f_return_status fll_execute_arguments_dynamic_add_set(const f_string_static_t source[], const f_array_length_t size, f_string_dynamics_t *arguments); + extern f_status_t fll_execute_arguments_dynamic_add_set(const f_string_static_t source[], const f_array_length_t size, f_string_dynamics_t *arguments); #endif // _di_fll_execute_arguments_dynamic_add_set_ /** @@ -377,7 +377,7 @@ extern "C" { * @see strnlen() */ #ifndef _di_fll_execute_into_ - extern f_return_status fll_execute_into(const f_string_t program, const f_string_statics_t arguments, const uint8_t option, int *result); + extern f_status_t fll_execute_into(const f_string_t program, const f_string_statics_t arguments, const uint8_t option, int *result); #endif // _di_fll_execute_into_ /** @@ -489,7 +489,7 @@ extern "C" { * @see fl_string_dynamic_terminate() */ #ifndef _di_fll_execute_program_ - extern f_return_status fll_execute_program(const f_string_t program, const f_string_statics_t arguments, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result); + extern f_status_t fll_execute_program(const f_string_t program, const f_string_statics_t arguments, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result); #endif // _di_fll_execute_program_ #ifdef __cplusplus diff --git a/level_2/fll_execute/c/private-execute.c b/level_2/fll_execute/c/private-execute.c index b863576..ffd52ab 100644 --- a/level_2/fll_execute/c/private-execute.c +++ b/level_2/fll_execute/c/private-execute.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fll_execute_arguments_add_) || !defined(_di_fll_execute_arguments_add_set_) || !defined(_di_fll_execute_arguments_dynamic_add_) || !defined(_di_fll_execute_arguments_dynamic_add_set_) - f_return_status private_fll_execute_arguments_add(const f_string_t source, const f_string_length_t length, f_string_dynamics_t *arguments) { + f_status_t private_fll_execute_arguments_add(const f_string_t source, const f_string_length_t length, f_string_dynamics_t *arguments) { f_status_t status = fl_string_dynamics_increase(arguments); if (F_status_is_error(status)) return status; @@ -39,7 +39,7 @@ extern "C" { #endif // !defined(_di_fll_execute_arguments_add_) || !defined(_di_fll_execute_arguments_add_set_) || !defined(_di_fll_execute_arguments_dynamic_add_) || !defined(_di_fll_execute_arguments_dynamic_add_set_) #if !defined(_di_fll_execute_arguments_add_parameter_) || !defined(_di_fll_execute_arguments_add_parameter_set_) || !defined(_di_fll_execute_arguments_dynamic_add_parameter_) || !defined(_di_fll_execute_arguments_dynamic_add_parameter_set_) - f_return_status private_fll_execute_arguments_add_parameter(const f_string_t prefix, const f_string_length_t prefix_length, const f_string_t name, const f_string_length_t name_length, const f_string_t value, const f_string_length_t value_length, f_string_dynamics_t *arguments) { + f_status_t private_fll_execute_arguments_add_parameter(const f_string_t prefix, const f_string_length_t prefix_length, const f_string_t name, const f_string_length_t name_length, const f_string_t value, const f_string_length_t value_length, f_string_dynamics_t *arguments) { f_status_t status = fl_string_dynamics_increase(arguments); if (F_status_is_error(status)) return status; @@ -117,7 +117,7 @@ extern "C" { #endif // !defined(_di_fll_execute_arguments_add_parameter_) || !defined(_di_fll_execute_arguments_add_parameter_set_) || !defined(_di_fll_execute_arguments_dynamic_add_parameter_) || !defined(_di_fll_execute_arguments_dynamic_add_parameter_set_) #if !defined(_di_fll_execute_program_) - f_return_status private_fll_execute_as_child(const fl_execute_as_t as, fl_execute_parameter_t * const parameter, int *result) { + f_status_t private_fll_execute_as_child(const fl_execute_as_t as, fl_execute_parameter_t * const parameter, int *result) { if (as.nice) { errno = 0; @@ -188,7 +188,7 @@ extern "C" { #endif // !defined(_di_fll_execute_program_) #if !defined(_di_fll_execute_program_) - f_return_status private_fll_execute_as_parent(const fl_execute_as_t as, const pid_t id_child, fl_execute_parameter_t * const parameter, char *result) { + f_status_t private_fll_execute_as_parent(const fl_execute_as_t as, const pid_t id_child, fl_execute_parameter_t * const parameter, char *result) { if (as.affinity && as.affinity->used) { cpu_set_t *set = CPU_ALLOC(as.affinity->used); @@ -255,7 +255,7 @@ extern "C" { #endif // !defined(_di_fll_execute_program_) #if !defined(_di_fll_execute_program_) - f_return_status private_fll_execute_fork(const f_string_t program, const f_string_t fixed_arguments[], fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) { + f_status_t private_fll_execute_fork(const f_string_t program, const f_string_t fixed_arguments[], fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) { int descriptors[2] = { -1, -1 }; @@ -413,7 +413,7 @@ extern "C" { #endif // !defined(_di_fll_execute_program_) #if !defined(_di_fll_execute_program_) - f_return_status private_fll_execute_fork_data(const f_string_t program, const f_string_t fixed_arguments[], fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) { + f_status_t private_fll_execute_fork_data(const f_string_t program, const f_string_t fixed_arguments[], fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) { int descriptors[2] = { -1, -1 }; diff --git a/level_2/fll_execute/c/private-execute.h b/level_2/fll_execute/c/private-execute.h index c1581e5..5ffa8ed 100644 --- a/level_2/fll_execute/c/private-execute.h +++ b/level_2/fll_execute/c/private-execute.h @@ -45,7 +45,7 @@ extern "C" { * @see fll_execute_arguments_dynamic_add_set() */ #if !defined(_di_fll_execute_arguments_add_) || !defined(_di_fll_execute_arguments_add_set_) || !defined(_di_fll_execute_arguments_dynamic_add_) || !defined(_di_fll_execute_arguments_dynamic_add_set_) - extern f_return_status private_fll_execute_arguments_add(const f_string_t source, const f_string_length_t length, f_string_dynamics_t *arguments) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_execute_arguments_add(const f_string_t source, const f_string_length_t length, f_string_dynamics_t *arguments) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_execute_arguments_add_) || !defined(_di_fll_execute_arguments_add_set_) || !defined(_di_fll_execute_arguments_dynamic_add_) || !defined(_di_fll_execute_arguments_dynamic_add_set_) /** @@ -86,7 +86,7 @@ extern "C" { * @see fll_execute_arguments_dynamic_add_parameter_set() */ #if !defined(_di_fll_execute_arguments_add_parameter_) || !defined(_di_fll_execute_arguments_add_parameter_set_) || !defined(_di_fll_execute_arguments_dynamic_add_parameter_) || !defined(_di_fll_execute_arguments_dynamic_add_parameter_set_) - extern f_return_status private_fll_execute_arguments_add_parameter(const f_string_t prefix, const f_string_length_t prefix_length, const f_string_t name, const f_string_length_t name_length, const f_string_t value, const f_string_length_t value_length, f_string_dynamics_t *arguments) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_execute_arguments_add_parameter(const f_string_t prefix, const f_string_length_t prefix_length, const f_string_t name, const f_string_length_t name_length, const f_string_t value, const f_string_length_t value_length, f_string_dynamics_t *arguments) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_execute_arguments_add_parameter_) || !defined(_di_fll_execute_arguments_add_parameter_set_) || !defined(_di_fll_execute_arguments_dynamic_add_parameter_) || !defined(_di_fll_execute_arguments_dynamic_add_parameter_set_) /** @@ -124,7 +124,7 @@ extern "C" { * @see fll_execute_program() */ #if !defined(_di_fll_execute_program_) - extern f_return_status private_fll_execute_as_child(const fl_execute_as_t as, fl_execute_parameter_t * const parameter, int *result) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_execute_as_child(const fl_execute_as_t as, fl_execute_parameter_t * const parameter, int *result) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_execute_program_) /** @@ -165,7 +165,7 @@ extern "C" { * @see fll_execute_program() */ #if !defined(_di_fll_execute_program_) - extern f_return_status private_fll_execute_as_parent(const fl_execute_as_t as, const pid_t id_child, fl_execute_parameter_t * const parameter, char *result) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_execute_as_parent(const fl_execute_as_t as, const pid_t id_child, fl_execute_parameter_t * const parameter, char *result) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_execute_program_) /** @@ -233,7 +233,7 @@ extern "C" { * @see fll_execute_program() */ #if !defined(_di_fll_execute_program_) - extern f_return_status private_fll_execute_fork(const f_string_t program, const f_string_t fixed_arguments[], fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_execute_fork(const f_string_t program, const f_string_t fixed_arguments[], fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_execute_program_) /** @@ -300,7 +300,7 @@ extern "C" { * @see fll_execute_program() */ #if !defined(_di_fll_execute_program_) - extern f_return_status private_fll_execute_fork_data(const f_string_t program, const f_string_t fixed_arguments[], fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_execute_fork_data(const f_string_t program, const f_string_t fixed_arguments[], fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, int *result) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_execute_program_) /** diff --git a/level_2/fll_file/c/file.c b/level_2/fll_file/c/file.c index 94c6811..98bedfb 100644 --- a/level_2/fll_file/c/file.c +++ b/level_2/fll_file/c/file.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fll_file_mode_set_all_ - f_return_status fll_file_mode_set_all(const f_string_t path, const mode_t mode, const f_number_unsigned_t depth_max) { + f_status_t fll_file_mode_set_all(const f_string_t path, const mode_t mode, const f_number_unsigned_t depth_max) { #ifndef _di_level_2_parameter_checking_ if (!path) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -16,7 +16,7 @@ extern "C" { #endif // _di_fll_file_mode_set_all_ #ifndef _di_fll_file_move_ - f_return_status fll_file_move(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const fl_directory_recurse_t recurse) { + f_status_t fll_file_move(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const fl_directory_recurse_t recurse) { #ifndef _di_level_2_parameter_checking_ if (!source) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -74,7 +74,7 @@ extern "C" { #endif // _di_fll_file_move_ #ifndef _di_fll_file_role_change_all_ - f_return_status fll_file_role_change_all(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max) { + f_status_t fll_file_role_change_all(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max) { #ifndef _di_level_2_parameter_checking_ if (!path) return F_status_set_error(F_parameter); if (uid == -1 && gid == -1) return F_status_set_error(F_parameter); diff --git a/level_2/fll_file/c/file.h b/level_2/fll_file/c/file.h index bd6b620..776c0b7 100644 --- a/level_2/fll_file/c/file.h +++ b/level_2/fll_file/c/file.h @@ -64,7 +64,7 @@ extern "C" { * Errors (with error bit) from: fl_directory_list(). */ #ifndef _di_fll_file_mode_set_all_ - extern f_return_status fll_file_mode_set_all(const f_string_t path, const mode_t mode, const f_number_unsigned_t depth_max); + extern f_status_t fll_file_mode_set_all(const f_string_t path, const mode_t mode, const f_number_unsigned_t depth_max); #endif // _di_fll_file_mode_set_all_ /** @@ -124,7 +124,7 @@ extern "C" { * @see fl_directory_clone() */ #ifndef _di_fll_file_move_ - extern f_return_status fll_file_move(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const fl_directory_recurse_t recurse); + extern f_status_t fll_file_move(const f_string_t source, const f_string_t destination, const f_string_length_t source_length, const f_string_length_t destination_length, const fl_directory_recurse_t recurse); #endif // _di_fll_file_move_ /** @@ -169,7 +169,7 @@ extern "C" { * Errors (with error bit) from: fl_directory_list(). */ #ifndef _di_fll_file_role_change_all_ - extern f_return_status fll_file_role_change_all(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max); + extern f_status_t fll_file_role_change_all(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max); #endif // _di_fll_file_role_change_all_ #ifdef __cplusplus diff --git a/level_2/fll_file/c/private-file.c b/level_2/fll_file/c/private-file.c index 93287af..e8ac1a4 100644 --- a/level_2/fll_file/c/private-file.c +++ b/level_2/fll_file/c/private-file.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fll_file_mode_set_all_) - f_return_status private_fll_file_mode_set_all(const f_string_t path, const mode_t mode, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) { + f_status_t private_fll_file_mode_set_all(const f_string_t path, const mode_t mode, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) { f_status_t status = F_none; status = f_directory_is(path); @@ -103,7 +103,7 @@ extern "C" { #endif // !defined(_di_fll_file_mode_set_all_) #if !defined(_di_fll_file_role_change_all_) - f_return_status private_fll_file_role_change_all(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) { + f_status_t private_fll_file_role_change_all(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) { f_status_t status = F_none; status = f_directory_is(path); diff --git a/level_2/fll_file/c/private-file.h b/level_2/fll_file/c/private-file.h index e272e03..972827a 100644 --- a/level_2/fll_file/c/private-file.h +++ b/level_2/fll_file/c/private-file.h @@ -45,7 +45,7 @@ extern "C" { * F_failure (with error bit) for any other error. */ #if !defined(_di_fll_file_mode_set_all_) - extern f_return_status private_fll_file_mode_set_all(const f_string_t path, const mode_t mode, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_file_mode_set_all(const f_string_t path, const mode_t mode, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_file_mode_set_all_) /** @@ -84,7 +84,7 @@ extern "C" { * F_failure (with error bit) for any other error. */ #if !defined(_di_fll_file_role_change_all_) - extern f_return_status private_fll_file_role_change_all(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_file_role_change_all(const f_string_t path, const uid_t uid, const gid_t gid, const bool dereference, const f_number_unsigned_t depth_max, const f_number_unsigned_t depth) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_file_role_change_all_) #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss.c b/level_2/fll_fss/c/fss.c index 01c7bbb..6974354 100644 --- a/level_2/fll_fss/c/fss.c +++ b/level_2/fll_fss/c/fss.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fll_fss_identify_ - f_return_status fll_fss_identify(const f_string_static_t buffer, f_fss_header_t *header) { + f_status_t fll_fss_identify(const f_string_static_t buffer, f_fss_header_t *header) { #ifndef _di_level_2_parameter_checking_ if (!header) return F_status_set_error(F_parameter); if (!buffer.used) return F_status_set_error(F_parameter); @@ -17,7 +17,7 @@ extern "C" { #endif // _di_fll_fss_identify_ #ifndef _di_fll_fss_identify_file_ - f_return_status fll_fss_identify_file(f_file_t *file, f_fss_header_t *header) { + f_status_t fll_fss_identify_file(f_file_t *file, f_fss_header_t *header) { #ifndef _di_level_2_parameter_checking_ if (!file) return F_status_set_error(F_parameter); if (!header) return F_status_set_error(F_parameter); @@ -47,7 +47,7 @@ extern "C" { #endif // _di_fll_fss_identify_file_ #ifndef _di_fll_fss_snatch_ - f_return_status fll_fss_snatch(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_dynamic_t *values[], f_array_length_t *indexs[]) { + f_status_t fll_fss_snatch(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_dynamic_t *values[], f_array_length_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -99,7 +99,7 @@ extern "C" { #endif // _di_fll_fss_snatch_ #ifndef _di_fll_fss_snatch_apart_ - f_return_status fll_fss_snatch_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_dynamics_t *values[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_dynamics_t *values[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -167,7 +167,7 @@ extern "C" { #endif // _di_fll_fss_snatch_apart_ #ifndef _di_fll_fss_snatch_map_ - f_return_status fll_fss_snatch_map(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_maps_t *values[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_map(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_maps_t *values[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -300,7 +300,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_ #ifndef _di_fll_fss_snatch_map_apart_ - f_return_status fll_fss_snatch_map_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_map_multis_t *values[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_map_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_map_multis_t *values[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -393,7 +393,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_apart_ #ifndef _di_fll_fss_snatch_map_mash_ - f_return_status fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_maps_t *values[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_maps_t *values[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -477,7 +477,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_mash_ #ifndef _di_fll_fss_snatch_map_mash_apart_ - f_return_status fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_map_multis_t *values[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_map_multis_t *values[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -611,7 +611,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_mash_apart_ #ifndef _di_fll_fss_snatch_map_together_ - f_return_status fll_fss_snatch_map_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_maps_t *values[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_maps_t *values[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -746,7 +746,7 @@ extern "C" { #endif // _di_fll_fss_snatch_map_together_ #ifndef _di_fll_fss_snatch_mash_ - f_return_status fll_fss_snatch_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamic_t *values[], f_array_length_t *indexs[]) { + f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamic_t *values[], f_array_length_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -799,7 +799,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_ #ifndef _di_fll_fss_snatch_mash_apart_ - f_return_status fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamics_t *values[], f_array_lengths_t *indexs[]) { + f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamics_t *values[], f_array_lengths_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); @@ -873,7 +873,7 @@ extern "C" { #endif // _di_fll_fss_snatch_mash_apart_ #ifndef _di_fll_fss_snatch_together_ - f_return_status fll_fss_snatch_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamic_t *values[], f_array_length_t *indexs[]) { + f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamic_t *values[], f_array_length_t *indexs[]) { #ifndef _di_level_2_parameter_checking_ if (!size) return F_status_set_error(F_parameter); if (objects.used != contents.used) return F_status_set_error(F_parameter); diff --git a/level_2/fll_fss/c/fss.h b/level_2/fll_fss/c/fss.h index 1ae4d5c..1b3f4b2 100644 --- a/level_2/fll_fss/c/fss.h +++ b/level_2/fll_fss/c/fss.h @@ -47,7 +47,7 @@ extern "C" { * Errors (with error bit) from: fl_conversion_string_to_hexidecimal_unsigned(). */ #ifndef _di_fll_fss_identify_ - extern f_return_status fll_fss_identify(const f_string_static_t buffer, f_fss_header_t *header); + extern f_status_t fll_fss_identify(const f_string_static_t buffer, f_fss_header_t *header); #endif // _di_fll_fss_identify_ /** @@ -73,7 +73,7 @@ extern "C" { * @see f_file_read_until() */ #ifndef _di_fll_fss_identify_file_ - extern f_return_status fll_fss_identify_file(f_file_t *file, f_fss_header_t *header); + extern f_status_t fll_fss_identify_file(f_file_t *file, f_fss_header_t *header); #endif // _di_fll_fss_identify_file_ /** @@ -117,7 +117,7 @@ extern "C" { * @see fl_string_dynamic_partial_append_nulless() */ #ifndef _di_fll_fss_snatch_ - extern f_return_status fll_fss_snatch(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_dynamic_t *values[], f_array_length_t *indexs[]); + extern f_status_t fll_fss_snatch(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_dynamic_t *values[], f_array_length_t *indexs[]); #endif // _di_fll_fss_snatch_ /** @@ -163,7 +163,7 @@ extern "C" { * @see fl_string_dynamic_partial_append_nulless() */ #ifndef _di_fll_fss_snatch_apart_ - extern f_return_status fll_fss_snatch_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_dynamics_t *values[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_dynamics_t *values[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_apart_ /** @@ -211,7 +211,7 @@ extern "C" { * @see fl_string_dynamic_partial_append_nulless() */ #ifndef _di_fll_fss_snatch_map_ - extern f_return_status fll_fss_snatch_map(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_maps_t *values[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_map(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_maps_t *values[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_map_ /** @@ -261,7 +261,7 @@ extern "C" { * @see fl_string_dynamic_partial_append_nulless() */ #ifndef _di_fll_fss_snatch_map_apart_ - extern f_return_status fll_fss_snatch_map_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_map_multis_t *values[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_map_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, f_string_map_multis_t *values[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_map_apart_ /** @@ -311,7 +311,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_partial_mash_nulless(). */ #ifndef _di_fll_fss_snatch_map_mash_ - extern f_return_status fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_maps_t *values[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_map_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_maps_t *values[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_map_mash_ /** @@ -365,7 +365,7 @@ extern "C" { * @see fl_string_dynamic_partial_mash_nulless() */ #ifndef _di_fll_fss_snatch_map_mash_apart_ - extern f_return_status fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_map_multis_t *values[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_map_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_map_multis_t *values[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_map_mash_apart_ /** @@ -418,7 +418,7 @@ extern "C" { * @see fl_string_dynamic_partial_mash_nulless() */ #ifndef _di_fll_fss_snatch_map_together_ - extern f_return_status fll_fss_snatch_map_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_maps_t *values[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_map_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_maps_t *values[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_map_together_ /** @@ -465,7 +465,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_partial_mash_nulless(). */ #ifndef _di_fll_fss_snatch_mash_ - extern f_return_status fll_fss_snatch_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamic_t *values[], f_array_length_t *indexs[]); + extern f_status_t fll_fss_snatch_mash(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamic_t *values[], f_array_length_t *indexs[]); #endif // _di_fll_fss_snatch_mash_ /** @@ -516,7 +516,7 @@ extern "C" { * @see fl_string_dynamic_partial_mash_nulless() */ #ifndef _di_fll_fss_snatch_mash_apart_ - extern f_return_status fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamics_t *values[], f_array_lengths_t *indexs[]); + extern f_status_t fll_fss_snatch_mash_apart(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamics_t *values[], f_array_lengths_t *indexs[]); #endif // _di_fll_fss_snatch_mash_apart_ /** @@ -560,7 +560,7 @@ extern "C" { * @see fl_string_dynamic_partial_append_nulless() */ #ifndef _di_fll_fss_snatch_together_ - extern f_return_status fll_fss_snatch_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamic_t *values[], f_array_length_t *indexs[]); + extern f_status_t fll_fss_snatch_together(const f_string_static_t buffer, const f_fss_objects_t objects, const f_fss_contents_t contents, const f_string_t names[], const f_string_length_t lengths[], const f_string_length_t size, const f_string_t glue, const f_string_length_t glue_length, f_string_dynamic_t *values[], f_array_length_t *indexs[]); #endif // _di_fll_fss_snatch_together_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_basic.c b/level_2/fll_fss/c/fss_basic.c index 9bf7362..5110406 100644 --- a/level_2/fll_fss/c/fss_basic.c +++ b/level_2/fll_fss/c/fss_basic.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_basic_read_ - f_return_status fll_fss_basic_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_quotes_t *objects_quoted, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) { + f_status_t fll_fss_basic_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_quotes_t *objects_quoted, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) { #ifndef _di_level_2_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!objects) return F_status_set_error(F_parameter); @@ -155,7 +155,7 @@ extern "C" { #endif // _di_fll_fss_basic_read_ #ifndef _di_fll_fss_basic_write_string_ - f_return_status fll_fss_basic_write_string(const f_string_static_t object, const f_string_static_t content, const f_fss_quote_t quote, f_string_dynamic_t *destination) { + f_status_t fll_fss_basic_write_string(const f_string_static_t object, const f_string_static_t content, const f_fss_quote_t quote, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_fss/c/fss_basic.h b/level_2/fll_fss/c/fss_basic.h index fc89b2d..5e5d660 100644 --- a/level_2/fll_fss/c/fss_basic.h +++ b/level_2/fll_fss/c/fss_basic.h @@ -67,7 +67,7 @@ extern "C" { * Errors (with error bit) from: fl_fss_basic_object_read(). */ #ifndef _di_fll_fss_basic_read_ - extern f_return_status fll_fss_basic_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_quotes_t *objects_quoted, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits); + extern f_status_t fll_fss_basic_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_quotes_t *objects_quoted, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits); #endif // _di_fll_fss_basic_read_ /** @@ -99,7 +99,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #ifndef _di_fll_fss_basic_write_string_ - extern f_return_status fll_fss_basic_write_string(const f_string_static_t object, const f_string_static_t content, const f_fss_quote_t quote, f_string_dynamic_t *destination); + extern f_status_t fll_fss_basic_write_string(const f_string_static_t object, const f_string_static_t content, const f_fss_quote_t quote, f_string_dynamic_t *destination); #endif // _di_fll_fss_basic_write_string_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_basic_list.c b/level_2/fll_fss/c/fss_basic_list.c index ac8e6b5..a72026f 100644 --- a/level_2/fll_fss/c/fss_basic_list.c +++ b/level_2/fll_fss/c/fss_basic_list.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_basic_list_read_ - f_return_status fll_fss_basic_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) { + f_status_t fll_fss_basic_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) { #ifndef _di_level_2_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!objects) return F_status_set_error(F_parameter); @@ -130,7 +130,7 @@ extern "C" { #endif // _di_fll_fss_basic_list_read_ #ifndef _di_fll_fss_basic_list_write_string_ - f_return_status fll_fss_basic_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, f_string_dynamic_t *destination) { + f_status_t fll_fss_basic_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_fss/c/fss_basic_list.h b/level_2/fll_fss/c/fss_basic_list.h index 57f1f09..fa63b1c 100644 --- a/level_2/fll_fss/c/fss_basic_list.h +++ b/level_2/fll_fss/c/fss_basic_list.h @@ -66,7 +66,7 @@ extern "C" { * Errors (with error bit) from: fl_fss_basic_list_object_read(). */ #ifndef _di_fll_fss_basic_list_read_ - extern f_return_status fll_fss_basic_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments); + extern f_status_t fll_fss_basic_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments); #endif // _di_fll_fss_basic_list_read_ /** @@ -98,7 +98,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #ifndef _di_fll_fss_basic_list_write_string_ - extern f_return_status fll_fss_basic_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, f_string_dynamic_t *destination); + extern f_status_t fll_fss_basic_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, f_string_dynamic_t *destination); #endif // _di_fll_fss_basic_list_write_string_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_embedded_list.c b/level_2/fll_fss/c/fss_embedded_list.c index 77735f2..635f8b3 100644 --- a/level_2/fll_fss/c/fss_embedded_list.c +++ b/level_2/fll_fss/c/fss_embedded_list.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_embedded_list_read_ - f_return_status fll_fss_embedded_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_nest_t *nest, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) { + f_status_t fll_fss_embedded_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_nest_t *nest, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) { #ifndef _di_level_2_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!nest) return F_status_set_error(F_parameter); @@ -114,7 +114,7 @@ extern "C" { #endif // _di_fll_fss_embedded_list_read_ #ifndef _di_fll_fss_embedded_list_write_string_ - f_return_status fll_fss_embedded_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t *destination) { + f_status_t fll_fss_embedded_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_fss/c/fss_embedded_list.h b/level_2/fll_fss/c/fss_embedded_list.h index 05f95fa..b12d545 100644 --- a/level_2/fll_fss/c/fss_embedded_list.h +++ b/level_2/fll_fss/c/fss_embedded_list.h @@ -70,7 +70,7 @@ extern "C" { * Errors (with error bit) from: fl_fss_embedded_list_object_read(). */ #ifndef _di_fll_fss_embedded_list_read_ - extern f_return_status fll_fss_embedded_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_nest_t *nest, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments); + extern f_status_t fll_fss_embedded_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_nest_t *nest, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments); #endif // _di_fll_fss_embedded_list_read_ /** @@ -107,7 +107,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #ifndef _di_fll_fss_embedded_list_write_string_ - extern f_return_status fll_fss_embedded_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t *destination); + extern f_status_t fll_fss_embedded_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t *destination); #endif // _di_fll_fss_embedded_list_write_string_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_extended.c b/level_2/fll_fss/c/fss_extended.c index 7bccfb9..feb9fef 100644 --- a/level_2/fll_fss/c/fss_extended.c +++ b/level_2/fll_fss/c/fss_extended.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_extended_read_ - f_return_status fll_fss_extended_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_quotes_t *objects_quoted, f_fss_quotess_t *contents_quoted, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) { + f_status_t fll_fss_extended_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_quotes_t *objects_quoted, f_fss_quotess_t *contents_quoted, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) { #ifndef _di_level_2_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!objects) return F_status_set_error(F_parameter); @@ -191,7 +191,7 @@ extern "C" { #endif // _di_fll_fss_extended_read_ #ifndef _di_fll_fss_extended_write_string_ - f_return_status fll_fss_extended_write_string(const f_string_static_t object, const f_string_statics_t contents, const f_fss_quote_t quote, f_string_dynamic_t *destination) { + f_status_t fll_fss_extended_write_string(const f_string_static_t object, const f_string_statics_t contents, const f_fss_quote_t quote, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_fss/c/fss_extended.h b/level_2/fll_fss/c/fss_extended.h index 6f2aaa3..50c9e40 100644 --- a/level_2/fll_fss/c/fss_extended.h +++ b/level_2/fll_fss/c/fss_extended.h @@ -68,7 +68,7 @@ extern "C" { * Errors (with error bit) from: fl_fss_extended_object_read(). */ #ifndef _di_fll_fss_extended_read_ - extern f_return_status fll_fss_extended_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_quotes_t *objects_quoted, f_fss_quotess_t *contents_quoted, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits); + extern f_status_t fll_fss_extended_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_quotes_t *objects_quoted, f_fss_quotess_t *contents_quoted, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits); #endif // _di_fll_fss_extended_read_ /** @@ -100,7 +100,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #ifndef _di_fll_fss_extended_write_string_ - extern f_return_status fll_fss_extended_write_string(const f_string_static_t object, const f_string_statics_t contents, const f_fss_quote_t quote, f_string_dynamic_t *destination); + extern f_status_t fll_fss_extended_write_string(const f_string_static_t object, const f_string_statics_t contents, const f_fss_quote_t quote, f_string_dynamic_t *destination); #endif // _di_fll_fss_extended_write_string_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_extended_list.c b/level_2/fll_fss/c/fss_extended_list.c index 682c6fa..3b21093 100644 --- a/level_2/fll_fss/c/fss_extended_list.c +++ b/level_2/fll_fss/c/fss_extended_list.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_extended_list_read_ - f_return_status fll_fss_extended_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) { + f_status_t fll_fss_extended_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) { #ifndef _di_level_2_parameter_checking_ if (!range) return F_status_set_error(F_parameter); if (!objects) return F_status_set_error(F_parameter); @@ -130,7 +130,7 @@ extern "C" { #endif // _di_fll_fss_extended_list_read_ #ifndef _di_fll_fss_extended_list_write_string_ - f_return_status fll_fss_extended_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t *destination) { + f_status_t fll_fss_extended_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!destination) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_fss/c/fss_extended_list.h b/level_2/fll_fss/c/fss_extended_list.h index a6d46e7..f2a6c22 100644 --- a/level_2/fll_fss/c/fss_extended_list.h +++ b/level_2/fll_fss/c/fss_extended_list.h @@ -74,7 +74,7 @@ extern "C" { * Errors (with error bit) from: fl_fss_extended_list_object_read(). */ #ifndef _di_fll_fss_extended_list_read_ - extern f_return_status fll_fss_extended_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments); + extern f_status_t fll_fss_extended_list_read(const f_string_static_t buffer, f_string_range_t *range, f_fss_objects_t *objects, f_fss_contents_t *contents, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments); #endif // _di_fll_fss_extended_list_read_ /** @@ -111,7 +111,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #ifndef _di_fll_fss_extended_list_write_string_ - extern f_return_status fll_fss_extended_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t *destination); + extern f_status_t fll_fss_extended_list_write_string(const f_string_static_t object, const f_string_static_t content, const f_string_static_t *content_prepend, const f_string_ranges_t *ignore, f_string_dynamic_t *destination); #endif // _di_fll_fss_extended_list_write_string_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/fss_status.c b/level_2/fll_fss/c/fss_status.c index 5f96ab5..2438f3f 100644 --- a/level_2/fll_fss/c/fss_status.c +++ b/level_2/fll_fss/c/fss_status.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_fss_status_from_string_ - f_return_status fll_fss_status_from_string(const f_string_t string, f_status_t *code) { + f_status_t fll_fss_status_from_string(const f_string_t string, f_status_t *code) { #ifndef _di_level_2_parameter_checking_ if (!code) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -109,7 +109,7 @@ extern "C" { #endif // _di_fll_fss_status_from_string_ #ifndef _di_fll_fss_status_to_string_ - f_return_status fll_fss_status_to_string(const f_status_t code, f_string_t *string) { + f_status_t fll_fss_status_to_string(const f_status_t code, f_string_t *string) { #ifndef _di_level_2_parameter_checking_ if (!string) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ @@ -182,7 +182,7 @@ extern "C" { #endif // _di_fll_status_to_string_ #ifndef _di_fll_fss_status_is_error_ - f_return_status fll_fss_status_is_error(const f_status_t code) { + f_status_t fll_fss_status_is_error(const f_status_t code) { if (fll_fss_status_is_fine(code) == F_true) { return F_false; @@ -196,7 +196,7 @@ extern "C" { #endif // _di_fll_fss_status_is_error_ #ifndef _di_fll_fss_status_is_warning_ - f_return_status fll_fss_status_is_warning(const f_status_t code) { + f_status_t fll_fss_status_is_warning(const f_status_t code) { switch (code) { #ifndef _di_fll_fss_status_basic_ @@ -225,7 +225,7 @@ extern "C" { #endif // _di_fll_fss_status_is_warning_ #ifndef _di_fll_fss_status_is_fine_ - f_return_status fll_fss_status_is_fine(const f_status_t code) { + f_status_t fll_fss_status_is_fine(const f_status_t code) { switch (code) { #ifndef _di_fll_fss_status_booleans_ diff --git a/level_2/fll_fss/c/fss_status.h b/level_2/fll_fss/c/fss_status.h index 57b9ef9..995be8a 100644 --- a/level_2/fll_fss/c/fss_status.h +++ b/level_2/fll_fss/c/fss_status.h @@ -102,7 +102,7 @@ extern "C" { * Errors (with error bit) from: f_conversion_character_is_decimal(). */ #ifndef _di_fll_fss_status_from_string_ - extern f_return_status fll_fss_status_from_string(const f_string_t string, f_status_t *code); + extern f_status_t fll_fss_status_from_string(const f_string_t string, f_status_t *code); #endif // _di_fll_fss_status_to_string_ /** @@ -122,7 +122,7 @@ extern "C" { * @see fl_status_to_string() */ #ifndef _di_fll_fss_status_to_string_ - extern f_return_status fll_fss_status_to_string(const f_status_t code, f_string_t *string); + extern f_status_t fll_fss_status_to_string(const f_status_t code, f_string_t *string); #endif // _di_fll_status_to_string_ /** @@ -136,7 +136,7 @@ extern "C" { * F_false otherwise. */ #ifndef _di_fll_fss_status_is_error_ - extern f_return_status fll_fss_status_is_error(const f_status_t code); + extern f_status_t fll_fss_status_is_error(const f_status_t code); #endif // _di_fll_fss_status_is_error_ /** @@ -150,7 +150,7 @@ extern "C" { * F_false otherwise. */ #ifndef _di_fll_fss_status_is_warning_ - extern f_return_status fll_fss_status_is_warning(const f_status_t code); + extern f_status_t fll_fss_status_is_warning(const f_status_t code); #endif // _di_fll_fss_status_is_warning_ /** @@ -164,7 +164,7 @@ extern "C" { * F_false otherwise. */ #ifndef _di_fll_fss_status_is_fine_ - extern f_return_status fll_fss_status_is_fine(const f_status_t code); + extern f_status_t fll_fss_status_is_fine(const f_status_t code); #endif // _di_fll_fss_status_is_fine_ #ifdef __cplusplus diff --git a/level_2/fll_fss/c/private-fss.c b/level_2/fll_fss/c/private-fss.c index d43693b..c7ef67a 100644 --- a/level_2/fll_fss/c/private-fss.c +++ b/level_2/fll_fss/c/private-fss.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fll_fss_identify_) || !defined(_di_fll_fss_identify_file_) - f_return_status private_fll_fss_identify(const f_string_static_t buffer, f_fss_header_t *header) { + f_status_t private_fll_fss_identify(const f_string_static_t buffer, f_fss_header_t *header) { register f_string_length_t i = 0; if (buffer.used < 10) { diff --git a/level_2/fll_fss/c/private-fss.h b/level_2/fll_fss/c/private-fss.h index 75f90f7..8d67142 100644 --- a/level_2/fll_fss/c/private-fss.h +++ b/level_2/fll_fss/c/private-fss.h @@ -37,7 +37,7 @@ extern "C" { * @see fll_fss_identify_file() */ #if !defined(_di_fll_fss_identify_) || !defined(_di_fll_fss_identify_file_) - extern f_return_status private_fll_fss_identify(const f_string_static_t buffer, f_fss_header_t *header) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_fss_identify(const f_string_static_t buffer, f_fss_header_t *header) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_fss_identify_) || !defined(_di_fll_fss_identify_file_) #ifdef __cplusplus diff --git a/level_2/fll_iki/c/iki.c b/level_2/fll_iki/c/iki.c index 0092496..08e1927 100644 --- a/level_2/fll_iki/c/iki.c +++ b/level_2/fll_iki/c/iki.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fll_iki_content_escape_ - f_return_status fll_iki_content_escape(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *escaped) { + f_status_t fll_iki_content_escape(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *escaped) { #ifndef _di_level_2_parameter_checking_ if (content.used > content.size) return F_status_set_error(F_parameter); if (quote != f_iki_syntax_quote_single && quote != f_iki_syntax_quote_double) return F_status_set_error(F_parameter); @@ -20,7 +20,7 @@ extern "C" { #endif // _di_fll_iki_content_escape_ #ifndef _di_fll_iki_content_partial_escape_ - f_return_status fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *escaped) { + f_status_t fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *escaped) { #ifndef _di_level_2_parameter_checking_ if (content.used > content.size) return F_status_set_error(F_parameter); if (range.start > range.stop) return F_status_set_error(F_parameter); @@ -34,7 +34,7 @@ extern "C" { #endif // _di_fll_iki_content_partial_escape_ #ifndef _di_fll_iki_content_escape_un_ - f_return_status fll_iki_content_escape_un(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *unescaped) { + f_status_t fll_iki_content_escape_un(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *unescaped) { #ifndef _di_level_2_parameter_checking_ if (content.used > content.size) return F_status_set_error(F_parameter); if (quote != f_iki_syntax_quote_single && quote != f_iki_syntax_quote_double) return F_status_set_error(F_parameter); @@ -48,7 +48,7 @@ extern "C" { #endif // _di_fll_iki_content_escape_un_ #ifndef _di_fll_iki_content_partial_escape_un_ - f_return_status fll_iki_content_partial_escape_un(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *unescaped) { + f_status_t fll_iki_content_partial_escape_un(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *unescaped) { #ifndef _di_level_2_parameter_checking_ if (content.used > content.size) return F_status_set_error(F_parameter); if (range.start > range.stop) return F_status_set_error(F_parameter); diff --git a/level_2/fll_iki/c/iki.h b/level_2/fll_iki/c/iki.h index c0d3f74..2a90983 100644 --- a/level_2/fll_iki/c/iki.h +++ b/level_2/fll_iki/c/iki.h @@ -56,7 +56,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #ifndef _di_fll_iki_content_escape_ - extern f_return_status fll_iki_content_escape(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *escaped); + extern f_status_t fll_iki_content_escape(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *escaped); #endif // _di_fll_iki_content_escape_ /** @@ -83,7 +83,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #ifndef _di_fll_iki_content_partial_escape_ - extern f_return_status fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *escaped); + extern f_status_t fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *escaped); #endif // _di_fll_iki_content_partial_escape_ /** @@ -109,7 +109,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #ifndef _di_fll_iki_content_escape_un_ - extern f_return_status fll_iki_content_escape_un(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *unescaped); + extern f_status_t fll_iki_content_escape_un(const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *unescaped); #endif // _di_fll_iki_content_escape_un_ /** @@ -137,7 +137,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #ifndef _di_fll_iki_content_partial_escape_un_ - extern f_return_status fll_iki_content_partial_escape_un(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *unescaped); + extern f_status_t fll_iki_content_partial_escape_un(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *unescaped); #endif // _di_fll_iki_content_partial_escape_un_ #ifdef __cplusplus diff --git a/level_2/fll_iki/c/private-iki.c b/level_2/fll_iki/c/private-iki.c index b110c7c..305f56b 100644 --- a/level_2/fll_iki/c/private-iki.c +++ b/level_2/fll_iki/c/private-iki.c @@ -6,7 +6,7 @@ extern "C" { #endif #if !defined(_di_fll_iki_content_escape_) || !defined(_di_fll_iki_content_partial_escape_) - f_return_status private_fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *escaped) { + f_status_t private_fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *escaped) { f_status_t status = F_none; // ensure escaped is at least the same size as content. @@ -70,7 +70,7 @@ extern "C" { #endif // !defined(_di_fll_iki_content_escape_) || !defined(_di_fll_iki_content_partial_escape_) #if !defined(_di_fll_iki_content_escape_un_) || !defined(_di_fll_iki_content_partial_escape_un_) - f_return_status private_fll_iki_content_partial_escape_un(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *unescaped) { + f_status_t private_fll_iki_content_partial_escape_un(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *unescaped) { f_status_t status = F_none; // ensure escaped is at least the same size as content. diff --git a/level_2/fll_iki/c/private-iki.h b/level_2/fll_iki/c/private-iki.h index 4e6efab..6ef0328 100644 --- a/level_2/fll_iki/c/private-iki.h +++ b/level_2/fll_iki/c/private-iki.h @@ -39,7 +39,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #if !defined(_di_fll_iki_content_escape_) || !defined(_di_fll_iki_content_partial_escape_) - extern f_return_status private_fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *escaped) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_iki_content_partial_escape(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *escaped) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_iki_content_escape_) || !defined(_di_fll_iki_content_partial_escape_) /** @@ -67,7 +67,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_increase_by(). */ #if !defined(_di_fll_iki_content_escape_un_) || !defined(_di_fll_iki_content_partial_escape_un_) - extern f_return_status private_fll_iki_content_partial_escape_un(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *unescaped) f_gcc_attribute_visibility_internal; + extern f_status_t private_fll_iki_content_partial_escape_un(const f_string_static_t content, const f_string_range_t range, const uint8_t quote, f_string_dynamic_t *unescaped) f_gcc_attribute_visibility_internal; #endif // !defined(_di_fll_iki_content_escape_un_) || !defined(_di_fll_iki_content_partial_escape_un_) #ifdef __cplusplus diff --git a/level_2/fll_path/c/path.c b/level_2/fll_path/c/path.c index 118cd26..2199f60 100644 --- a/level_2/fll_path/c/path.c +++ b/level_2/fll_path/c/path.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_path_canonical_ - f_return_status fll_path_canonical(const f_string_t path, f_string_dynamic_t *canonical) { + f_status_t fll_path_canonical(const f_string_t path, f_string_dynamic_t *canonical) { #ifndef _di_level_2_parameter_checking_ if (!canonical) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_path/c/path.h b/level_2/fll_path/c/path.h index c264675..fed68ca 100644 --- a/level_2/fll_path/c/path.h +++ b/level_2/fll_path/c/path.h @@ -52,7 +52,7 @@ extern "C" { * Errors (with error bit) from: fl_string_dynamic_terminate_after(). */ #ifndef _di_fll_path_canonical_ - extern f_return_status fll_path_canonical(const f_string_t path, f_string_dynamic_t *canonical); + extern f_status_t fll_path_canonical(const f_string_t path, f_string_dynamic_t *canonical); #endif // _di_fll_path_canonical_ #ifdef __cplusplus diff --git a/level_2/fll_program/c/program.c b/level_2/fll_program/c/program.c index 1339263..8363a31 100644 --- a/level_2/fll_program/c/program.c +++ b/level_2/fll_program/c/program.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_program_print_help_header_ - f_return_status fll_program_print_help_header(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t version) { + f_status_t fll_program_print_help_header(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t version) { fprintf(file.stream, "%c", f_string_eol_s[0]); fl_color_print(file.stream, context.set.title, " %s", name); @@ -21,7 +21,7 @@ extern "C" { #endif // _di_fll_program_print_help_header_ #ifndef _di_fll_program_print_help_option_ - f_return_status fll_program_print_help_option(const f_file_t file, const f_color_context_t context, const f_string_t option_short, const f_string_t option_long, const f_string_t symbol_short, const f_string_t symbol_long, const f_string_t description) { + f_status_t fll_program_print_help_option(const f_file_t file, const f_color_context_t context, const f_string_t option_short, const f_string_t option_long, const f_string_t symbol_short, const f_string_t symbol_long, const f_string_t description) { fprintf(file.stream, "%c %s", f_string_eol_s[0], symbol_short); fl_color_print(file.stream, context.set.standout, option_short); @@ -36,7 +36,7 @@ extern "C" { #endif // _di_fll_program_print_help_option_ #ifndef _di_fll_program_print_help_option_long_ - f_return_status fll_program_print_help_option_long(const f_file_t file, const f_color_context_t context, const f_string_t option_long, const f_string_t symbol_long, const f_string_t description) { + f_status_t fll_program_print_help_option_long(const f_file_t file, const f_color_context_t context, const f_string_t option_long, const f_string_t symbol_long, const f_string_t description) { fprintf(file.stream, "%c %s", f_string_eol_s[0], symbol_long); fl_color_print(file.stream, context.set.standout, option_long); @@ -48,7 +48,7 @@ extern "C" { #endif // _di_fll_program_print_help_option_long_ #ifndef _di_fll_program_print_help_option_other_ - f_return_status fll_program_print_help_option_other(const f_file_t file, const f_color_context_t context, const f_string_t option_other, const f_string_t description) { + f_status_t fll_program_print_help_option_other(const f_file_t file, const f_color_context_t context, const f_string_t option_other, const f_string_t description) { fprintf(file.stream, "%c ", f_string_eol_s[0]); fl_color_print(file.stream, context.set.standout, option_other); @@ -60,7 +60,7 @@ extern "C" { #endif // _di_fll_program_print_help_option_other_ #ifndef _di_fll_program_print_help_usage_ - f_return_status fll_program_print_help_usage(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t parameters) { + f_status_t fll_program_print_help_usage(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t parameters) { fprintf(file.stream, "%c%c", f_string_eol_s[0], f_string_eol_s[0]); fl_color_print(file.stream, context.set.important, " Usage:"); @@ -89,7 +89,7 @@ extern "C" { #endif // _di_fll_program_print_help_usage_ #ifndef _di_fll_program_print_version_ - f_return_status fll_program_print_version(const f_file_t file, const f_string_t version) { + f_status_t fll_program_print_version(const f_file_t file, const f_string_t version) { fprintf(file.stream, "%s%c", version, f_string_eol_s[0]); @@ -98,7 +98,7 @@ extern "C" { #endif // _di_fll_program_print_version_ #ifndef _di_fll_program_parameter_process_ - f_return_status fll_program_parameter_process(const f_console_arguments_t arguments, f_console_parameters_t parameters, const f_console_parameter_ids_t choices, const bool right, f_string_lengths_t *remaining, f_color_context_t *context) { + f_status_t fll_program_parameter_process(const f_console_arguments_t arguments, f_console_parameters_t parameters, const f_console_parameter_ids_t choices, const bool right, f_string_lengths_t *remaining, f_color_context_t *context) { f_status_t status = F_none; status = f_console_parameter_process(arguments, parameters, remaining); @@ -133,7 +133,7 @@ extern "C" { #endif // _di_fll_program_parameter_process_ #ifndef _di_fll_program_parameter_additional_append_ - f_return_status fll_program_parameter_additional_append(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination) { + f_status_t fll_program_parameter_additional_append(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -176,7 +176,7 @@ extern "C" { #endif // _di_fll_program_parameter_additional_append_ #ifndef _di_fll_program_parameter_additional_mash_ - f_return_status fll_program_parameter_additional_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { + f_status_t fll_program_parameter_additional_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); if (glue_length < 1) return F_status_set_error(F_parameter); @@ -207,7 +207,7 @@ extern "C" { #endif // _di_fll_program_parameter_additional_mash_ #ifndef _di_fll_program_parameter_additional_rip_ - f_return_status fll_program_parameter_additional_rip(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination) { + f_status_t fll_program_parameter_additional_rip(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); if (!destination) return F_status_set_error(F_parameter); @@ -251,7 +251,7 @@ extern "C" { #endif // _di_fll_program_parameter_additional_rip_ #ifndef _di_fll_program_parameter_additional_rip_mash_ - f_return_status fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { + f_status_t fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination) { #ifndef _di_level_2_parameter_checking_ if (!argv) return F_status_set_error(F_parameter); if (glue_length < 1) return F_status_set_error(F_parameter); diff --git a/level_2/fll_program/c/program.h b/level_2/fll_program/c/program.h index 1bebeaf..b266736 100644 --- a/level_2/fll_program/c/program.h +++ b/level_2/fll_program/c/program.h @@ -49,7 +49,7 @@ extern "C" { * @param fl_color_print() */ #ifndef _di_fll_program_print_help_header_ - extern f_return_status fll_program_print_help_header(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t version); + extern f_status_t fll_program_print_help_header(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t version); #endif // _di_fll_program_print_help_header_ /** @@ -78,7 +78,7 @@ extern "C" { * @param fl_color_print() */ #ifndef _di_fll_program_print_help_option_ - extern f_return_status fll_program_print_help_option(const f_file_t file, const f_color_context_t context, const f_string_t option_short, const f_string_t option_long, const f_string_t symbol_short, const f_string_t symbol_long, const f_string_t description); + extern f_status_t fll_program_print_help_option(const f_file_t file, const f_color_context_t context, const f_string_t option_short, const f_string_t option_long, const f_string_t symbol_short, const f_string_t symbol_long, const f_string_t description); #endif // _di_fll_program_print_help_option_ /** @@ -103,7 +103,7 @@ extern "C" { * @param fl_color_print() */ #ifndef _di_fll_program_print_help_option_long_ - extern f_return_status fll_program_print_help_option_long(const f_file_t file, const f_color_context_t context, const f_string_t option_long, const f_string_t symbol_long, const f_string_t description); + extern f_status_t fll_program_print_help_option_long(const f_file_t file, const f_color_context_t context, const f_string_t option_long, const f_string_t symbol_long, const f_string_t description); #endif // _di_fll_program_print_help_option_long_ /** @@ -126,7 +126,7 @@ extern "C" { * @param fl_color_print() */ #ifndef _di_fll_program_print_help_option_other_ - extern f_return_status fll_program_print_help_option_other(const f_file_t file, const f_color_context_t context, const f_string_t option_other, const f_string_t description); + extern f_status_t fll_program_print_help_option_other(const f_file_t file, const f_color_context_t context, const f_string_t option_other, const f_string_t description); #endif // _di_fll_program_print_help_option_other_ /** @@ -150,7 +150,7 @@ extern "C" { * @param fl_color_print() */ #ifndef _di_fll_program_print_help_usage_ - extern f_return_status fll_program_print_help_usage(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t parameters); + extern f_status_t fll_program_print_help_usage(const f_file_t file, const f_color_context_t context, const f_string_t name, const f_string_t parameters); #endif // _di_fll_program_print_help_usage_ /** @@ -165,7 +165,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fll_program_print_version_ - extern f_return_status fll_program_print_version(const f_file_t file, const f_string_t version); + extern f_status_t fll_program_print_version(const f_file_t file, const f_string_t version); #endif // _di_fll_program_print_version_ /** @@ -202,7 +202,7 @@ extern "C" { * @see fl_color_load_context() */ #ifndef _di_fll_program_parameter_process_ - extern f_return_status fll_program_parameter_process(const f_console_arguments_t arguments, f_console_parameters_t parameters, const f_console_parameter_ids_t choices, const bool right, f_string_lengths_t *remaining, f_color_context_t *context); + extern f_status_t fll_program_parameter_process(const f_console_arguments_t arguments, f_console_parameters_t parameters, const f_console_parameter_ids_t choices, const bool right, f_string_lengths_t *remaining, f_color_context_t *context); #endif // _di_fll_program_parameter_process_ /** @@ -232,7 +232,7 @@ extern "C" { * @see fl_string_append() */ #ifndef _di_fll_program_parameter_additional_append_ - extern f_return_status fll_program_parameter_additional_append(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination); + extern f_status_t fll_program_parameter_additional_append(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination); #endif // _di_fll_program_parameter_additional_append_ /** @@ -262,7 +262,7 @@ extern "C" { * @see fl_string_mash() */ #ifndef _di_fll_program_parameter_additional_mash_ - extern f_return_status fll_program_parameter_additional_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); + extern f_status_t fll_program_parameter_additional_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); #endif // _di_fll_program_parameter_additional_mash_ /** @@ -289,7 +289,7 @@ extern "C" { * @see fl_string_rip() */ #ifndef _di_fll_program_parameter_additional_rip_ - extern f_return_status fll_program_parameter_additional_rip(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination); + extern f_status_t fll_program_parameter_additional_rip(const f_string_t *argv, const f_array_lengths_t values, f_string_dynamics_t *destination); #endif // _di_fll_program_parameter_additional_rip_ /** @@ -323,7 +323,7 @@ extern "C" { * @see fl_string_rip() */ #ifndef _di_fll_program_parameter_additional_rip_mash_ - extern f_return_status fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); + extern f_status_t fll_program_parameter_additional_rip_mash(const f_string_t glue, const f_string_length_t glue_length, const f_string_t *argv, const f_array_lengths_t values, f_string_dynamic_t *destination); #endif // _di_fll_program_parameter_additional_rip_mash_ #ifdef __cplusplus diff --git a/level_2/fll_status/c/status.c b/level_2/fll_status/c/status.c index 894b814..2b02830 100644 --- a/level_2/fll_status/c/status.c +++ b/level_2/fll_status/c/status.c @@ -5,7 +5,7 @@ extern "C" { #endif #ifndef _di_fll_status_from_string_ - f_return_status fll_status_from_string(const f_string_t string, f_status_t *code) { + f_status_t fll_status_from_string(const f_string_t string, f_status_t *code) { #ifndef _di_level_2_parameter_checking_ if (!code) return F_status_set_error(F_parameter); #endif // _di_level_2_parameter_checking_ diff --git a/level_2/fll_status/c/status.h b/level_2/fll_status/c/status.h index cc1fdf6..25f6a01 100644 --- a/level_2/fll_status/c/status.h +++ b/level_2/fll_status/c/status.h @@ -47,7 +47,7 @@ extern "C" { * Errors (with error bit) from: f_conversion_character_is_decimal(). */ #ifndef _di_fll_status_from_string_ - extern f_return_status fll_status_from_string(const f_string_t string, f_status_t *code); + extern f_status_t fll_status_from_string(const f_string_t string, f_status_t *code); #endif // _di_fll_status_to_string_ #ifdef __cplusplus diff --git a/level_3/byte_dump/c/byte_dump.c b/level_3/byte_dump/c/byte_dump.c index 80885cc..8b5659a 100644 --- a/level_3/byte_dump/c/byte_dump.c +++ b/level_3/byte_dump/c/byte_dump.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_byte_dump_print_help_ - f_return_status byte_dump_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t byte_dump_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, byte_dump_name_long, byte_dump_version); @@ -76,7 +76,7 @@ extern "C" { #endif // _di_byte_dump_print_help_ #ifndef _di_byte_dump_main_ - f_return_status byte_dump_main(const f_console_arguments_t arguments, byte_dump_data_t *data) { + f_status_t byte_dump_main(const f_console_arguments_t arguments, byte_dump_data_t *data) { f_status_t status = F_none; { @@ -457,7 +457,7 @@ extern "C" { #endif // _di_byte_dump_main_ #ifndef _di_byte_dump_delete_data_ - f_return_status byte_dump_delete_data(byte_dump_data_t *data) { + f_status_t byte_dump_delete_data(byte_dump_data_t *data) { for (f_string_length_t i = 0; i < byte_dump_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/byte_dump/c/byte_dump.h b/level_3/byte_dump/c/byte_dump.h index 01c2b29..503155e 100644 --- a/level_3/byte_dump/c/byte_dump.h +++ b/level_3/byte_dump/c/byte_dump.h @@ -254,7 +254,7 @@ extern "C" { * F_none on success. */ #ifndef _di_byte_dump_print_help_ - extern f_return_status byte_dump_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t byte_dump_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_byte_dump_print_help_ /** @@ -274,7 +274,7 @@ extern "C" { * @see byte_dump_delete_data() */ #ifndef _di_byte_dump_main_ - extern f_return_status byte_dump_main(const f_console_arguments_t arguments, byte_dump_data_t *data); + extern f_status_t byte_dump_main(const f_console_arguments_t arguments, byte_dump_data_t *data); #endif // _di_byte_dump_main_ /** @@ -293,7 +293,7 @@ extern "C" { * @see byte_dump_main() */ #ifndef _di_byte_dump_delete_data_ - extern f_return_status byte_dump_delete_data(byte_dump_data_t *data); + extern f_status_t byte_dump_delete_data(byte_dump_data_t *data); #endif // _di_byte_dump_delete_data_ #ifdef __cplusplus diff --git a/level_3/byte_dump/c/private-byte_dump.c b/level_3/byte_dump/c/private-byte_dump.c index 9da1f47..a7fed93 100644 --- a/level_3/byte_dump/c/private-byte_dump.c +++ b/level_3/byte_dump/c/private-byte_dump.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_byte_dump_file_ - f_return_status byte_dump_file(const byte_dump_data_t data, const f_string_t file_name, const f_file_t file) { + f_status_t byte_dump_file(const byte_dump_data_t data, const f_string_t file_name, const f_file_t file) { f_status_t status = F_none; uint64_t position = 0; diff --git a/level_3/byte_dump/c/private-byte_dump.h b/level_3/byte_dump/c/private-byte_dump.h index 309dc4e..c69feab 100644 --- a/level_3/byte_dump/c/private-byte_dump.h +++ b/level_3/byte_dump/c/private-byte_dump.h @@ -70,7 +70,7 @@ extern "C" { * F_failure (with error bit) on failure, usually when read() fails. */ #ifndef _di_byte_dump_file_ - extern f_return_status byte_dump_file(const byte_dump_data_t data, const f_string_t file_name, const f_file_t file) f_gcc_attribute_visibility_internal; + extern f_status_t byte_dump_file(const byte_dump_data_t data, const f_string_t file_name, const f_file_t file) f_gcc_attribute_visibility_internal; #endif // _di_byte_dump_file_ /** diff --git a/level_3/control/c/control.c b/level_3/control/c/control.c index f592ca8..f73ab76 100644 --- a/level_3/control/c/control.c +++ b/level_3/control/c/control.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_control_print_help_ - f_return_status control_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t control_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, control_name_long, control_version); @@ -27,7 +27,7 @@ extern "C" { #endif // _di_control_print_help_ #ifndef _di_control_main_ - f_return_status control_main(const f_console_arguments_t arguments, control_data_t *data) { + f_status_t control_main(const f_console_arguments_t arguments, control_data_t *data) { f_status_t status = F_none; { @@ -133,7 +133,7 @@ extern "C" { #endif // _di_control_main_ #ifndef _di_control_delete_data_ - f_return_status control_delete_data(control_data_t *data) { + f_status_t control_delete_data(control_data_t *data) { for (f_string_length_t i = 0; i < control_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/control/c/control.h b/level_3/control/c/control.h index 743a1b2..19103ac 100644 --- a/level_3/control/c/control.h +++ b/level_3/control/c/control.h @@ -118,7 +118,7 @@ extern "C" { * F_none on success. */ #ifndef _di_control_print_help_ - extern f_return_status control_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t control_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_control_print_help_ /** @@ -139,7 +139,7 @@ extern "C" { * @see control_delete_data() */ #ifndef _di_control_main_ - extern f_return_status control_main(const f_console_arguments_t arguments, control_data_t *data); + extern f_status_t control_main(const f_console_arguments_t arguments, control_data_t *data); #endif // _di_control_main_ /** @@ -158,7 +158,7 @@ extern "C" { * @see control_main() */ #ifndef _di_control_delete_data_ - extern f_return_status control_delete_data(control_data_t *data); + extern f_status_t control_delete_data(control_data_t *data); #endif // _di_control_delete_data_ #ifdef __cplusplus diff --git a/level_3/controller/c/controller.c b/level_3/controller/c/controller.c index d76c482..49a7cdc 100644 --- a/level_3/controller/c/controller.c +++ b/level_3/controller/c/controller.c @@ -10,7 +10,7 @@ extern "C" { #endif #ifndef _di_controller_print_help_ - f_return_status controller_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t controller_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, controller_name_long, controller_version); @@ -48,7 +48,7 @@ extern "C" { #endif // _di_controller_print_help_ #ifndef _di_controller_main_ - f_return_status controller_main(const f_console_arguments_t arguments, controller_data_t *data) { + f_status_t controller_main(const f_console_arguments_t arguments, controller_data_t *data) { f_status_t status = F_none; { @@ -392,7 +392,7 @@ extern "C" { #endif // _di_controller_main_ #ifndef _di_controller_delete_data_ - f_return_status controller_delete_data(controller_data_t *data) { + f_status_t controller_delete_data(controller_data_t *data) { for (f_string_length_t i = 0; i < controller_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/controller/c/controller.h b/level_3/controller/c/controller.h index cc22ff9..3d759d3 100644 --- a/level_3/controller/c/controller.h +++ b/level_3/controller/c/controller.h @@ -209,7 +209,7 @@ extern "C" { * F_none on success. */ #ifndef _di_controller_print_help_ - extern f_return_status controller_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t controller_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_controller_print_help_ /** @@ -230,7 +230,7 @@ extern "C" { * @see controller_delete_data() */ #ifndef _di_controller_main_ - extern f_return_status controller_main(const f_console_arguments_t arguments, controller_data_t *data); + extern f_status_t controller_main(const f_console_arguments_t arguments, controller_data_t *data); #endif // _di_controller_main_ /** @@ -249,7 +249,7 @@ extern "C" { * @see controller_main() */ #ifndef _di_controller_delete_data_ - extern f_return_status controller_delete_data(controller_data_t *data); + extern f_status_t controller_delete_data(controller_data_t *data); #endif // _di_controller_delete_data_ #ifdef __cplusplus diff --git a/level_3/controller/c/private-common.h b/level_3/controller/c/private-common.h index e215e52..0b8aa4a 100644 --- a/level_3/controller/c/private-common.h +++ b/level_3/controller/c/private-common.h @@ -539,7 +539,7 @@ extern "C" { f_capability_delete(&rule.capability); \ fl_control_group_delete(&rule.control_group); \ fl_type_int32s_delete(&rule.groups); \ - f_limit_sets_delete(&rule.limits); \ + f_macro_limit_sets_t_delete_simple(rule.limits); \ controller_macro_rule_items_t_delete_simple(rule.items) #endif // _di_controller_rule_t_ diff --git a/level_3/controller/c/private-controller.c b/level_3/controller/c/private-controller.c index 7aee64a..8992dd9 100644 --- a/level_3/controller/c/private-controller.c +++ b/level_3/controller/c/private-controller.c @@ -10,7 +10,7 @@ extern "C" { #endif #ifndef _di_controller_string_dynamic_rip_nulless_terminated_ - f_return_status controller_string_dynamic_rip_nulless_terminated(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t controller_string_dynamic_rip_nulless_terminated(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { f_status_t status = fl_string_dynamic_rip_nulless(source, range, destination); if (F_status_is_error(status)) return status; @@ -20,7 +20,7 @@ extern "C" { #endif // _di_controller_string_dynamic_rip_nulless_terminated_ #ifndef _di_controller_string_dynamic_append_terminated_ - f_return_status controller_string_dynamic_append_terminated(const f_string_static_t source, f_string_dynamic_t *destination) { + f_status_t controller_string_dynamic_append_terminated(const f_string_static_t source, f_string_dynamic_t *destination) { f_status_t status = fl_string_dynamic_append(source, destination); if (F_status_is_error(status)) return status; @@ -30,7 +30,7 @@ extern "C" { #endif // _di_controller_string_dynamic_append_terminated_ #ifndef _di_controller_string_dynamic_partial_append_terminated_ - f_return_status controller_string_dynamic_partial_append_terminated(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { + f_status_t controller_string_dynamic_partial_append_terminated(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) { f_status_t status = fl_string_dynamic_partial_append(source, range, destination); if (F_status_is_error(status)) return status; @@ -40,7 +40,7 @@ extern "C" { #endif // _di_controller_string_dynamic_partial_append_terminated_ #ifndef _di_controller_file_load_ - f_return_status controller_file_load(const controller_data_t data, const controller_setting_t setting, const f_string_t path_prefix, const f_string_static_t path_name, const f_string_t path_suffix, const f_string_length_t path_prefix_length, const f_string_length_t path_suffix_length, controller_cache_t *cache) { + f_status_t controller_file_load(const controller_data_t data, const controller_setting_t setting, const f_string_t path_prefix, const f_string_static_t path_name, const f_string_t path_suffix, const f_string_length_t path_prefix_length, const f_string_length_t path_suffix_length, controller_cache_t *cache) { f_status_t status = F_none; f_file_t file = f_file_t_initialize; @@ -127,7 +127,7 @@ extern "C" { #endif // _di_controller_file_load_ #ifndef _di_controller_file_pid_create_ - f_return_status controller_file_pid_create(const controller_data_t data, const f_string_static_t path_pid) { + f_status_t controller_file_pid_create(const controller_data_t data, const f_string_static_t path_pid) { f_status_t status = F_none; // the file exists, do not attempt to overwrite. @@ -219,7 +219,7 @@ extern "C" { #endif // _di_controller_file_pid_delete_ #ifndef _di_controller_get_id_user_ - f_return_status controller_get_id_user(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t *cache, uid_t *id) { + f_status_t controller_get_id_user(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t *cache, uid_t *id) { f_number_unsigned_t number = 0; // @todo fix argument ordering in fl_conversion_string_to_number_unsigned(). @@ -261,7 +261,7 @@ extern "C" { #endif // _di_controller_get_id_user_ #ifndef _di_controller_get_id_group_ - f_return_status controller_get_id_group(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t *cache, gid_t *id) { + f_status_t controller_get_id_group(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t *cache, gid_t *id) { f_number_unsigned_t number = 0; // @todo fix argument ordering in fl_conversion_string_to_number_unsigned(). @@ -303,7 +303,7 @@ extern "C" { #endif // _di_controller_get_id_group_ #ifndef _di_controller_perform_ready_ - f_return_status controller_perform_ready(const controller_data_t data, controller_setting_t *setting, controller_cache_t *cache) { + f_status_t controller_perform_ready(const controller_data_t data, controller_setting_t *setting, controller_cache_t *cache) { f_status_t status = F_none; // only create pid file when not in validate mode. @@ -336,7 +336,7 @@ extern "C" { #endif // _di_controller_perform_ready_ #ifndef _di_controller_preprocess_entry_ - f_return_status controller_preprocess_entry(const controller_data_t data, controller_setting_t *setting, controller_cache_t *cache) { + f_status_t controller_preprocess_entry(const controller_data_t data, controller_setting_t *setting, controller_cache_t *cache) { f_status_t status = F_none; f_status_t status2 = F_none; @@ -552,7 +552,7 @@ extern "C" { #endif // _di_controller_preprocess_entry_ #ifndef _di_controller_process_entry_ - f_return_status controller_process_entry(controller_data_t *data, controller_setting_t *setting, controller_cache_t *cache) { + f_status_t controller_process_entry(controller_data_t *data, controller_setting_t *setting, controller_cache_t *cache) { f_status_t status = F_none; f_array_length_t i = 0; @@ -1074,7 +1074,7 @@ extern "C" { #endif // _di_controller_process_entry_ #ifndef _di_controller_status_simplify_ - f_return_status controller_status_simplify(const f_status_t status) { + f_status_t controller_status_simplify(const f_status_t status) { if (status == F_memory_not || status == F_memory_allocation || status == F_memory_reallocation) { return F_status_set_error(F_memory); @@ -1105,7 +1105,7 @@ extern "C" { #endif // _di_controller_status_simplify_ #ifndef _di_controller_validate_define_name_ - f_return_status controller_validate_environment_name(const f_string_static_t name) { + f_status_t controller_validate_environment_name(const f_string_static_t name) { if (!name.used) return F_none; @@ -1133,7 +1133,7 @@ extern "C" { #endif // _di_controller_validate_define_name_ #ifndef _di_controller_validate_has_graph_ - f_return_status controller_validate_has_graph(const f_string_static_t name) { + f_status_t controller_validate_has_graph(const f_string_static_t name) { if (!name.used) return F_none; diff --git a/level_3/controller/c/private-controller.h b/level_3/controller/c/private-controller.h index 70f4402..4db2ff5 100644 --- a/level_3/controller/c/private-controller.h +++ b/level_3/controller/c/private-controller.h @@ -30,7 +30,7 @@ extern "C" { * @see fl_string_dynamic_terminate_after() */ #ifndef _di_controller_string_dynamic_rip_nulless_terminated_ - extern f_return_status controller_string_dynamic_rip_nulless_terminated(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t controller_string_dynamic_rip_nulless_terminated(const f_string_static_t source, const f_string_range_t range, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // _di_controller_string_dynamic_rip_nulless_terminated_ /** @@ -51,7 +51,7 @@ extern "C" { * @see fl_string_dynamic_terminate_after() */ #ifndef _di_controller_string_dynamic_append_terminated_ - extern f_return_status controller_string_dynamic_append_terminated(const f_string_static_t from, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t controller_string_dynamic_append_terminated(const f_string_static_t from, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // _di_controller_string_dynamic_append_terminated_ /** @@ -74,7 +74,7 @@ extern "C" { * @see fl_string_dynamic_terminate_after() */ #ifndef _di_controller_string_dynamic_partial_append_terminated_ - extern f_return_status controller_string_dynamic_partial_append_terminated(const f_string_static_t from, const f_string_range_t range, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; + extern f_status_t controller_string_dynamic_partial_append_terminated(const f_string_static_t from, const f_string_range_t range, f_string_dynamic_t *destination) f_gcc_attribute_visibility_internal; #endif // _di_controller_string_dynamic_partial_append_terminated_ /** @@ -116,7 +116,7 @@ extern "C" { * @see fl_string_dynamic_terminate_after() */ #ifndef _di_controller_file_load_ - extern f_return_status controller_file_load(const controller_data_t data, const controller_setting_t setting, const f_string_t path_prefix, const f_string_static_t path_name, const f_string_t path_suffix, const f_string_length_t path_prefix_length, const f_string_length_t path_suffix_length, controller_cache_t *cache) f_gcc_attribute_visibility_internal; + extern f_status_t controller_file_load(const controller_data_t data, const controller_setting_t setting, const f_string_t path_prefix, const f_string_static_t path_name, const f_string_t path_suffix, const f_string_length_t path_prefix_length, const f_string_length_t path_suffix_length, controller_cache_t *cache) f_gcc_attribute_visibility_internal; #endif // _di_controller_file_load_ /** @@ -141,7 +141,7 @@ extern "C" { * @see f_file_stream_open() */ #ifndef _di_controller_file_pid_create_ - f_return_status controller_file_pid_create(const controller_data_t data, const f_string_static_t path_pid) f_gcc_attribute_visibility_internal; + f_status_t controller_file_pid_create(const controller_data_t data, const f_string_static_t path_pid) f_gcc_attribute_visibility_internal; #endif // _di_controller_file_pid_create_ /** @@ -182,7 +182,7 @@ extern "C" { * @see fl_conversion_string_to_number_unsigned() */ #ifndef _di_controller_get_id_user_ - f_return_status controller_get_id_user(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t *cache, uid_t *id) f_gcc_attribute_visibility_internal; + f_status_t controller_get_id_user(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t *cache, uid_t *id) f_gcc_attribute_visibility_internal; #endif // _di_controller_get_id_user_ /** @@ -209,7 +209,7 @@ extern "C" { * @see fl_conversion_string_to_number_unsigned() */ #ifndef _di_controller_get_id_group_ - f_return_status controller_get_id_group(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t *cache, gid_t *id) f_gcc_attribute_visibility_internal; + f_status_t controller_get_id_group(const f_string_static_t buffer, const f_string_range_t range, controller_cache_t *cache, gid_t *id) f_gcc_attribute_visibility_internal; #endif // _di_controller_get_id_group_ /** @@ -232,7 +232,7 @@ extern "C" { * @see controller_file_pid_create() */ #ifndef _di_controller_perform_ready_ - extern f_return_status controller_perform_ready(const controller_data_t data, controller_setting_t *setting, controller_cache_t *cache) f_gcc_attribute_visibility_internal; + extern f_status_t controller_perform_ready(const controller_data_t data, controller_setting_t *setting, controller_cache_t *cache) f_gcc_attribute_visibility_internal; #endif // _di_controller_perform_ready_ /** @@ -262,7 +262,7 @@ extern "C" { * @see fl_type_array_lengths_increase_by() */ #ifndef _di_controller_preprocess_entry_ - extern f_return_status controller_preprocess_entry(const controller_data_t data, controller_setting_t *setting, controller_cache_t *cache) f_gcc_attribute_visibility_internal; + extern f_status_t controller_preprocess_entry(const controller_data_t data, controller_setting_t *setting, controller_cache_t *cache) f_gcc_attribute_visibility_internal; #endif // _di_controller_preprocess_entry_ /** @@ -288,7 +288,7 @@ extern "C" { * @see fl_type_array_lengths_increase_by() */ #ifndef _di_controller_process_entry_ - extern f_return_status controller_process_entry(controller_data_t *data, controller_setting_t *setting, controller_cache_t *cache) f_gcc_attribute_visibility_internal; + extern f_status_t controller_process_entry(controller_data_t *data, controller_setting_t *setting, controller_cache_t *cache) f_gcc_attribute_visibility_internal; #endif // _di_controller_process_entry_ /** @@ -301,7 +301,7 @@ extern "C" { * 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; + extern f_status_t controller_status_simplify(const f_status_t status) f_gcc_attribute_visibility_internal; #endif // _di_controller_status_simplify_ /** @@ -326,7 +326,7 @@ extern "C" { * @see f_utf_is_alpha_digit() */ #ifndef _di_controller_validate_define_name_ - extern f_return_status controller_validate_environment_name(const f_string_static_t name) f_gcc_attribute_visibility_internal; + extern f_status_t controller_validate_environment_name(const f_string_static_t name) f_gcc_attribute_visibility_internal; #endif // _di_controller_validate_define_name_ /** @@ -345,7 +345,7 @@ extern "C" { * @see f_utf_is_graph() */ #ifndef _di_controller_validate_has_graph_ - extern f_return_status controller_validate_has_graph(const f_string_static_t name) f_gcc_attribute_visibility_internal; + extern f_status_t controller_validate_has_graph(const f_string_static_t name) f_gcc_attribute_visibility_internal; #endif // _di_controller_validate_has_graph_ #ifdef __cplusplus diff --git a/level_3/controller/c/private-entry.c b/level_3/controller/c/private-entry.c index 9709376..edbf0d6 100644 --- a/level_3/controller/c/private-entry.c +++ b/level_3/controller/c/private-entry.c @@ -69,7 +69,7 @@ extern "C" { #endif // _di_controller_entry_action_type_name_ #ifndef _di_controller_entry_actions_increase_by_ - f_return_status controller_entry_actions_increase_by(const f_array_length_t amount, controller_entry_actions_t *actions) { + f_status_t controller_entry_actions_increase_by(const f_array_length_t amount, controller_entry_actions_t *actions) { if (actions->used + amount > actions->size) { if (actions->used + amount > f_array_length_t_size) { @@ -90,7 +90,7 @@ extern "C" { #endif // _di_controller_entry_actions_increase_by_ #ifndef _di_controller_entry_actions_read_ - f_return_status controller_entry_actions_read(const controller_data_t data, const controller_setting_t setting, const f_string_range_t content_range, controller_cache_t *cache, controller_entry_actions_t *actions) { + f_status_t controller_entry_actions_read(const controller_data_t data, const controller_setting_t setting, const f_string_range_t content_range, controller_cache_t *cache, controller_entry_actions_t *actions) { f_status_t status = F_none; f_status_t status_action = F_none; @@ -572,7 +572,7 @@ extern "C" { #endif // _di_controller_entry_error_print_ #ifndef _di_controller_entry_items_increase_by_ - f_return_status controller_entry_items_increase_by(const f_array_length_t amount, controller_entry_items_t *items) { + f_status_t controller_entry_items_increase_by(const f_array_length_t amount, controller_entry_items_t *items) { if (items->used + amount > items->size) { if (items->used + amount > f_array_length_t_size) { @@ -593,7 +593,7 @@ extern "C" { #endif // _di_controller_entry_items_increase_by_ #ifndef _di_controller_entry_read_ - f_return_status controller_entry_read(const controller_data_t data, const controller_setting_t setting, const f_string_static_t entry_name, controller_cache_t *cache, controller_entry_t *entry) { + f_status_t controller_entry_read(const controller_data_t data, const controller_setting_t setting, const f_string_static_t entry_name, controller_cache_t *cache, controller_entry_t *entry) { f_status_t status = F_none; entry->status = F_known_not; diff --git a/level_3/controller/c/private-entry.h b/level_3/controller/c/private-entry.h index 90d5744..0b9b4a6 100644 --- a/level_3/controller/c/private-entry.h +++ b/level_3/controller/c/private-entry.h @@ -57,7 +57,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_entry_actions_increase_by_ - extern f_return_status controller_entry_actions_increase_by(const f_array_length_t amount, controller_entry_actions_t *actions) f_gcc_attribute_visibility_internal; + extern f_status_t controller_entry_actions_increase_by(const f_array_length_t amount, controller_entry_actions_t *actions) f_gcc_attribute_visibility_internal; #endif // _di_controller_entry_actions_increase_by_ /** @@ -96,7 +96,7 @@ extern "C" { * @see fll_fss_extended_read() */ #ifndef _di_controller_entry_actions_read_ - extern f_return_status controller_entry_actions_read(const controller_data_t data, const controller_setting_t setting, const f_string_range_t content_range, controller_cache_t *cache, controller_entry_actions_t *actions) f_gcc_attribute_visibility_internal; + extern f_status_t controller_entry_actions_read(const controller_data_t data, const controller_setting_t setting, const f_string_range_t content_range, controller_cache_t *cache, controller_entry_actions_t *actions) f_gcc_attribute_visibility_internal; #endif // _di_controller_entry_actions_read_ /** @@ -135,7 +135,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_entry_items_increase_by_ - extern f_return_status controller_entry_items_increase_by(const f_array_length_t amount, controller_entry_items_t *items) f_gcc_attribute_visibility_internal; + extern f_status_t controller_entry_items_increase_by(const f_array_length_t amount, controller_entry_items_t *items) f_gcc_attribute_visibility_internal; #endif // _di_controller_entry_items_increase_by_ /** @@ -184,7 +184,7 @@ extern "C" { * @see fll_fss_basic_list_read() */ #ifndef _di_controller_entry_read_ - extern f_return_status controller_entry_read(const controller_data_t data, const controller_setting_t setting, const f_string_static_t entry_name, controller_cache_t *cache, controller_entry_t *entry) f_gcc_attribute_visibility_internal; + extern f_status_t controller_entry_read(const controller_data_t data, const controller_setting_t setting, const f_string_static_t entry_name, controller_cache_t *cache, controller_entry_t *entry) f_gcc_attribute_visibility_internal; #endif // _di_controller_entry_read_ #ifdef __cplusplus diff --git a/level_3/controller/c/private-rule.c b/level_3/controller/c/private-rule.c index 67b7935..2803127 100644 --- a/level_3/controller/c/private-rule.c +++ b/level_3/controller/c/private-rule.c @@ -31,7 +31,7 @@ extern "C" { #endif // _di_controller_rule_action_method_name_ #ifndef _di_controller_rule_parameters_read_ - f_return_status controller_rule_parameters_read(const controller_data_t data, const f_string_static_t buffer, f_fss_object_t *object, f_fss_content_t *content, f_string_dynamics_t *parameters) { + f_status_t controller_rule_parameters_read(const controller_data_t data, const f_string_static_t buffer, f_fss_object_t *object, f_fss_content_t *content, f_string_dynamics_t *parameters) { f_status_t status = F_none; parameters->used = 0; @@ -158,7 +158,7 @@ extern "C" { #endif // _di_controller_rule_action_type_name_ #ifndef _di_controller_rule_actions_increase_by_ - f_return_status controller_rule_actions_increase_by(const f_array_length_t amount, controller_rule_actions_t *actions) { + f_status_t controller_rule_actions_increase_by(const f_array_length_t amount, controller_rule_actions_t *actions) { if (actions->used + amount > actions->size) { if (actions->used + amount > f_array_length_t_size) { @@ -179,7 +179,7 @@ extern "C" { #endif // _di_controller_rule_actions_increase_by_ #ifndef _di_controller_rule_action_read_ - f_return_status controller_rule_action_read(const controller_data_t data, const uint8_t type, const uint8_t method, controller_cache_t *cache, controller_rule_item_t *item, controller_rule_actions_t *actions, f_string_range_t *range) { + f_status_t controller_rule_action_read(const controller_data_t data, const uint8_t type, const uint8_t method, controller_cache_t *cache, controller_rule_item_t *item, controller_rule_actions_t *actions, f_string_range_t *range) { f_status_t status = F_none; if (method == controller_rule_action_method_extended_list) { @@ -496,7 +496,7 @@ extern "C" { #endif // _di_controller_rule_error_print_need_want_wish_ #ifndef _di_controller_rule_execute_ - f_return_status controller_rule_execute(const controller_cache_t cache, const f_array_length_t index, const uint8_t type, const bool simulate, controller_data_t *data, controller_setting_t *setting) { + f_status_t controller_rule_execute(const controller_cache_t cache, const f_array_length_t index, const uint8_t type, const bool simulate, controller_data_t *data, controller_setting_t *setting) { f_status_t status = F_none; f_status_t success = F_false; @@ -693,7 +693,7 @@ extern "C" { #endif // _di_controller_rule_execute_ #ifndef _di_controller_rule_execute_pid_with_ - f_return_status controller_rule_execute_pid_with(const uint8_t type, const controller_rule_action_t action, const bool simulate, const f_string_t program, const f_string_dynamics_t arguments, const uint8_t options, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, controller_data_t *data) { + f_status_t controller_rule_execute_pid_with(const uint8_t type, const controller_rule_action_t action, const bool simulate, const f_string_t program, const f_string_dynamics_t arguments, const uint8_t options, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, controller_data_t *data) { f_status_t status = F_none; int result = 0; @@ -781,7 +781,7 @@ extern "C" { #endif // _di_controller_rule_execute_pid_with_ #ifndef _di_controller_rule_execute_foreground_ - f_return_status controller_rule_execute_foreground(const uint8_t type, const controller_rule_action_t action, const bool simulate, const f_string_t program, const f_string_dynamics_t arguments, const uint8_t options, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, controller_data_t *data) { + f_status_t controller_rule_execute_foreground(const uint8_t type, const controller_rule_action_t action, const bool simulate, const f_string_t program, const f_string_dynamics_t arguments, const uint8_t options, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, controller_data_t *data) { f_status_t status = F_none; int result = 0; @@ -871,7 +871,7 @@ extern "C" { #endif // _di_controller_rule_find_loaded_ #ifndef _di_controller_rule_id_construct_ - f_return_status controller_rule_id_construct(const controller_data_t data, const f_string_static_t source, const f_string_range_t directory, const f_string_range_t basename, f_string_dynamic_t *id) { + f_status_t controller_rule_id_construct(const controller_data_t data, const f_string_static_t source, const f_string_range_t directory, const f_string_range_t basename, f_string_dynamic_t *id) { f_status_t status = F_none; id->used = 0; @@ -908,7 +908,7 @@ extern "C" { #endif // _di_controller_rule_id_construct_ #ifndef _di_controller_rule_item_read_ - f_return_status controller_rule_item_read(const controller_data_t data, controller_cache_t *cache, controller_rule_item_t *item) { + f_status_t controller_rule_item_read(const controller_data_t data, controller_cache_t *cache, controller_rule_item_t *item) { f_status_t status = F_none; f_string_range_t range = f_macro_string_range_t_initialize(cache->buffer_item.used); @@ -1091,7 +1091,7 @@ extern "C" { #endif // _di_controller_rule_item_type_name_ #ifndef _di_controller_rule_items_increase_by_ - f_return_status controller_rule_items_increase_by(const f_array_length_t amount, controller_rule_items_t *items) { + f_status_t controller_rule_items_increase_by(const f_array_length_t amount, controller_rule_items_t *items) { if (items->used + amount > items->size) { if (items->used + amount > f_array_length_t_size) { @@ -1205,7 +1205,7 @@ extern "C" { #endif // _di_controller_rule_setting_limit_type_name_ #ifndef _di_controller_rule_path_ - f_return_status controller_rule_path(const controller_data_t data, const controller_setting_t setting, const f_string_static_t path_directory, const f_string_static_t path_name, f_string_dynamic_t *path) { + f_status_t controller_rule_path(const controller_data_t data, const controller_setting_t setting, const f_string_static_t path_directory, const f_string_static_t path_name, f_string_dynamic_t *path) { f_status_t status = F_none; path->used = 0; @@ -1275,7 +1275,7 @@ extern "C" { #endif // _di_controller_rule_path_ #ifndef _di_controller_rule_process_ - f_return_status controller_rule_process(const f_array_length_t index, const uint8_t action, const uint8_t options, controller_data_t *data, controller_setting_t *setting, controller_cache_t *cache) { + f_status_t controller_rule_process(const f_array_length_t index, const uint8_t action, const uint8_t options, controller_data_t *data, controller_setting_t *setting, controller_cache_t *cache) { switch (action) { case controller_rule_action_type_freeze: @@ -1592,7 +1592,7 @@ extern "C" { #endif // _di_controller_rule_process_ #ifndef _di_controller_rule_read_ - f_return_status controller_rule_read(const controller_data_t data, const controller_setting_t setting, const f_string_static_t rule_id, controller_cache_t *cache, controller_rule_t *rule) { + f_status_t controller_rule_read(const controller_data_t data, const controller_setting_t setting, const f_string_static_t rule_id, controller_cache_t *cache, controller_rule_t *rule) { f_status_t status = F_none; bool for_item = F_true; @@ -1838,7 +1838,7 @@ extern "C" { #endif // _di_controller_rule_read_ #ifndef _di_controller_rule_setting_read_ - f_return_status controller_rule_setting_read(const controller_data_t data, const controller_setting_t setting, controller_cache_t *cache, controller_rule_t *rule) { + f_status_t controller_rule_setting_read(const controller_data_t data, const controller_setting_t setting, controller_cache_t *cache, controller_rule_t *rule) { f_status_t status = F_none; f_status_t status_return = F_none; @@ -2514,7 +2514,7 @@ extern "C" { if (F_status_is_error(status)) continue; - status = f_limit_sets_increase(&rule->limits); + f_macro_limit_sets_t_increase(status, rule->limits); if (F_status_is_error(status)) { fll_error_print(data.error, F_status_set_fine(status), "f_limit_sets_increase", F_true); @@ -3787,7 +3787,7 @@ extern "C" { #endif // _di_controller_rule_simulate_ #ifndef _di_controller_rules_increase_ - f_return_status controller_rules_increase(controller_rules_t *rules) { + f_status_t controller_rules_increase(controller_rules_t *rules) { if (rules->used + 1 > rules->size) { f_array_length_t size = rules->used + controller_default_allocation_step; diff --git a/level_3/controller/c/private-rule.h b/level_3/controller/c/private-rule.h index 0b10f1e..2e8e2b4 100644 --- a/level_3/controller/c/private-rule.h +++ b/level_3/controller/c/private-rule.h @@ -56,7 +56,7 @@ extern "C" { * @see fl_string_dynamics_increase() */ #ifndef _di_controller_rule_parameters_read_ - extern f_return_status controller_rule_parameters_read(const controller_data_t data, const f_string_static_t buffer, f_fss_object_t *object, f_fss_content_t *content, f_string_dynamics_t *parameters) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_parameters_read(const controller_data_t data, const f_string_static_t buffer, f_fss_object_t *object, f_fss_content_t *content, f_string_dynamics_t *parameters) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_parameters_read_ /** @@ -90,7 +90,7 @@ extern "C" { * Errors (with error bit) from: f_memory_resize(). */ #ifndef _di_controller_rule_actions_increase_by_ - extern f_return_status controller_rule_actions_increase_by(const f_array_length_t amount, controller_rule_actions_t *actions) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_actions_increase_by(const f_array_length_t amount, controller_rule_actions_t *actions) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_actions_increase_by_ /** @@ -126,7 +126,7 @@ extern "C" { * @see f_fss_count_lines() */ #ifndef _di_controller_rule_action_read_ - extern f_return_status controller_rule_action_read(const controller_data_t data, const uint8_t type, const uint8_t method, controller_cache_t *cache, controller_rule_item_t *item, controller_rule_actions_t *actions, f_string_range_t *range) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_action_read(const controller_data_t data, const uint8_t type, const uint8_t method, controller_cache_t *cache, controller_rule_item_t *item, controller_rule_actions_t *actions, f_string_range_t *range) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_action_read_ /** @@ -238,7 +238,7 @@ extern "C" { * On failure, the individual status for the rule is set to an appropriate error status. */ #ifndef _di_controller_rule_execute_ - extern f_return_status controller_rule_execute(const controller_cache_t cache, const f_array_length_t index, const uint8_t type, const bool simulate, controller_data_t *data, controller_setting_t *setting) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_execute(const controller_cache_t cache, const f_array_length_t index, const uint8_t type, const bool simulate, controller_data_t *data, controller_setting_t *setting) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_execute_ /** @@ -287,7 +287,7 @@ extern "C" { * @see fll_execute_program() */ #ifndef _di_controller_rule_execute_pid_with_ - extern f_return_status controller_rule_execute_pid_with(const uint8_t type, const controller_rule_action_t action, const bool simulate, const f_string_t program, const f_string_dynamics_t arguments, const uint8_t options, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, controller_data_t *data) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_execute_pid_with(const uint8_t type, const controller_rule_action_t action, const bool simulate, const f_string_t program, const f_string_dynamics_t arguments, const uint8_t options, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, controller_data_t *data) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_execute_pid_with_ /** @@ -332,7 +332,7 @@ extern "C" { * @see fll_execute_program() */ #ifndef _di_controller_rule_execute_foreground_ - extern f_return_status controller_rule_execute_foreground(const uint8_t type, const controller_rule_action_t action, const bool simulate, const f_string_t program, const f_string_dynamics_t arguments, const uint8_t options, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, controller_data_t *data) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_execute_foreground(const uint8_t type, const controller_rule_action_t action, const bool simulate, const f_string_t program, const f_string_dynamics_t arguments, const uint8_t options, fl_execute_parameter_t * const parameter, fl_execute_as_t * const as, controller_data_t *data) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_execute_foreground_ /** @@ -380,7 +380,7 @@ extern "C" { * @see fl_string_dynamic_terminate_after() */ #ifndef _di_controller_rule_id_construct_ - extern f_return_status controller_rule_id_construct(const controller_data_t data, const f_string_static_t source, const f_string_range_t directory, const f_string_range_t basename, f_string_dynamic_t *id) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_id_construct(const controller_data_t data, const f_string_static_t source, const f_string_range_t directory, const f_string_range_t basename, f_string_dynamic_t *id) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_id_construct_ /** @@ -408,7 +408,7 @@ extern "C" { * @see fl_string_dynamic_terminate_after() */ #ifndef _di_controller_rule_item_read_ - extern f_return_status controller_rule_item_read(const controller_data_t data, controller_cache_t *cache, controller_rule_item_t *item) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_item_read(const controller_data_t data, controller_cache_t *cache, controller_rule_item_t *item) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_item_read_ /** @@ -444,7 +444,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_rule_items_increase_by_ - extern f_return_status controller_rule_items_increase_by(const f_array_length_t amount, controller_rule_items_t *items) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_items_increase_by(const f_array_length_t amount, controller_rule_items_t *items) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_items_increase_by_ /** @@ -492,7 +492,7 @@ extern "C" { * @see fll_path_canonical() */ #ifndef _di_controller_rule_path_ - extern f_return_status controller_rule_path(const controller_data_t data, const controller_setting_t setting, const f_string_static_t path_directory, const f_string_static_t path_name, f_string_dynamic_t *path) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_path(const controller_data_t data, const controller_setting_t setting, const f_string_static_t path_directory, const f_string_static_t path_name, f_string_dynamic_t *path) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_path_ /** @@ -534,7 +534,7 @@ extern "C" { * F_signal on (exit) signal received. */ #ifndef _di_controller_rule_process_ - extern f_return_status controller_rule_process(const f_array_length_t index, const uint8_t action, const uint8_t options, controller_data_t *data, controller_setting_t *setting, controller_cache_t *cache) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_process(const f_array_length_t index, const uint8_t action, const uint8_t options, controller_data_t *data, controller_setting_t *setting, controller_cache_t *cache) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_process_ /** @@ -570,7 +570,7 @@ extern "C" { * @see fll_fss_basic_list_read(). */ #ifndef _di_controller_rule_read_ - extern f_return_status controller_rule_read(const controller_data_t data, const controller_setting_t setting, const f_string_static_t rule_id, controller_cache_t *cache, controller_rule_t *rule) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_read(const controller_data_t data, const controller_setting_t setting, const f_string_static_t rule_id, controller_cache_t *cache, controller_rule_t *rule) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_read_ /** @@ -609,7 +609,7 @@ extern "C" { * @see fll_path_canonical() */ #ifndef _di_controller_rule_setting_read_ - extern f_return_status controller_rule_setting_read(const controller_data_t data, const controller_setting_t setting, controller_cache_t *cache, controller_rule_t *rule) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rule_setting_read(const controller_data_t data, const controller_setting_t setting, controller_cache_t *cache, controller_rule_t *rule) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_setting_read_ /** @@ -661,7 +661,7 @@ extern "C" { * @see f_memory_resize() */ #ifndef _di_controller_rules_increase_ - extern f_return_status controller_rules_increase(controller_rules_t *rules) f_gcc_attribute_visibility_internal; + extern f_status_t controller_rules_increase(controller_rules_t *rules) f_gcc_attribute_visibility_internal; #endif // _di_controller_rule_increase_ #ifdef __cplusplus diff --git a/level_3/fake/c/fake.c b/level_3/fake/c/fake.c index bcba5a5..ac72b44 100644 --- a/level_3/fake/c/fake.c +++ b/level_3/fake/c/fake.c @@ -11,7 +11,7 @@ extern "C" { #endif #ifndef _di_fake_print_help_ - f_return_status fake_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fake_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fake_name_long, fake_version); @@ -99,7 +99,7 @@ extern "C" { #endif // _di_fake_print_help_ #ifndef _di_fake_main_ - f_return_status fake_main(const f_console_arguments_t arguments, fake_data_t *data) { + f_status_t fake_main(const f_console_arguments_t arguments, fake_data_t *data) { f_status_t status = F_none; { @@ -377,7 +377,7 @@ extern "C" { #endif // _di_fake_main_ #ifndef _di_fake_delete_data_ - f_return_status fake_delete_data(fake_data_t *data) { + f_status_t fake_delete_data(fake_data_t *data) { for (f_string_length_t i = 0; i < fake_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fake/c/fake.h b/level_3/fake/c/fake.h index 6e174b6..00ef8f0 100644 --- a/level_3/fake/c/fake.h +++ b/level_3/fake/c/fake.h @@ -510,7 +510,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fake_print_help_ - extern f_return_status fake_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fake_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fake_print_help_ /** @@ -539,7 +539,7 @@ extern "C" { * @see fake_delete_data() */ #ifndef _di_fake_main_ - extern f_return_status fake_main(const f_console_arguments_t arguments, fake_data_t *data); + extern f_status_t fake_main(const f_console_arguments_t arguments, fake_data_t *data); #endif // _di_fake_main_ /** @@ -558,7 +558,7 @@ extern "C" { * @see fake_main() */ #ifndef _di_fake_delete_data_ - extern f_return_status fake_delete_data(fake_data_t *data); + extern f_status_t fake_delete_data(fake_data_t *data); #endif // _di_fake_delete_data_ #ifdef __cplusplus diff --git a/level_3/fake/c/private-build.c b/level_3/fake/c/private-build.c index dc82ed7..9c44369 100644 --- a/level_3/fake/c/private-build.c +++ b/level_3/fake/c/private-build.c @@ -703,7 +703,7 @@ extern "C" { #endif // _di_fake_build_execute_process_script_ #ifndef _di_fake_build_get_file_name_without_extension_ - f_return_status fake_build_get_file_name_without_extension(const fake_data_t data, const f_string_static_t path, f_string_dynamic_t *name) { + f_status_t fake_build_get_file_name_without_extension(const fake_data_t data, const f_string_static_t path, f_string_dynamic_t *name) { name->used = 0; if (!path.used) return F_none; @@ -2514,7 +2514,7 @@ extern "C" { #endif // _di_fake_build_objects_static_ #ifndef _di_fake_build_operate_ - f_return_status fake_build_operate(const f_string_static_t setting_file, fake_data_t *data) { + f_status_t fake_build_operate(const f_string_static_t setting_file, fake_data_t *data) { if (fake_signal_received(*data)) { return F_signal; diff --git a/level_3/fake/c/private-build.h b/level_3/fake/c/private-build.h index 1ae1101..c0b6e59 100644 --- a/level_3/fake/c/private-build.h +++ b/level_3/fake/c/private-build.h @@ -511,7 +511,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_build_get_file_name_without_extension_ - extern f_return_status fake_build_get_file_name_without_extension(const fake_data_t data, const f_string_static_t path, f_string_dynamic_t *name); + extern f_status_t fake_build_get_file_name_without_extension(const fake_data_t data, const f_string_static_t path, f_string_dynamic_t *name); #endif // _di_fake_build_get_file_name_without_extension_ /** @@ -742,7 +742,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_build_operate_ - extern f_return_status fake_build_operate(const f_string_static_t setting_file, fake_data_t *data) f_gcc_attribute_visibility_internal; + extern f_status_t fake_build_operate(const f_string_static_t setting_file, fake_data_t *data) f_gcc_attribute_visibility_internal; #endif // _di_fake_build_operate_ /** diff --git a/level_3/fake/c/private-clean.c b/level_3/fake/c/private-clean.c index 2e60817..89611ef 100644 --- a/level_3/fake/c/private-clean.c +++ b/level_3/fake/c/private-clean.c @@ -10,7 +10,7 @@ extern "C" { #endif #ifndef _di_fake_clean_operate_ - f_return_status fake_clean_operate(const fake_data_t data) { + f_status_t fake_clean_operate(const fake_data_t data) { f_status_t status = F_none; if (data.error.verbosity != f_console_verbosity_quiet) { diff --git a/level_3/fake/c/private-clean.h b/level_3/fake/c/private-clean.h index 3e333e8..aef5541 100644 --- a/level_3/fake/c/private-clean.h +++ b/level_3/fake/c/private-clean.h @@ -24,7 +24,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_clean_operate_ - extern f_return_status fake_clean_operate(const fake_data_t data) f_gcc_attribute_visibility_internal; + extern f_status_t fake_clean_operate(const fake_data_t data) f_gcc_attribute_visibility_internal; #endif // _di_fake_clean_operate_ /** diff --git a/level_3/fake/c/private-fake.c b/level_3/fake/c/private-fake.c index d979456..3408bbd 100644 --- a/level_3/fake/c/private-fake.c +++ b/level_3/fake/c/private-fake.c @@ -82,7 +82,7 @@ extern "C" { #endif // _di_fake_execute_ #ifndef _di_fake_file_buffer_ - f_return_status fake_file_buffer(const fake_data_t data, const f_string_t path_file, f_string_dynamic_t *buffer) { + f_status_t fake_file_buffer(const fake_data_t data, const f_string_t path_file, f_string_dynamic_t *buffer) { f_file_t file = f_file_t_initialize; f_string_t name_function = "f_file_exists"; f_status_t status = F_none; @@ -151,7 +151,7 @@ extern "C" { #endif // _di_fake_file_buffer_ #ifndef _di_fake_path_generate_ - f_return_status fake_path_generate(fake_data_t *data) { + f_status_t fake_path_generate(fake_data_t *data) { f_status_t status = F_none; uint8_t i = 0; @@ -567,7 +567,7 @@ extern "C" { #endif // _di_fake_path_generate_ #ifndef _di_fake_path_generate_string_dynamic_ - f_return_status fake_path_generate_string_dynamic(fake_data_t *data, const f_string_dynamic_t source, f_string_dynamic_t *destination[], const uint8_t length) { + f_status_t fake_path_generate_string_dynamic(fake_data_t *data, const f_string_dynamic_t source, f_string_dynamic_t *destination[], const uint8_t length) { f_status_t status = F_none; for (uint8_t i = 0; i < length; i++) { @@ -580,7 +580,7 @@ extern "C" { #endif // _di_fake_path_generate_string_dynamic_ #ifndef _di_fake_process_console_parameters_ - f_return_status fake_process_console_parameters(const f_console_arguments_t arguments, fake_data_t *data) { + f_status_t fake_process_console_parameters(const f_console_arguments_t arguments, fake_data_t *data) { f_status_t status = F_none; // @todo move as many of the inline error printing code into more general functions where possible to provide more accurate error reporting. @@ -919,7 +919,7 @@ extern "C" { #endif // _di_fake_process_console_parameters_ #ifndef _di_fake_signal_read_ - f_return_status fake_signal_received(const fake_data_t data) { + f_status_t fake_signal_received(const fake_data_t data) { if (!data.signal.id) { return F_false; @@ -956,7 +956,7 @@ extern "C" { #endif // _di_fake_signal_read_ #ifndef _di_fake_validate_directories_ - f_return_status fake_validate_parameter_directories(const f_console_arguments_t arguments, const fake_data_t data) { + f_status_t fake_validate_parameter_directories(const f_console_arguments_t arguments, const fake_data_t data) { if (fake_signal_received(data)) { return F_signal; diff --git a/level_3/fake/c/private-fake.h b/level_3/fake/c/private-fake.h index bad4f36..0894af6 100644 --- a/level_3/fake/c/private-fake.h +++ b/level_3/fake/c/private-fake.h @@ -62,7 +62,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_file_buffer_ - extern f_return_status fake_file_buffer(const fake_data_t data, const f_string_t path_file, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; + extern f_status_t fake_file_buffer(const fake_data_t data, const f_string_t path_file, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; #endif // _di_fake_file_buffer_ /** @@ -77,7 +77,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_path_generate_ - extern f_return_status fake_path_generate(fake_data_t *data) f_gcc_attribute_visibility_internal; + extern f_status_t fake_path_generate(fake_data_t *data) f_gcc_attribute_visibility_internal; #endif // _di_fake_path_generate_ /** @@ -98,7 +98,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_path_generate_string_dynamic_ - extern f_return_status fake_path_generate_string_dynamic(fake_data_t *data, const f_string_dynamic_t source, f_string_dynamic_t *destination[], const uint8_t size) f_gcc_attribute_visibility_internal; + extern f_status_t fake_path_generate_string_dynamic(fake_data_t *data, const f_string_dynamic_t source, f_string_dynamic_t *destination[], const uint8_t size) f_gcc_attribute_visibility_internal; #endif // _di_fake_path_generate_string_dynamic_ /** @@ -115,7 +115,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_process_console_parameters_ - extern f_return_status fake_process_console_parameters(const f_console_arguments_t arguments, fake_data_t *data) f_gcc_attribute_visibility_internal; + extern f_status_t fake_process_console_parameters(const f_console_arguments_t arguments, fake_data_t *data) f_gcc_attribute_visibility_internal; #endif // _di_validate_console_parameters_ /** @@ -131,7 +131,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_signal_read_ - extern f_return_status fake_signal_received(const fake_data_t data) f_gcc_attribute_visibility_internal; + extern f_status_t fake_signal_received(const fake_data_t data) f_gcc_attribute_visibility_internal; #endif // _di_fake_signal_read_ /** @@ -150,7 +150,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_validate_parameter_directories_ - extern f_return_status fake_validate_parameter_directories(const f_console_arguments_t arguments, const fake_data_t data) f_gcc_attribute_visibility_internal; + extern f_status_t fake_validate_parameter_directories(const f_console_arguments_t arguments, const fake_data_t data) f_gcc_attribute_visibility_internal; #endif // _di_fake_validate_parameter_directories_ /** diff --git a/level_3/fake/c/private-make.c b/level_3/fake/c/private-make.c index 85f02b7..92e861f 100644 --- a/level_3/fake/c/private-make.c +++ b/level_3/fake/c/private-make.c @@ -11,7 +11,7 @@ extern "C" { #endif #ifndef _di_fake_make_assure_inside_project_ - f_return_status fake_make_assure_inside_project(const fake_data_t data, const f_string_static_t path, fake_make_data_t *data_make) { + f_status_t fake_make_assure_inside_project(const fake_data_t data, const f_string_static_t path, fake_make_data_t *data_make) { data_make->path_cache.used = 0; @@ -44,7 +44,7 @@ extern "C" { #endif // _di_fake_make_assure_inside_project_ #ifndef _di_fake_make_get_id_group_ - f_return_status fake_make_get_id_group(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, gid_t *id) { + f_status_t fake_make_get_id_group(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, gid_t *id) { const f_string_range_t range = f_macro_string_range_t_initialize(buffer.used); f_number_unsigned_t number = 0; @@ -93,7 +93,7 @@ extern "C" { #endif // _di_fake_make_get_id_group_ #ifndef _di_fake_make_get_id_mode_ - f_return_status fake_make_get_id_mode(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, f_file_mode_t *mode, uint8_t *replace) { + f_status_t fake_make_get_id_mode(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, f_file_mode_t *mode, uint8_t *replace) { if (!buffer.used) { fll_error_print(error, F_parameter, "fake_make_get_id_mode", F_true); return F_status_set_error(F_parameter); @@ -122,7 +122,7 @@ extern "C" { #endif // _di_fake_make_get_id_mode_ #ifndef _di_fake_make_get_id_owner_ - f_return_status fake_make_get_id_owner(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, uid_t *id) { + f_status_t fake_make_get_id_owner(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, uid_t *id) { const f_string_range_t range = f_macro_string_range_t_initialize(buffer.used); f_number_unsigned_t number = 0; @@ -449,7 +449,7 @@ extern "C" { *status = fl_string_dynamics_increase_by(f_memory_default_allocation_step, &data_make->setting_build.environment); if (F_status_is_error(*status)) { - fll_error_print(data.error, F_status_set_fine(*status), "fl_string_lengths_increase_by", F_true); + fll_error_print(data.error, F_status_set_fine(*status), "fl_string_dynamics_increase_by", F_true); break; } } @@ -1048,7 +1048,7 @@ extern "C" { #endif // _di_fake_make_load_parameters_ #ifndef _di_fake_make_operate_ - f_return_status fake_make_operate(fake_data_t *data) { + f_status_t fake_make_operate(fake_data_t *data) { if (fake_signal_received(*data)) { return F_signal; @@ -1276,7 +1276,7 @@ extern "C" { *status = fl_string_dynamics_increase_by(f_memory_default_allocation_step, arguments); if (F_status_is_error(*status)) { - fll_error_print(data_make->error, F_status_set_fine(*status), "fl_string_lengths_increase_by", F_true); + fll_error_print(data_make->error, F_status_set_fine(*status), "fl_string_dynamics_increase_by", F_true); return; } } @@ -1552,7 +1552,7 @@ extern "C" { #endif // _di_fake_make_operate_expand_ #ifndef _di_fake_make_operate_expand_build_ - f_return_status fake_make_operate_expand_build(const fake_data_t data, const f_fss_quote_t quoted, const f_string_range_t range_name, fake_make_data_t *data_make, f_string_dynamics_t *arguments) { + f_status_t fake_make_operate_expand_build(const fake_data_t data, const f_fss_quote_t quoted, const f_string_range_t range_name, fake_make_data_t *data_make, f_string_dynamics_t *arguments) { f_status_t status = F_none; f_string_dynamic_t value = f_string_dynamic_t_initialize; @@ -1833,7 +1833,7 @@ extern "C" { #endif // _di_fake_make_operate_expand_build_ #ifndef _di_fake_make_operate_expand_environment_ - f_return_status fake_make_operate_expand_environment(const fake_data_t data, const f_fss_quote_t quoted, const f_string_range_t range_name, fake_make_data_t *data_make, f_string_dynamics_t *arguments) { + f_status_t fake_make_operate_expand_environment(const fake_data_t data, const f_fss_quote_t quoted, const f_string_range_t range_name, fake_make_data_t *data_make, f_string_dynamics_t *arguments) { f_status_t status = F_none; f_string_dynamic_t value = f_string_dynamic_t_initialize; @@ -1906,10 +1906,10 @@ extern "C" { // add the operation id to the operation stack. if (section_stack->used + 1 > section_stack->size) { - *status = fl_string_lengths_increase_by(f_memory_default_allocation_step, section_stack); + f_macro_string_lengths_t_increase_by((*status), (*section_stack), f_memory_default_allocation_step); if (F_status_is_error(*status)) { - fll_error_print(data_make->error, F_status_set_fine(*status), "fl_string_lengths_increase_by", F_true); + fll_error_print(data_make->error, F_status_set_fine(*status), "f_macro_string_lengths_t_increase_by", F_true); return 0; } } @@ -3656,7 +3656,7 @@ extern "C" { *status = fl_string_dynamics_increase_by(f_memory_default_allocation_step, &data_make->path.stack); if (F_status_set_fine(*status) == F_array_too_large) { - fake_print_message_section_operation_path_stack_max(*data, data_make->error, F_array_too_large, "fl_string_lengths_increase_by", "path stack"); + fake_print_message_section_operation_path_stack_max(*data, data_make->error, F_array_too_large, "fl_string_dynamics_increase_by", "path stack"); return 0; } else if (F_status_is_error(*status)) { @@ -3770,7 +3770,7 @@ extern "C" { #endif // _di_fake_make_operate_process_ #ifndef _di_fake_make_operate_process_execute_ - f_return_status fake_make_operate_process_execute(const fake_data_t data, const f_string_static_t program, const f_string_statics_t arguments, const bool as_shell, fake_make_data_t *data_make) { + f_status_t fake_make_operate_process_execute(const fake_data_t data, const f_string_static_t program, const f_string_statics_t arguments, const bool as_shell, fake_make_data_t *data_make) { if (fake_signal_received(data)) { return F_status_set_error(F_signal); @@ -3917,7 +3917,7 @@ extern "C" { #endif // _di_fake_make_operate_process_return_ #ifndef _di_fake_make_operate_process_run_ - f_return_status fake_make_operate_process_run(const fake_data_t data, const f_string_statics_t arguments, const bool as_shell, fake_make_data_t *data_make) { + f_status_t fake_make_operate_process_run(const fake_data_t data, const f_string_statics_t arguments, const bool as_shell, fake_make_data_t *data_make) { const f_string_static_t *program = &arguments.array[0]; f_status_t status = F_none; @@ -5171,7 +5171,7 @@ extern "C" { #endif // _di_fake_make_operate_validate_ #ifndef _di_fake_make_operate_validate_define_name_ - f_return_status fake_make_operate_validate_define_name(const f_string_static_t name) { + f_status_t fake_make_operate_validate_define_name(const f_string_static_t name) { if (!name.used) return F_none; if (!(isalpha(name.string[0]) || name.string[0] == '_')) { @@ -5190,7 +5190,7 @@ extern "C" { #endif // _di_fake_make_operate_validate_define_name_ #ifndef _di_fake_make_path_relative_ - f_return_status fake_make_path_relative(const fake_data_t data, const f_string_static_t path, fake_make_data_t *data_make) { + f_status_t fake_make_path_relative(const fake_data_t data, const f_string_static_t path, fake_make_data_t *data_make) { data_make->path_cache.used = 0; if (!path.used || path.used == data_make->path.stack.array[0].used) { diff --git a/level_3/fake/c/private-make.h b/level_3/fake/c/private-make.h index ed00b1f..371b0e6 100644 --- a/level_3/fake/c/private-make.h +++ b/level_3/fake/c/private-make.h @@ -410,7 +410,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_assure_inside_project_ - extern f_return_status fake_make_assure_inside_project(const fake_data_t data, const f_string_static_t path, fake_make_data_t *data_make) f_gcc_attribute_visibility_internal; + extern f_status_t fake_make_assure_inside_project(const fake_data_t data, const f_string_static_t path, fake_make_data_t *data_make) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_assure_inside_project_ /** @@ -432,7 +432,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_get_id_group_ - f_return_status fake_make_get_id_group(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, gid_t *id) f_gcc_attribute_visibility_internal; + f_status_t fake_make_get_id_group(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, gid_t *id) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_get_id_group_ /** @@ -458,7 +458,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_get_id_mode_ - f_return_status fake_make_get_id_mode(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, f_file_mode_t *mode, uint8_t *replace) f_gcc_attribute_visibility_internal; + f_status_t fake_make_get_id_mode(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, f_file_mode_t *mode, uint8_t *replace) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_get_id_mode_ /** @@ -480,7 +480,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_get_id_owner_ - f_return_status fake_make_get_id_owner(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, uid_t *id) f_gcc_attribute_visibility_internal; + f_status_t fake_make_get_id_owner(const fake_data_t data, const fll_error_print_t error, const f_string_static_t buffer, uid_t *id) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_get_id_owner_ /** @@ -538,7 +538,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_operate_ - extern f_return_status fake_make_operate(fake_data_t *data) f_gcc_attribute_visibility_internal; + extern f_status_t fake_make_operate(fake_data_t *data) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_operate_ /** @@ -592,7 +592,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_operate_expand_environment_ - extern f_return_status fake_make_operate_expand_environment(const fake_data_t data, const f_fss_quote_t quoted, const f_string_range_t range_name, fake_make_data_t *data_make, f_string_dynamics_t *arguments) f_gcc_attribute_visibility_internal; + extern f_status_t fake_make_operate_expand_environment(const fake_data_t data, const f_fss_quote_t quoted, const f_string_range_t range_name, fake_make_data_t *data_make, f_string_dynamics_t *arguments) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_operate_expand_environment_ /** @@ -616,7 +616,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_operate_expand_build_ - extern f_return_status fake_make_operate_expand_build(const fake_data_t data, const f_fss_quote_t quoted, const f_string_range_t range_name, fake_make_data_t *data_make, f_string_dynamics_t *arguments) f_gcc_attribute_visibility_internal; + extern f_status_t fake_make_operate_expand_build(const fake_data_t data, const f_fss_quote_t quoted, const f_string_range_t range_name, fake_make_data_t *data_make, f_string_dynamics_t *arguments) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_operate_expand_build_ /** @@ -698,7 +698,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_operate_process_execute_ - extern f_return_status fake_make_operate_process_execute(const fake_data_t data, const f_string_static_t program, const f_string_statics_t arguments, const bool as_shell, fake_make_data_t *data_make) f_gcc_attribute_visibility_internal; + extern f_status_t fake_make_operate_process_execute(const fake_data_t data, const f_string_static_t program, const f_string_statics_t arguments, const bool as_shell, fake_make_data_t *data_make) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_operate_process_execute_ /** @@ -736,7 +736,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_operate_process_run_ - extern f_return_status fake_make_operate_process_run(const fake_data_t data, const f_string_statics_t arguments, const bool as_shell, fake_make_data_t *data_make) f_gcc_attribute_visibility_internal; + extern f_status_t fake_make_operate_process_run(const fake_data_t data, const f_string_statics_t arguments, const bool as_shell, fake_make_data_t *data_make) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_operate_process_run_ /** @@ -788,7 +788,7 @@ extern "C" { * F_none if there is no string to validate (used = 0). */ #ifndef _di_fake_make_operate_validate_define_name_ - extern f_return_status fake_make_operate_validate_define_name(const f_string_static_t name) f_gcc_attribute_visibility_internal; + extern f_status_t fake_make_operate_validate_define_name(const f_string_static_t name) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_operate_validate_define_name_ /** @@ -806,7 +806,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_make_path_relative_ - extern f_return_status fake_make_path_relative(const fake_data_t data, const f_string_static_t path, fake_make_data_t *data_make) f_gcc_attribute_visibility_internal; + extern f_status_t fake_make_path_relative(const fake_data_t data, const f_string_static_t path, fake_make_data_t *data_make) f_gcc_attribute_visibility_internal; #endif // _di_fake_make_path_relative_ #ifdef __cplusplus diff --git a/level_3/fake/c/private-skeleton.c b/level_3/fake/c/private-skeleton.c index 53d6716..2a89277 100644 --- a/level_3/fake/c/private-skeleton.c +++ b/level_3/fake/c/private-skeleton.c @@ -10,7 +10,7 @@ extern "C" { #endif #ifndef _di_fake_skeleton_operate_ - f_return_status fake_skeleton_operate(const fake_data_t data) { + f_status_t fake_skeleton_operate(const fake_data_t data) { if (fake_signal_received(data)) { return F_signal; @@ -157,7 +157,7 @@ extern "C" { #endif // _di_fake_skeleton_operate_ #ifndef _di_fake_skeleton_operate_directory_create_ - f_return_status fake_skeleton_operate_directory_create(const fake_data_t data, const f_string_dynamic_t path) { + f_status_t fake_skeleton_operate_directory_create(const fake_data_t data, const f_string_dynamic_t path) { f_status_t status = F_none; if (!path.used) return F_none; @@ -213,7 +213,7 @@ extern "C" { #endif // _di_fake_skeleton_operate_directory_create_ #ifndef _di_fake_skeleton_operate_file_create_ - f_return_status fake_skeleton_operate_file_create(const fake_data_t data, const f_string_dynamic_t path, const bool executable, const f_string_static_t content) { + f_status_t fake_skeleton_operate_file_create(const fake_data_t data, const f_string_dynamic_t path, const bool executable, const f_string_static_t content) { f_status_t status = F_none; if (!path.used) return F_none; diff --git a/level_3/fake/c/private-skeleton.h b/level_3/fake/c/private-skeleton.h index fd18e3a..e880d02 100644 --- a/level_3/fake/c/private-skeleton.h +++ b/level_3/fake/c/private-skeleton.h @@ -36,7 +36,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_skeleton_operate_ - extern f_return_status fake_skeleton_operate(const fake_data_t data) f_gcc_attribute_visibility_internal; + extern f_status_t fake_skeleton_operate(const fake_data_t data) f_gcc_attribute_visibility_internal; #endif // _di_fake_skeleton_operate_ /** @@ -54,7 +54,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_skeleton_operate_directory_create_ - extern f_return_status fake_skeleton_operate_directory_create(const fake_data_t data, const f_string_dynamic_t path) f_gcc_attribute_visibility_internal; + extern f_status_t fake_skeleton_operate_directory_create(const fake_data_t data, const f_string_dynamic_t path) f_gcc_attribute_visibility_internal; #endif // _di_fake_skeleton_operate_directory_create_ /** @@ -77,7 +77,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fake_skeleton_operate_file_create_ - extern f_return_status fake_skeleton_operate_file_create(const fake_data_t data, const f_string_dynamic_t path, const bool executable, const f_string_static_t content) f_gcc_attribute_visibility_internal; + extern f_status_t fake_skeleton_operate_file_create(const fake_data_t data, const f_string_dynamic_t path, const bool executable, const f_string_static_t content) f_gcc_attribute_visibility_internal; #endif // _di_fake_skeleton_operate_file_create_ #ifdef __cplusplus diff --git a/level_3/firewall/c/firewall.c b/level_3/firewall/c/firewall.c index d21f8e3..65b2a4f 100644 --- a/level_3/firewall/c/firewall.c +++ b/level_3/firewall/c/firewall.c @@ -12,7 +12,7 @@ extern "C" { #endif #ifndef _di_firewall_print_help_ - f_return_status firewall_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t firewall_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, firewall_name_long, firewall_version); @@ -56,7 +56,7 @@ extern "C" { #endif // _di_firewall_print_help_ #ifndef _di_firewall_main_ - f_return_status firewall_main(const f_console_arguments_t arguments, firewall_data_t *data) { + f_status_t firewall_main(const f_console_arguments_t arguments, firewall_data_t *data) { f_status_t status = F_none; { @@ -724,7 +724,7 @@ extern "C" { #endif // _di_firewall_main_ #ifndef _di_firewall_delete_data_ - f_return_status firewall_delete_data(firewall_data_t *data) { + f_status_t firewall_delete_data(firewall_data_t *data) { for (f_string_length_t i = 0; i < firewall_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/firewall/c/firewall.h b/level_3/firewall/c/firewall.h index 7efbd86..8c93e00 100644 --- a/level_3/firewall/c/firewall.h +++ b/level_3/firewall/c/firewall.h @@ -305,7 +305,7 @@ extern "C" { * F_none on success. */ #ifndef _di_firewall_print_help_ - extern f_return_status firewall_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t firewall_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_firewall_print_help_ /** @@ -326,7 +326,7 @@ extern "C" { * @see firewall_delete_data() */ #ifndef _di_firewall_main_ - extern f_return_status firewall_main(const f_console_arguments_t arguments, firewall_data_t *data); + extern f_status_t firewall_main(const f_console_arguments_t arguments, firewall_data_t *data); #endif // _di_firewall_main_ /** @@ -345,7 +345,7 @@ extern "C" { * @see firewall_main() */ #ifndef _di_firewall_delete_data_ - extern f_return_status firewall_delete_data(firewall_data_t *data); + extern f_status_t firewall_delete_data(firewall_data_t *data); #endif // _di_firewall_delete_data_ #ifdef __cplusplus diff --git a/level_3/firewall/c/private-firewall.c b/level_3/firewall/c/private-firewall.c index 7b309e0..9200148 100644 --- a/level_3/firewall/c/private-firewall.c +++ b/level_3/firewall/c/private-firewall.c @@ -5,7 +5,7 @@ extern "C" { #endif -f_return_status firewall_perform_commands(const firewall_local_data_t local, const firewall_data_t data) { +f_status_t firewall_perform_commands(const firewall_local_data_t local, const firewall_data_t data) { f_status_t status = F_none; f_string_length_t i = 0; @@ -866,7 +866,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con return status; } -f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserved, firewall_local_data_t *local, firewall_data_t *data) { +f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, firewall_local_data_t *local, firewall_data_t *data) { f_status_t status = F_none; uint8_t tool = firewall_program_iptables; @@ -1150,7 +1150,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv return status; } -f_return_status firewall_delete_chains(const firewall_data_t data) { +f_status_t firewall_delete_chains(const firewall_data_t data) { const f_string_t tools[2] = { firewall_tool_iptables, firewall_tool_ip6tables }; f_status_t status = F_none; @@ -1277,7 +1277,7 @@ f_return_status firewall_delete_chains(const firewall_data_t data) { return status; } -f_return_status firewall_default_lock(const firewall_data_t data) { +f_status_t firewall_default_lock(const firewall_data_t data) { const f_string_t chains[3] = { firewall_chain_input, firewall_chain_output, firewall_chain_forward }; const f_string_t tools[2] = { firewall_tool_iptables, firewall_tool_ip6tables }; @@ -1360,7 +1360,7 @@ f_return_status firewall_default_lock(const firewall_data_t data) { return status; } -f_return_status firewall_buffer_rules(const f_string_t filename, const bool optional, firewall_local_data_t *local, firewall_data_t *data) { +f_status_t firewall_buffer_rules(const f_string_t filename, const bool optional, firewall_local_data_t *local, firewall_data_t *data) { f_file_t file = f_file_t_initialize; f_status_t status = f_file_open(filename, 0, &file); @@ -1467,7 +1467,7 @@ f_return_status firewall_buffer_rules(const f_string_t filename, const bool opti return status; } -f_return_status firewall_process_rules(f_string_range_t *range, firewall_local_data_t *local, firewall_data_t *data) { +f_status_t firewall_process_rules(f_string_range_t *range, firewall_local_data_t *local, firewall_data_t *data) { f_fss_delimits_t delimits = f_fss_delimits_t_initialize; f_status_t status = fll_fss_extended_read(local->buffer, range, &local->rule_objects, &local->rule_contents, 0, 0, &delimits, 0); @@ -1509,7 +1509,7 @@ f_return_status firewall_process_rules(f_string_range_t *range, firewall_local_d return status; } -f_return_status firewall_delete_local_data(firewall_local_data_t *local) { +f_status_t firewall_delete_local_data(firewall_local_data_t *local) { f_status_t status = F_none; local->is_global = F_true; diff --git a/level_3/firewall/c/private-firewall.h b/level_3/firewall/c/private-firewall.h index c2beb45..70b54db 100644 --- a/level_3/firewall/c/private-firewall.h +++ b/level_3/firewall/c/private-firewall.h @@ -113,7 +113,7 @@ typedef struct { * * Status codes (with error bit) are returned on any problem. */ -f_return_status firewall_perform_commands(const firewall_local_data_t local, const firewall_data_t data) f_gcc_attribute_visibility_internal; +f_status_t firewall_perform_commands(const firewall_local_data_t local, const firewall_data_t data) f_gcc_attribute_visibility_internal; /** * Create custom chains. @@ -130,7 +130,7 @@ f_return_status firewall_perform_commands(const firewall_local_data_t local, con * * Status codes (with error bit) are returned on any problem. */ -f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserved, firewall_local_data_t *local, firewall_data_t *data) f_gcc_attribute_visibility_internal; +f_status_t firewall_create_custom_chains(firewall_reserved_chains_t *reserved, firewall_local_data_t *local, firewall_data_t *data) f_gcc_attribute_visibility_internal; /** * Deallocate chains. @@ -143,7 +143,7 @@ f_return_status firewall_create_custom_chains(firewall_reserved_chains_t *reserv * * Status codes (with error bit) are returned on any problem. */ -f_return_status firewall_delete_chains(const firewall_data_t data) f_gcc_attribute_visibility_internal; +f_status_t firewall_delete_chains(const firewall_data_t data) f_gcc_attribute_visibility_internal; /** * Lock the firewall. @@ -156,7 +156,7 @@ f_return_status firewall_delete_chains(const firewall_data_t data) f_gcc_attribu * * Status codes (with error bit) are returned on any problem. */ -f_return_status firewall_default_lock(const firewall_data_t data) f_gcc_attribute_visibility_internal; +f_status_t firewall_default_lock(const firewall_data_t data) f_gcc_attribute_visibility_internal; /** * Buffer firewall rules. @@ -176,7 +176,7 @@ f_return_status firewall_default_lock(const firewall_data_t data) f_gcc_attribut * * Status codes (with error bit) are returned on any problem. */ -f_return_status firewall_buffer_rules(const f_string_t filename, const bool optional, firewall_local_data_t *local, firewall_data_t *data) f_gcc_attribute_visibility_internal; +f_status_t firewall_buffer_rules(const f_string_t filename, const bool optional, firewall_local_data_t *local, firewall_data_t *data) f_gcc_attribute_visibility_internal; /** * Process buffered rules. @@ -193,7 +193,7 @@ f_return_status firewall_buffer_rules(const f_string_t filename, const bool opti * * Status codes (with error bit) are returned on any problem. */ -f_return_status firewall_process_rules(f_string_range_t *range, firewall_local_data_t *local, firewall_data_t *data) f_gcc_attribute_visibility_internal; +f_status_t firewall_process_rules(f_string_range_t *range, firewall_local_data_t *local, firewall_data_t *data) f_gcc_attribute_visibility_internal; /** * Delete allocated data. @@ -206,7 +206,7 @@ f_return_status firewall_process_rules(f_string_range_t *range, firewall_local_d * * Status codes (with error bit) are returned on any problem. */ -f_return_status firewall_delete_local_data(firewall_local_data_t *local) f_gcc_attribute_visibility_internal; +f_status_t firewall_delete_local_data(firewall_local_data_t *local) f_gcc_attribute_visibility_internal; #ifdef __cplusplus } // extern "C" diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.c b/level_3/fss_basic_list_read/c/fss_basic_list_read.c index c693f11..3d0a8a2 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.c +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_basic_list_read_print_help_ - f_return_status fss_basic_list_read_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_basic_list_read_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_basic_list_read_name_long, fss_basic_list_read_version); @@ -159,7 +159,7 @@ extern "C" { #endif // _di_fss_basic_list_read_print_help_ #ifndef _di_fss_basic_list_read_main_ - f_return_status fss_basic_list_read_main(const f_console_arguments_t arguments, fss_basic_list_read_data_t *data) { + f_status_t fss_basic_list_read_main(const f_console_arguments_t arguments, fss_basic_list_read_data_t *data) { f_status_t status = F_none; { @@ -536,7 +536,7 @@ extern "C" { #endif // _di_fss_basic_list_read_main_ #ifndef _di_fss_basic_list_read_delete_data_ - f_return_status fss_basic_list_read_delete_data(fss_basic_list_read_data_t *data) { + f_status_t fss_basic_list_read_delete_data(fss_basic_list_read_data_t *data) { for (f_string_length_t i = 0; i < fss_basic_list_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_basic_list_read/c/fss_basic_list_read.h b/level_3/fss_basic_list_read/c/fss_basic_list_read.h index 3b2761d..4ccb533 100644 --- a/level_3/fss_basic_list_read/c/fss_basic_list_read.h +++ b/level_3/fss_basic_list_read/c/fss_basic_list_read.h @@ -215,7 +215,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_basic_list_read_print_help_ - extern f_return_status fss_basic_list_read_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_basic_list_read_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_basic_list_read_print_help_ /** @@ -236,7 +236,7 @@ extern "C" { * @see fss_basic_list_read_delete_data() */ #ifndef _di_fss_basic_list_read_main_ - extern f_return_status fss_basic_list_read_main(const f_console_arguments_t arguments, fss_basic_list_read_data_t *data); + extern f_status_t fss_basic_list_read_main(const f_console_arguments_t arguments, fss_basic_list_read_data_t *data); #endif // _di_fss_basic_list_read_main_ /** @@ -255,7 +255,7 @@ extern "C" { * @see fss_basic_list_read_main() */ #ifndef _di_fss_basic_list_read_delete_data_ - extern f_return_status fss_basic_list_read_delete_data(fss_basic_list_read_data_t *data); + extern f_status_t fss_basic_list_read_delete_data(fss_basic_list_read_data_t *data); #endif // _di_fss_basic_list_read_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c index 573ae29..63522da 100644 --- a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c +++ b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_basic_list_read_main_preprocess_depth_ - f_return_status fss_basic_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_basic_list_read_data_t data, fss_basic_list_read_depths_t *depths) { + f_status_t fss_basic_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_basic_list_read_data_t data, fss_basic_list_read_depths_t *depths) { f_status_t status = F_none; { @@ -170,7 +170,7 @@ extern "C" { #endif // _di_fss_basic_list_read_main_preprocess_depth_ #ifndef _di_fss_basic_list_read_main_process_file_ - f_return_status fss_basic_list_read_main_process_file(const f_console_arguments_t arguments, fss_basic_list_read_data_t *data, const f_string_t filename, const fss_basic_list_read_depths_t depths, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { + f_status_t fss_basic_list_read_main_process_file(const f_console_arguments_t arguments, fss_basic_list_read_data_t *data, const f_string_t filename, const fss_basic_list_read_depths_t depths, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { f_status_t status = F_none; const f_string_lengths_t except_none = f_string_lengths_t_initialize; @@ -320,7 +320,7 @@ extern "C" { return F_none; } - f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; + f_status_t (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; if (data->parameters[fss_basic_list_read_parameter_trim].result == f_console_result_found) { print_object = &fl_print_trim_except_dynamic_partial; diff --git a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.h b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.h index e9b6972..50ea39d 100644 --- a/level_3/fss_basic_list_read/c/private-fss_basic_list_read.h +++ b/level_3/fss_basic_list_read/c/private-fss_basic_list_read.h @@ -142,7 +142,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fss_basic_list_read_main_preprocess_depth_ - extern f_return_status fss_basic_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_basic_list_read_data_t data, fss_basic_list_read_depths_t *depths) f_gcc_attribute_visibility_internal; + extern f_status_t fss_basic_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_basic_list_read_data_t data, fss_basic_list_read_depths_t *depths) f_gcc_attribute_visibility_internal; #endif // _di_fss_basic_list_read_main_preprocess_depth_ /** @@ -170,7 +170,7 @@ extern "C" { * @see fss_basic_list_read_main_preprocess_depth() */ #ifndef _di_fss_basic_list_read_main_process_file_ - extern f_return_status fss_basic_list_read_main_process_file(const f_console_arguments_t arguments, fss_basic_list_read_data_t *data, const f_string_t file_name, const fss_basic_list_read_depths_t depths, f_fss_delimits_t *delimits, f_fss_comments_t *comments) f_gcc_attribute_visibility_internal; + extern f_status_t fss_basic_list_read_main_process_file(const f_console_arguments_t arguments, fss_basic_list_read_data_t *data, const f_string_t file_name, const fss_basic_list_read_depths_t depths, f_fss_delimits_t *delimits, f_fss_comments_t *comments) f_gcc_attribute_visibility_internal; #endif // _di_fss_basic_list_read_main_process_file_ /** diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.c b/level_3/fss_basic_list_write/c/fss_basic_list_write.c index 832348f..b74cc4e 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.c +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_basic_list_write_print_help_ - f_return_status fss_basic_list_write_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_basic_list_write_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_basic_list_write_name_long, fss_basic_list_write_version); @@ -86,7 +86,7 @@ extern "C" { #endif // _di_fss_basic_list_write_print_help_ #ifndef _di_fss_basic_list_write_main_ - f_return_status fss_basic_list_write_main(const f_console_arguments_t arguments, fss_basic_list_write_data_t *data) { + f_status_t fss_basic_list_write_main(const f_console_arguments_t arguments, fss_basic_list_write_data_t *data) { f_status_t status = F_none; { @@ -506,7 +506,7 @@ extern "C" { #endif // _di_fss_basic_list_write_main_ #ifndef _di_fss_basic_list_write_delete_data_ - f_return_status fss_basic_list_write_delete_data(fss_basic_list_write_data_t *data) { + f_status_t fss_basic_list_write_delete_data(fss_basic_list_write_data_t *data) { for (f_string_length_t i = 0; i < fss_basic_list_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_basic_list_write/c/fss_basic_list_write.h b/level_3/fss_basic_list_write/c/fss_basic_list_write.h index ee7eda2..ea6edfe 100644 --- a/level_3/fss_basic_list_write/c/fss_basic_list_write.h +++ b/level_3/fss_basic_list_write/c/fss_basic_list_write.h @@ -164,7 +164,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_basic_list_write_print_help_ - extern f_return_status fss_basic_list_write_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_basic_list_write_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_basic_list_write_print_help_ /** @@ -185,7 +185,7 @@ extern "C" { * @see fss_basic_list_write_delete_data() */ #ifndef _di_fss_basic_list_write_main_ - extern f_return_status fss_basic_list_write_main(const f_console_arguments_t arguments, fss_basic_list_write_data_t *data); + extern f_status_t fss_basic_list_write_main(const f_console_arguments_t arguments, fss_basic_list_write_data_t *data); #endif // _di_fss_basic_list_write_main_ /** @@ -204,7 +204,7 @@ extern "C" { * @see fss_basic_list_write_main() */ #ifndef _di_fss_basic_list_write_delete_data_ - extern f_return_status fss_basic_list_write_delete_data(fss_basic_list_write_data_t *data); + extern f_status_t fss_basic_list_write_delete_data(fss_basic_list_write_data_t *data); #endif // _di_fss_basic_list_write_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c b/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c index bca4e59..ec5aff9 100644 --- a/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c +++ b/level_3/fss_basic_list_write/c/private-fss_basic_list_write.c @@ -52,7 +52,7 @@ extern "C" { #endif // _di_fss_basic_list_write_error_parameter_value_missing_print_ #ifndef _di_fss_basic_list_write_process_ - f_return_status fss_basic_list_write_process(const fss_basic_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, f_string_dynamic_t *buffer) { + f_status_t fss_basic_list_write_process(const fss_basic_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, f_string_dynamic_t *buffer) { f_status_t status = F_none; f_string_range_t range = f_string_range_t_initialize; @@ -121,7 +121,7 @@ extern "C" { #endif // _di_fss_basic_list_write_process_ #ifndef _di_fss_basic_list_write_process_pipe_ - f_return_status fss_basic_list_write_process_pipe(const fss_basic_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) { + f_status_t fss_basic_list_write_process_pipe(const fss_basic_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) { f_status_t status = F_none; f_status_t status_pipe = F_none; diff --git a/level_3/fss_basic_list_write/c/private-fss_basic_list_write.h b/level_3/fss_basic_list_write/c/private-fss_basic_list_write.h index e408a31..442d25b 100644 --- a/level_3/fss_basic_list_write/c/private-fss_basic_list_write.h +++ b/level_3/fss_basic_list_write/c/private-fss_basic_list_write.h @@ -70,7 +70,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_basic_list_write_process_ - extern f_return_status fss_basic_list_write_process(const fss_basic_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; + extern f_status_t fss_basic_list_write_process(const fss_basic_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; #endif // _di_fss_basic_list_write_process_ /** @@ -91,7 +91,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_basic_list_write_process_pipe_ - extern f_return_status fss_basic_list_write_process_pipe(const fss_basic_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; + extern f_status_t fss_basic_list_write_process_pipe(const fss_basic_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; #endif // _di_fss_basic_list_write_process_pipe_ #ifdef __cplusplus diff --git a/level_3/fss_basic_read/c/fss_basic_read.c b/level_3/fss_basic_read/c/fss_basic_read.c index cd1f514..8d943a2 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.c +++ b/level_3/fss_basic_read/c/fss_basic_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_basic_read_print_help_ - f_return_status fss_basic_read_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_basic_read_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_basic_read_name_long, fss_basic_read_version); @@ -159,7 +159,7 @@ extern "C" { #endif // _di_fss_basic_read_print_help_ #ifndef _di_fss_basic_read_main_ - f_return_status fss_basic_read_main(const f_console_arguments_t arguments, fss_basic_read_data_t *data) { + f_status_t fss_basic_read_main(const f_console_arguments_t arguments, fss_basic_read_data_t *data) { f_status_t status = F_none; { @@ -534,7 +534,7 @@ extern "C" { #endif // _di_fss_basic_read_main_ #ifndef _di_fss_basic_read_delete_data_ - f_return_status fss_basic_read_delete_data(fss_basic_read_data_t *data) { + f_status_t fss_basic_read_delete_data(fss_basic_read_data_t *data) { for (f_string_length_t i = 0; i < fss_basic_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_basic_read/c/fss_basic_read.h b/level_3/fss_basic_read/c/fss_basic_read.h index 0b39393..85e3b0b 100644 --- a/level_3/fss_basic_read/c/fss_basic_read.h +++ b/level_3/fss_basic_read/c/fss_basic_read.h @@ -215,7 +215,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_basic_read_print_help_ - extern f_return_status fss_basic_read_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_basic_read_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_basic_read_print_help_ /** @@ -236,7 +236,7 @@ extern "C" { * @see fss_basic_read_delete_data() */ #ifndef _di_fss_basic_read_main_ - extern f_return_status fss_basic_read_main(const f_console_arguments_t arguments, fss_basic_read_data_t *data); + extern f_status_t fss_basic_read_main(const f_console_arguments_t arguments, fss_basic_read_data_t *data); #endif // _di_fss_basic_read_main_ /** @@ -255,7 +255,7 @@ extern "C" { * @see fss_basic_read_main() */ #ifndef _di_fss_basic_read_delete_data_ - extern f_return_status fss_basic_read_delete_data(fss_basic_read_data_t *data); + extern f_status_t fss_basic_read_delete_data(fss_basic_read_data_t *data); #endif // _di_fss_basic_read_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_basic_read/c/private-fss_basic_read.c b/level_3/fss_basic_read/c/private-fss_basic_read.c index 53192b2..91acecb 100644 --- a/level_3/fss_basic_read/c/private-fss_basic_read.c +++ b/level_3/fss_basic_read/c/private-fss_basic_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_basic_read_main_preprocess_depth_ - f_return_status fss_basic_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_basic_read_data_t data, fss_basic_read_depths_t *depths) { + f_status_t fss_basic_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_basic_read_data_t data, fss_basic_read_depths_t *depths) { f_status_t status = F_none; { @@ -170,7 +170,7 @@ extern "C" { #endif // _di_fss_basic_read_main_preprocess_depth_ #ifndef _di_fss_basic_read_main_process_file_ - f_return_status fss_basic_read_main_process_file(const f_console_arguments_t arguments, fss_basic_read_data_t *data, const f_string_t filename, const fss_basic_read_depths_t depths, f_fss_delimits_t *delimits) { + f_status_t fss_basic_read_main_process_file(const f_console_arguments_t arguments, fss_basic_read_data_t *data, const f_string_t filename, const fss_basic_read_depths_t depths, f_fss_delimits_t *delimits) { f_status_t status = F_none; const f_string_lengths_t except_none = f_string_lengths_t_initialize; @@ -309,7 +309,7 @@ extern "C" { return F_none; } - f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; + f_status_t (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; if (data->parameters[fss_basic_read_parameter_trim].result == f_console_result_found) { print_object = &fl_print_trim_except_dynamic_partial; diff --git a/level_3/fss_basic_read/c/private-fss_basic_read.h b/level_3/fss_basic_read/c/private-fss_basic_read.h index 1b4ba5e..0a9b0c1 100644 --- a/level_3/fss_basic_read/c/private-fss_basic_read.h +++ b/level_3/fss_basic_read/c/private-fss_basic_read.h @@ -142,7 +142,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fss_basic_read_main_preprocess_depth_ - extern f_return_status fss_basic_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_basic_read_data_t data, fss_basic_read_depths_t *depths) f_gcc_attribute_visibility_internal; + extern f_status_t fss_basic_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_basic_read_data_t data, fss_basic_read_depths_t *depths) f_gcc_attribute_visibility_internal; #endif // _di_fss_basic_read_main_preprocess_depth_ /** @@ -167,7 +167,7 @@ extern "C" { * @see fss_basic_read_main_preprocess_depth() */ #ifndef _di_fss_basic_read_main_process_file_ - extern f_return_status fss_basic_read_main_process_file(const f_console_arguments_t arguments, fss_basic_read_data_t *data, const f_string_t file_name, const fss_basic_read_depths_t depths, f_fss_delimits_t *delimits) f_gcc_attribute_visibility_internal; + extern f_status_t fss_basic_read_main_process_file(const f_console_arguments_t arguments, fss_basic_read_data_t *data, const f_string_t file_name, const fss_basic_read_depths_t depths, f_fss_delimits_t *delimits) f_gcc_attribute_visibility_internal; #endif // _di_fss_basic_read_main_process_file_ /** diff --git a/level_3/fss_basic_write/c/fss_basic_write.c b/level_3/fss_basic_write/c/fss_basic_write.c index e0cfa7e..7a0c466 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.c +++ b/level_3/fss_basic_write/c/fss_basic_write.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_basic_write_print_help_ - f_return_status fss_basic_write_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_basic_write_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_basic_write_name_long, fss_basic_write_version); @@ -84,7 +84,7 @@ extern "C" { #endif // _di_fss_basic_write_print_help_ #ifndef _di_fss_basic_write_main_ - f_return_status fss_basic_write_main(const f_console_arguments_t arguments, fss_basic_write_data_t *data) { + f_status_t fss_basic_write_main(const f_console_arguments_t arguments, fss_basic_write_data_t *data) { f_status_t status = F_none; { @@ -505,7 +505,7 @@ extern "C" { #endif // _di_fss_basic_write_main_ #ifndef _di_fss_basic_write_delete_data_ - f_return_status fss_basic_write_delete_data(fss_basic_write_data_t *data) { + f_status_t fss_basic_write_delete_data(fss_basic_write_data_t *data) { for (f_string_length_t i = 0; i < fss_basic_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_basic_write/c/fss_basic_write.h b/level_3/fss_basic_write/c/fss_basic_write.h index b64158f..1858749 100644 --- a/level_3/fss_basic_write/c/fss_basic_write.h +++ b/level_3/fss_basic_write/c/fss_basic_write.h @@ -163,7 +163,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_basic_write_print_help_ - extern f_return_status fss_basic_write_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_basic_write_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_basic_write_print_help_ /** @@ -183,7 +183,7 @@ extern "C" { * @see fss_basic_write_delete_data() */ #ifndef _di_fss_basic_write_main_ - extern f_return_status fss_basic_write_main(const f_console_arguments_t arguments, fss_basic_write_data_t *data); + extern f_status_t fss_basic_write_main(const f_console_arguments_t arguments, fss_basic_write_data_t *data); #endif // _di_fss_basic_write_main_ /** @@ -201,7 +201,7 @@ extern "C" { * @see fss_basic_write_main() */ #ifndef _di_fss_basic_write_delete_data_ - extern f_return_status fss_basic_write_delete_data(fss_basic_write_data_t *data); + extern f_status_t fss_basic_write_delete_data(fss_basic_write_data_t *data); #endif // _di_fss_basic_write_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_basic_write/c/private-fss_basic_write.c b/level_3/fss_basic_write/c/private-fss_basic_write.c index 3b3f38e..b710bb3 100644 --- a/level_3/fss_basic_write/c/private-fss_basic_write.c +++ b/level_3/fss_basic_write/c/private-fss_basic_write.c @@ -52,7 +52,7 @@ extern "C" { #endif // _di_fss_basic_write_error_parameter_unsupported_eol_print_ #ifndef _di_fss_basic_write_process_ - f_return_status fss_basic_write_process(const fss_basic_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, f_string_dynamic_t *buffer) { + f_status_t fss_basic_write_process(const fss_basic_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, f_string_dynamic_t *buffer) { f_status_t status = F_none; f_string_range_t range = f_string_range_t_initialize; @@ -133,7 +133,7 @@ extern "C" { #endif // _di_fss_basic_write_process_ #ifndef _di_fss_basic_write_process_pipe_ - f_return_status fss_basic_write_process_pipe(const fss_basic_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) { + f_status_t fss_basic_write_process_pipe(const fss_basic_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) { f_status_t status = F_none; f_status_t status_pipe = F_none; diff --git a/level_3/fss_basic_write/c/private-fss_basic_write.h b/level_3/fss_basic_write/c/private-fss_basic_write.h index 8263e6c..3375344 100644 --- a/level_3/fss_basic_write/c/private-fss_basic_write.h +++ b/level_3/fss_basic_write/c/private-fss_basic_write.h @@ -70,7 +70,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_basic_write_process_ - extern f_return_status fss_basic_write_process(const fss_basic_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; + extern f_status_t fss_basic_write_process(const fss_basic_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; #endif // _di_fss_basic_write_process_ /** @@ -91,7 +91,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_basic_write_process_pipe_ - extern f_return_status fss_basic_write_process_pipe(const fss_basic_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; + extern f_status_t fss_basic_write_process_pipe(const fss_basic_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; #endif // _di_fss_basic_write_process_pipe_ #ifdef __cplusplus diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c index 43ba6a4..ef82c42 100644 --- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c +++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_embedded_list_read_print_help_ - f_return_status fss_embedded_list_read_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_embedded_list_read_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_embedded_list_read_name_long, fss_embedded_list_read_version); @@ -159,7 +159,7 @@ extern "C" { #endif // _di_fss_embedded_list_read_print_help_ #ifndef _di_fss_embedded_list_read_main_ - f_return_status fss_embedded_list_read_main(const f_console_arguments_t arguments, fss_embedded_list_read_data_t *data) { + f_status_t fss_embedded_list_read_main(const f_console_arguments_t arguments, fss_embedded_list_read_data_t *data) { f_status_t status = F_none; { @@ -520,7 +520,7 @@ extern "C" { #endif // _di_fss_embedded_list_read_main_ #ifndef _di_fss_embedded_list_read_delete_data_ - f_return_status fss_embedded_list_read_delete_data(fss_embedded_list_read_data_t *data) { + f_status_t fss_embedded_list_read_delete_data(fss_embedded_list_read_data_t *data) { for (f_string_length_t i = 0; i < fss_embedded_list_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h index 580bc8a..69fab16 100644 --- a/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h +++ b/level_3/fss_embedded_list_read/c/fss_embedded_list_read.h @@ -213,7 +213,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_embedded_list_read_print_help_ - extern f_return_status fss_embedded_list_read_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_embedded_list_read_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_embedded_list_read_print_help_ /** @@ -234,7 +234,7 @@ extern "C" { * @see fss_embedded_list_read_delete_data() */ #ifndef _di_fss_embedded_list_read_main_ - extern f_return_status fss_embedded_list_read_main(const f_console_arguments_t arguments, fss_embedded_list_read_data_t *data); + extern f_status_t fss_embedded_list_read_main(const f_console_arguments_t arguments, fss_embedded_list_read_data_t *data); #endif // _di_fss_embedded_list_read_main_ /** @@ -253,7 +253,7 @@ extern "C" { * @see fss_embedded_list_read_main() */ #ifndef _di_fss_embedded_list_read_delete_data_ - extern f_return_status fss_embedded_list_read_delete_data(fss_embedded_list_read_data_t *data); + extern f_status_t fss_embedded_list_read_delete_data(fss_embedded_list_read_data_t *data); #endif // _di_fss_embedded_list_read_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c b/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c index cbb8978..ff93fd5 100644 --- a/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c +++ b/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_embedded_list_read_main_preprocess_depth_ - f_return_status fss_embedded_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_embedded_list_read_data_t data, fss_embedded_list_read_depths_t *depths) { + f_status_t fss_embedded_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_embedded_list_read_data_t data, fss_embedded_list_read_depths_t *depths) { f_status_t status = F_none; const f_array_length_t values_total = data.parameters[fss_embedded_list_read_parameter_depth].values.used + data.parameters[fss_embedded_list_read_parameter_at].values.used + data.parameters[fss_embedded_list_read_parameter_name].values.used; @@ -216,7 +216,7 @@ extern "C" { #endif // _di_fss_embedded_list_read_main_preprocess_depth_ #ifndef _di_fss_embedded_list_read_main_process_file_ - f_return_status fss_embedded_list_read_main_process_file(const f_console_arguments_t arguments, fss_embedded_list_read_data_t *data, const f_string_t filename, const fss_embedded_list_read_depths_t depths, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) { + f_status_t fss_embedded_list_read_main_process_file(const f_console_arguments_t arguments, fss_embedded_list_read_data_t *data, const f_string_t filename, const fss_embedded_list_read_depths_t depths, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) { f_status_t status = F_none; { @@ -316,7 +316,7 @@ extern "C" { #endif // _di_fss_embedded_list_read_main_process_file_ #ifndef _di_fss_embedded_list_read_main_process_for_depth_ - f_return_status fss_embedded_list_read_main_process_for_depth(const f_console_arguments_t arguments, const f_string_t filename, const fss_embedded_list_read_depths_t depths, const f_array_length_t depths_index, const f_array_length_t line, const fss_embedded_list_read_skip_t parents, fss_embedded_list_read_data_t *data, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) { + f_status_t fss_embedded_list_read_main_process_for_depth(const f_console_arguments_t arguments, const f_string_t filename, const fss_embedded_list_read_depths_t depths, const f_array_length_t depths_index, const f_array_length_t line, const fss_embedded_list_read_skip_t parents, fss_embedded_list_read_data_t *data, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) { f_fss_items_t *items = &data->nest.depth[depths.array[depths_index].depth]; @@ -483,7 +483,7 @@ extern "C" { return F_none; } - f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; + f_status_t (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; if (data->parameters[fss_embedded_list_read_parameter_trim].result == f_console_result_found) { print_object = &fl_print_trim_except_dynamic_partial; @@ -862,7 +862,7 @@ extern "C" { #endif // _di_fss_embedded_list_read_process_delimits_objects_ #ifndef _di_fss_embedded_list_read_process_delimits_within_greater_ - f_return_status fss_embedded_list_read_process_delimits_within_greater(const fss_embedded_list_read_data_t data, const f_string_length_t depth, const f_string_length_t location) { + f_status_t fss_embedded_list_read_process_delimits_within_greater(const fss_embedded_list_read_data_t data, const f_string_length_t depth, const f_string_length_t location) { if (depth + 1 >= data.nest.used) return F_false; diff --git a/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.h b/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.h index 622c900..4f59e22 100644 --- a/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.h +++ b/level_3/fss_embedded_list_read/c/private-fss_embedded_list_read.h @@ -167,7 +167,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fss_embedded_list_read_main_preprocess_depth_ - extern f_return_status fss_embedded_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_embedded_list_read_data_t data, fss_embedded_list_read_depths_t *depths) f_gcc_attribute_visibility_internal; + extern f_status_t fss_embedded_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_embedded_list_read_data_t data, fss_embedded_list_read_depths_t *depths) f_gcc_attribute_visibility_internal; #endif // _di_fss_embedded_list_read_main_preprocess_depth_ /** @@ -198,7 +198,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fss_embedded_list_read_main_process_file_ - extern f_return_status fss_embedded_list_read_main_process_file(const f_console_arguments_t arguments, fss_embedded_list_read_data_t *data, const f_string_t file_name, const fss_embedded_list_read_depths_t depths, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) f_gcc_attribute_visibility_internal; + extern f_status_t fss_embedded_list_read_main_process_file(const f_console_arguments_t arguments, fss_embedded_list_read_data_t *data, const f_string_t file_name, const fss_embedded_list_read_depths_t depths, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits, f_fss_comments_t *comments) f_gcc_attribute_visibility_internal; #endif // _di_fss_embedded_list_read_main_process_file_ /** @@ -234,7 +234,7 @@ extern "C" { * @see fss_embedded_list_read_main_process_file() */ #ifndef _di_fss_embedded_list_read_main_process_for_depth_ - extern f_return_status fss_embedded_list_read_main_process_for_depth(const f_console_arguments_t arguments, const f_string_t filename, const fss_embedded_list_read_depths_t depths, const f_array_length_t depths_index, const f_array_length_t line, const fss_embedded_list_read_skip_t parents, fss_embedded_list_read_data_t *data, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) f_gcc_attribute_visibility_internal; + extern f_status_t fss_embedded_list_read_main_process_for_depth(const f_console_arguments_t arguments, const f_string_t filename, const fss_embedded_list_read_depths_t depths, const f_array_length_t depths_index, const f_array_length_t line, const fss_embedded_list_read_skip_t parents, fss_embedded_list_read_data_t *data, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) f_gcc_attribute_visibility_internal; #endif // _di_fss_embedded_list_read_main_process_for_depth_ /** @@ -353,7 +353,7 @@ extern "C" { * @see fss_embedded_list_read_process_delimits_contents() */ #ifndef _di_fss_embedded_list_read_process_delimits_within_greater_ - extern f_return_status fss_embedded_list_read_process_delimits_within_greater(const fss_embedded_list_read_data_t data, const f_string_length_t depth, const f_string_length_t location) f_gcc_attribute_visibility_internal; + extern f_status_t fss_embedded_list_read_process_delimits_within_greater(const fss_embedded_list_read_data_t data, const f_string_length_t depth, const f_string_length_t location) f_gcc_attribute_visibility_internal; #endif // _di_fss_embedded_list_read_process_delimits_within_greater_ #ifdef __cplusplus diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c index b425f4f..035737e 100644 --- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c +++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_embedded_list_write_print_help_ - f_return_status fss_embedded_list_write_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_embedded_list_write_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_embedded_list_write_name_long, fss_embedded_list_write_version); @@ -92,7 +92,7 @@ extern "C" { #endif // _di_fss_embedded_list_write_print_help_ #ifndef _di_fss_embedded_list_write_main_ - f_return_status fss_embedded_list_write_main(const f_console_arguments_t arguments, fss_embedded_list_write_data_t *data) { + f_status_t fss_embedded_list_write_main(const f_console_arguments_t arguments, fss_embedded_list_write_data_t *data) { f_status_t status = F_none; { @@ -523,7 +523,7 @@ extern "C" { #endif // _di_fss_embedded_list_write_main_ #ifndef _di_fss_embedded_list_write_delete_data_ - f_return_status fss_embedded_list_write_delete_data(fss_embedded_list_write_data_t *data) { + f_status_t fss_embedded_list_write_delete_data(fss_embedded_list_write_data_t *data) { for (f_string_length_t i = 0; i < fss_embedded_list_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h index 78dd4b6..537ed62 100644 --- a/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h +++ b/level_3/fss_embedded_list_write/c/fss_embedded_list_write.h @@ -165,7 +165,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_embedded_list_write_print_help_ - extern f_return_status fss_embedded_list_write_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_embedded_list_write_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_embedded_list_write_print_help_ /** @@ -186,7 +186,7 @@ extern "C" { * @see fss_embedded_list_write_delete_data() */ #ifndef _di_fss_embedded_list_write_main_ - extern f_return_status fss_embedded_list_write_main(const f_console_arguments_t arguments, fss_embedded_list_write_data_t *data); + extern f_status_t fss_embedded_list_write_main(const f_console_arguments_t arguments, fss_embedded_list_write_data_t *data); #endif // _di_fss_embedded_list_write_main_ /** @@ -205,7 +205,7 @@ extern "C" { * @see fss_embedded_list_write_main() */ #ifndef _di_fss_embedded_list_write_delete_data_ - extern f_return_status fss_embedded_list_write_delete_data(fss_embedded_list_write_data_t *data); + extern f_status_t fss_embedded_list_write_delete_data(fss_embedded_list_write_data_t *data); #endif // _di_fss_embedded_list_write_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c index 704478a..071978c 100644 --- a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c +++ b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.c @@ -52,7 +52,7 @@ extern "C" { #endif // _di_fss_embedded_list_write_error_parameter_value_missing_print_ #ifndef _di_fss_embedded_list_write_process_ - f_return_status fss_embedded_list_write_process(const fss_embedded_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, const f_string_ranges_t *ignore, f_string_dynamic_t *buffer) { + f_status_t fss_embedded_list_write_process(const fss_embedded_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, const f_string_ranges_t *ignore, f_string_dynamic_t *buffer) { f_status_t status = F_none; f_string_range_t range = f_string_range_t_initialize; @@ -121,7 +121,7 @@ extern "C" { #endif // _di_fss_embedded_list_write_process_ #ifndef _di_fss_embedded_list_write_process_pipe_ - f_return_status fss_embedded_list_write_process_pipe(const fss_embedded_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer, f_string_ranges_t *ignore) { + f_status_t fss_embedded_list_write_process_pipe(const fss_embedded_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer, f_string_ranges_t *ignore) { f_status_t status = F_none; f_status_t status_pipe = F_none; @@ -322,7 +322,7 @@ extern "C" { #endif // _di_fss_embedded_list_write_process_pipe_ #ifndef _di_fss_embedded_list_write_process_parameter_ignore_ - f_return_status fss_embedded_list_write_process_parameter_ignore(const f_console_arguments_t arguments, const fss_embedded_list_write_data_t data, const f_array_lengths_t contents, const f_array_length_t location, f_string_ranges_t *ignore) { + f_status_t fss_embedded_list_write_process_parameter_ignore(const f_console_arguments_t arguments, const fss_embedded_list_write_data_t data, const f_array_lengths_t contents, const f_array_length_t location, f_string_ranges_t *ignore) { f_status_t status = F_none; f_array_length_t i = 0; diff --git a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.h b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.h index 4fbd049..6d0963a 100644 --- a/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.h +++ b/level_3/fss_embedded_list_write/c/private-fss_embedded_list_write.h @@ -73,7 +73,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_embedded_list_write_process_ - extern f_return_status fss_embedded_list_write_process(const fss_embedded_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, const f_string_ranges_t *ignore, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; + extern f_status_t fss_embedded_list_write_process(const fss_embedded_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, const f_string_ranges_t *ignore, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; #endif // _di_fss_embedded_list_write_process_ /** @@ -97,7 +97,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_embedded_list_write_process_pipe_ - extern f_return_status fss_embedded_list_write_process_pipe(const fss_embedded_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer, f_string_ranges_t *ignore) f_gcc_attribute_visibility_internal; + extern f_status_t fss_embedded_list_write_process_pipe(const fss_embedded_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer, f_string_ranges_t *ignore) f_gcc_attribute_visibility_internal; #endif // _di_fss_embedded_list_write_process_pipe_ /** @@ -119,7 +119,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_embedded_list_write_process_parameter_ignore_ - extern f_return_status fss_embedded_list_write_process_parameter_ignore(const f_console_arguments_t arguments, const fss_embedded_list_write_data_t data, const f_array_lengths_t contents, const f_array_length_t location, f_string_ranges_t *ignore) f_gcc_attribute_visibility_internal; + extern f_status_t fss_embedded_list_write_process_parameter_ignore(const f_console_arguments_t arguments, const fss_embedded_list_write_data_t data, const f_array_lengths_t contents, const f_array_length_t location, f_string_ranges_t *ignore) f_gcc_attribute_visibility_internal; #endif // _di_fss_embedded_list_write_process_parameter_ignore_ #ifdef __cplusplus diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.c b/level_3/fss_extended_list_read/c/fss_extended_list_read.c index 34f32a6..62780a6 100644 --- a/level_3/fss_extended_list_read/c/fss_extended_list_read.c +++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_extended_list_read_print_help_ - f_return_status fss_extended_list_read_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_extended_list_read_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_extended_list_read_name_long, fss_extended_list_read_version); @@ -159,7 +159,7 @@ extern "C" { #endif // _di_fss_extended_list_read_print_help_ #ifndef _di_fss_extended_list_read_main_ - f_return_status fss_extended_list_read_main(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data) { + f_status_t fss_extended_list_read_main(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data) { f_status_t status = F_none; { @@ -536,7 +536,7 @@ extern "C" { #endif // _di_fss_extended_list_read_main_ #ifndef _di_fss_extended_list_read_delete_data_ - f_return_status fss_extended_list_read_delete_data(fss_extended_list_read_data_t *data) { + f_status_t fss_extended_list_read_delete_data(fss_extended_list_read_data_t *data) { for (f_string_length_t i = 0; i < fss_extended_list_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_extended_list_read/c/fss_extended_list_read.h b/level_3/fss_extended_list_read/c/fss_extended_list_read.h index 76f99ef..ba30800 100644 --- a/level_3/fss_extended_list_read/c/fss_extended_list_read.h +++ b/level_3/fss_extended_list_read/c/fss_extended_list_read.h @@ -215,7 +215,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_extended_list_read_print_help_ - extern f_return_status fss_extended_list_read_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_extended_list_read_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_extended_list_read_print_help_ /** @@ -236,7 +236,7 @@ extern "C" { * @see fss_extended_list_read_delete_data() */ #ifndef _di_fss_extended_list_read_main_ - extern f_return_status fss_extended_list_read_main(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data); + extern f_status_t fss_extended_list_read_main(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data); #endif // _di_fss_extended_list_read_main_ /** @@ -255,7 +255,7 @@ extern "C" { * @see fss_extended_list_read_main() */ #ifndef _di_fss_extended_list_read_delete_data_ - extern f_return_status fss_extended_list_read_delete_data(fss_extended_list_read_data_t *data); + extern f_status_t fss_extended_list_read_delete_data(fss_extended_list_read_data_t *data); #endif // _di_fss_extended_list_read_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c index 07f3407..c6b7e5f 100644 --- a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c +++ b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_extended_list_read_main_preprocess_depth_ - f_return_status fss_extended_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_extended_list_read_data_t data, fss_extended_list_read_depths_t *depths) { + f_status_t fss_extended_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_extended_list_read_data_t data, fss_extended_list_read_depths_t *depths) { f_status_t status = F_none; { @@ -170,7 +170,7 @@ extern "C" { #endif // _di_fss_extended_list_read_main_preprocess_depth_ #ifndef _di_fss_extended_list_read_main_process_file_ - f_return_status fss_extended_list_read_main_process_file(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data, const f_string_t filename, const fss_extended_list_read_depths_t depths, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { + f_status_t fss_extended_list_read_main_process_file(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data, const f_string_t filename, const fss_extended_list_read_depths_t depths, f_fss_delimits_t *delimits, f_fss_comments_t *comments) { f_status_t status = F_none; const f_string_lengths_t except_none = f_string_lengths_t_initialize; @@ -320,7 +320,7 @@ extern "C" { return F_none; } - f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; + f_status_t (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; if (data->parameters[fss_extended_list_read_parameter_trim].result == f_console_result_found) { print_object = &fl_print_trim_except_dynamic_partial; diff --git a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.h b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.h index e1740ee..44685dc 100644 --- a/level_3/fss_extended_list_read/c/private-fss_extended_list_read.h +++ b/level_3/fss_extended_list_read/c/private-fss_extended_list_read.h @@ -142,7 +142,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fss_extended_list_read_main_preprocess_depth_ - extern f_return_status fss_extended_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_extended_list_read_data_t data, fss_extended_list_read_depths_t *depths) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_list_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_extended_list_read_data_t data, fss_extended_list_read_depths_t *depths) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_list_read_main_preprocess_depth_ /** @@ -170,7 +170,7 @@ extern "C" { * @see fss_extended_list_read_main_preprocess_depth() */ #ifndef _di_fss_extended_list_read_main_process_file_ - extern f_return_status fss_extended_list_read_main_process_file(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data, const f_string_t file_name, const fss_extended_list_read_depths_t depths, f_fss_delimits_t *delimits, f_fss_comments_t *comments) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_list_read_main_process_file(const f_console_arguments_t arguments, fss_extended_list_read_data_t *data, const f_string_t file_name, const fss_extended_list_read_depths_t depths, f_fss_delimits_t *delimits, f_fss_comments_t *comments) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_list_read_main_process_file_ /** diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.c b/level_3/fss_extended_list_write/c/fss_extended_list_write.c index af99f72..cfc126a 100644 --- a/level_3/fss_extended_list_write/c/fss_extended_list_write.c +++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_extended_list_write_print_help_ - f_return_status fss_extended_list_write_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_extended_list_write_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_extended_list_write_name_long, fss_extended_list_write_version); @@ -92,7 +92,7 @@ extern "C" { #endif // _di_fss_extended_list_write_print_help_ #ifndef _di_fss_extended_list_write_main_ - f_return_status fss_extended_list_write_main(const f_console_arguments_t arguments, fss_extended_list_write_data_t *data) { + f_status_t fss_extended_list_write_main(const f_console_arguments_t arguments, fss_extended_list_write_data_t *data) { f_status_t status = F_none; { @@ -523,7 +523,7 @@ extern "C" { #endif // _di_fss_extended_list_write_main_ #ifndef _di_fss_extended_list_write_delete_data_ - f_return_status fss_extended_list_write_delete_data(fss_extended_list_write_data_t *data) { + f_status_t fss_extended_list_write_delete_data(fss_extended_list_write_data_t *data) { for (f_string_length_t i = 0; i < fss_extended_list_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_extended_list_write/c/fss_extended_list_write.h b/level_3/fss_extended_list_write/c/fss_extended_list_write.h index dc6f96a..089da84 100644 --- a/level_3/fss_extended_list_write/c/fss_extended_list_write.h +++ b/level_3/fss_extended_list_write/c/fss_extended_list_write.h @@ -165,7 +165,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_extended_list_write_print_help_ - extern f_return_status fss_extended_list_write_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_extended_list_write_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_extended_list_write_print_help_ /** @@ -186,7 +186,7 @@ extern "C" { * @see fss_extended_list_write_delete_data() */ #ifndef _di_fss_extended_list_write_main_ - extern f_return_status fss_extended_list_write_main(const f_console_arguments_t arguments, fss_extended_list_write_data_t *data); + extern f_status_t fss_extended_list_write_main(const f_console_arguments_t arguments, fss_extended_list_write_data_t *data); #endif // _di_fss_extended_list_write_main_ /** @@ -205,7 +205,7 @@ extern "C" { * @see fss_extended_list_write_main() */ #ifndef _di_fss_extended_list_write_delete_data_ - extern f_return_status fss_extended_list_write_delete_data(fss_extended_list_write_data_t *data); + extern f_status_t fss_extended_list_write_delete_data(fss_extended_list_write_data_t *data); #endif // _di_fss_extended_list_write_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c index 601af5e..c0eeff5 100644 --- a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c +++ b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.c @@ -52,7 +52,7 @@ extern "C" { #endif // _di_fss_extended_list_write_error_parameter_value_missing_print_ #ifndef _di_fss_extended_list_write_process_ - f_return_status fss_extended_list_write_process(const fss_extended_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, const f_string_ranges_t *ignore, f_string_dynamic_t *buffer) { + f_status_t fss_extended_list_write_process(const fss_extended_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, const f_string_ranges_t *ignore, f_string_dynamic_t *buffer) { f_status_t status = F_none; f_string_range_t range = f_string_range_t_initialize; @@ -121,7 +121,7 @@ extern "C" { #endif // _di_fss_extended_list_write_process_ #ifndef _di_fss_extended_list_write_process_pipe_ - f_return_status fss_extended_list_write_process_pipe(const fss_extended_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer, f_string_ranges_t *ignore) { + f_status_t fss_extended_list_write_process_pipe(const fss_extended_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer, f_string_ranges_t *ignore) { f_status_t status = F_none; f_status_t status_pipe = F_none; @@ -322,7 +322,7 @@ extern "C" { #endif // _di_fss_extended_list_write_process_pipe_ #ifndef _di_fss_extended_list_write_process_parameter_ignore_ - f_return_status fss_extended_list_write_process_parameter_ignore(const f_console_arguments_t arguments, const fss_extended_list_write_data_t data, const f_array_lengths_t contents, const f_array_length_t location, f_string_ranges_t *ignore) { + f_status_t fss_extended_list_write_process_parameter_ignore(const f_console_arguments_t arguments, const fss_extended_list_write_data_t data, const f_array_lengths_t contents, const f_array_length_t location, f_string_ranges_t *ignore) { f_status_t status = F_none; f_array_length_t i = 0; diff --git a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.h b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.h index 0e1f554..bf4a2de 100644 --- a/level_3/fss_extended_list_write/c/private-fss_extended_list_write.h +++ b/level_3/fss_extended_list_write/c/private-fss_extended_list_write.h @@ -73,7 +73,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_extended_list_write_process_ - extern f_return_status fss_extended_list_write_process(const fss_extended_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, const f_string_ranges_t *ignore, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_list_write_process(const fss_extended_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_static_t *content, const f_string_ranges_t *ignore, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_list_write_process_ /** @@ -97,7 +97,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_extended_list_write_process_pipe_ - extern f_return_status fss_extended_list_write_process_pipe(const fss_extended_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer, f_string_ranges_t *ignore) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_list_write_process_pipe(const fss_extended_list_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer, f_string_ranges_t *ignore) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_list_write_process_pipe_ /** @@ -119,7 +119,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_extended_list_write_process_parameter_ignore_ - extern f_return_status fss_extended_list_write_process_parameter_ignore(const f_console_arguments_t arguments, const fss_extended_list_write_data_t data, const f_array_lengths_t contents, const f_array_length_t location, f_string_ranges_t *ignore) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_list_write_process_parameter_ignore(const f_console_arguments_t arguments, const fss_extended_list_write_data_t data, const f_array_lengths_t contents, const f_array_length_t location, f_string_ranges_t *ignore) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_list_write_process_parameter_ignore_ #ifdef __cplusplus diff --git a/level_3/fss_extended_read/c/fss_extended_read.c b/level_3/fss_extended_read/c/fss_extended_read.c index 005946b..24dcccf 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.c +++ b/level_3/fss_extended_read/c/fss_extended_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_extended_read_print_help_ - f_return_status fss_extended_read_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_extended_read_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_extended_read_name_long, fss_extended_read_version); @@ -159,7 +159,7 @@ extern "C" { #endif // _di_fss_extended_read_print_help_ #ifndef _di_fss_extended_read_main_ - f_return_status fss_extended_read_main(const f_console_arguments_t arguments, fss_extended_read_data_t *data) { + f_status_t fss_extended_read_main(const f_console_arguments_t arguments, fss_extended_read_data_t *data) { f_status_t status = F_none; { @@ -536,7 +536,7 @@ extern "C" { #endif // _di_fss_extended_read_main_ #ifndef _di_fss_extended_read_delete_data_ - f_return_status fss_extended_read_delete_data(fss_extended_read_data_t *data) { + f_status_t fss_extended_read_delete_data(fss_extended_read_data_t *data) { for (f_string_length_t i = 0; i < fss_extended_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_extended_read/c/fss_extended_read.h b/level_3/fss_extended_read/c/fss_extended_read.h index fddc370..067e457 100644 --- a/level_3/fss_extended_read/c/fss_extended_read.h +++ b/level_3/fss_extended_read/c/fss_extended_read.h @@ -215,7 +215,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_extended_read_print_help_ - extern f_return_status fss_extended_read_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_extended_read_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_extended_read_print_help_ /** @@ -236,7 +236,7 @@ extern "C" { * @see fss_extended_read_delete_data() */ #ifndef _di_fss_extended_read_main_ - extern f_return_status fss_extended_read_main(const f_console_arguments_t arguments, fss_extended_read_data_t *data); + extern f_status_t fss_extended_read_main(const f_console_arguments_t arguments, fss_extended_read_data_t *data); #endif // _di_fss_extended_read_main_ /** @@ -255,7 +255,7 @@ extern "C" { * @see fss_extended_read_main() */ #ifndef _di_fss_extended_read_delete_data_ - extern f_return_status fss_extended_read_delete_data(fss_extended_read_data_t *data); + extern f_status_t fss_extended_read_delete_data(fss_extended_read_data_t *data); #endif // _di_fss_extended_read_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_extended_read/c/private-fss_extended_read.c b/level_3/fss_extended_read/c/private-fss_extended_read.c index 2db1478..ea49403 100644 --- a/level_3/fss_extended_read/c/private-fss_extended_read.c +++ b/level_3/fss_extended_read/c/private-fss_extended_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_extended_read_is_delimited_at_depth_ - f_return_status fss_extended_read_is_delimited_at_depth(const fss_extended_read_data_t data, const f_string_length_t depth) { + f_status_t fss_extended_read_is_delimited_at_depth(const fss_extended_read_data_t data, const f_string_length_t depth) { if (data.delimit_mode == fss_extended_read_delimit_mode_none) { return F_false; @@ -33,7 +33,7 @@ extern "C" { #endif // _di_fss_extended_read_is_delimited_at_depth_ #ifndef _di_fss_extended_read_main_preprocess_depth_ - f_return_status fss_extended_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_extended_read_data_t data, fss_extended_read_depths_t *depths) { + f_status_t fss_extended_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_extended_read_data_t data, fss_extended_read_depths_t *depths) { f_status_t status = F_none; { @@ -197,7 +197,7 @@ extern "C" { #endif // _di_fss_extended_read_main_preprocess_depth_ #ifndef _di_fss_extended_read_main_process_file_ - f_return_status fss_extended_read_main_process_file(const f_console_arguments_t arguments, fss_extended_read_data_t *data, const f_string_t filename, const fss_extended_read_depths_t depths, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) { + f_status_t fss_extended_read_main_process_file(const f_console_arguments_t arguments, fss_extended_read_data_t *data, const f_string_t filename, const fss_extended_read_depths_t depths, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) { f_status_t status = F_none; const f_string_lengths_t except_none = f_string_lengths_t_initialize; @@ -333,7 +333,7 @@ extern "C" { return F_none; } - f_return_status (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; + f_status_t (*print_object)(FILE *, const f_string_static_t, const f_string_range_t, const f_string_lengths_t) = &f_print_except_dynamic_partial; if (data->parameters[fss_extended_read_parameter_trim].result == f_console_result_found) { print_object = &fl_print_trim_except_dynamic_partial; diff --git a/level_3/fss_extended_read/c/private-fss_extended_read.h b/level_3/fss_extended_read/c/private-fss_extended_read.h index 06183c5..21c27c1 100644 --- a/level_3/fss_extended_read/c/private-fss_extended_read.h +++ b/level_3/fss_extended_read/c/private-fss_extended_read.h @@ -137,7 +137,7 @@ extern "C" { * F_false if not delimited. */ #ifndef _di_fss_extended_read_is_delimited_at_depth_ - extern f_return_status fss_extended_read_is_delimited_at_depth(const fss_extended_read_data_t data, const f_string_length_t depth) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_read_is_delimited_at_depth(const fss_extended_read_data_t data, const f_string_length_t depth) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_read_is_delimited_at_depth_ /** @@ -158,7 +158,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_fss_extended_read_main_preprocess_depth_ - extern f_return_status fss_extended_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_extended_read_data_t data, fss_extended_read_depths_t *depths) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_read_main_preprocess_depth(const f_console_arguments_t arguments, const fss_extended_read_data_t data, fss_extended_read_depths_t *depths) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_read_main_preprocess_depth_ /** @@ -185,7 +185,7 @@ extern "C" { * @see fss_extended_read_main_preprocess_depth() */ #ifndef _di_fss_extended_read_main_process_file_ - extern f_return_status fss_extended_read_main_process_file(const f_console_arguments_t arguments, fss_extended_read_data_t *data, const f_string_t file_name, const fss_extended_read_depths_t depths, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_read_main_process_file(const f_console_arguments_t arguments, fss_extended_read_data_t *data, const f_string_t file_name, const fss_extended_read_depths_t depths, f_fss_delimits_t *objects_delimits, f_fss_delimits_t *contents_delimits) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_read_main_process_file_ /** diff --git a/level_3/fss_extended_write/c/fss_extended_write.c b/level_3/fss_extended_write/c/fss_extended_write.c index e748526..9ca01e3 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.c +++ b/level_3/fss_extended_write/c/fss_extended_write.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_extended_write_print_help_ - f_return_status fss_extended_write_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_extended_write_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_extended_write_name_long, fss_extended_write_version); @@ -84,7 +84,7 @@ extern "C" { #endif // _di_fss_extended_write_print_help_ #ifndef _di_fss_extended_write_main_ - f_return_status fss_extended_write_main(const f_console_arguments_t arguments, fss_extended_write_data_t *data) { + f_status_t fss_extended_write_main(const f_console_arguments_t arguments, fss_extended_write_data_t *data) { f_status_t status = F_none; { @@ -579,7 +579,7 @@ extern "C" { #endif // _di_fss_extended_write_main_ #ifndef _di_fss_extended_write_delete_data_ - f_return_status fss_extended_write_delete_data(fss_extended_write_data_t *data) { + f_status_t fss_extended_write_delete_data(fss_extended_write_data_t *data) { for (f_string_length_t i = 0; i < fss_extended_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_extended_write/c/fss_extended_write.h b/level_3/fss_extended_write/c/fss_extended_write.h index 03c65b6..0687254 100644 --- a/level_3/fss_extended_write/c/fss_extended_write.h +++ b/level_3/fss_extended_write/c/fss_extended_write.h @@ -164,7 +164,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_extended_write_print_help_ - extern f_return_status fss_extended_write_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_extended_write_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_extended_write_print_help_ /** @@ -185,7 +185,7 @@ extern "C" { * @see fss_extended_write_delete_data() */ #ifndef _di_fss_extended_write_main_ - extern f_return_status fss_extended_write_main(const f_console_arguments_t arguments, fss_extended_write_data_t *data); + extern f_status_t fss_extended_write_main(const f_console_arguments_t arguments, fss_extended_write_data_t *data); #endif // _di_fss_extended_write_main_ /** @@ -204,7 +204,7 @@ extern "C" { * @see fss_extended_write_main() */ #ifndef _di_fss_extended_write_delete_data_ - extern f_return_status fss_extended_write_delete_data(fss_extended_write_data_t *data); + extern f_status_t fss_extended_write_delete_data(fss_extended_write_data_t *data); #endif // _di_fss_extended_write_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_extended_write/c/private-fss_extended_write.c b/level_3/fss_extended_write/c/private-fss_extended_write.c index caabc58..b97aefd 100644 --- a/level_3/fss_extended_write/c/private-fss_extended_write.c +++ b/level_3/fss_extended_write/c/private-fss_extended_write.c @@ -52,7 +52,7 @@ extern "C" { #endif // _di_fss_extended_write_error_parameter_unsupported_eol_print_ #ifndef _di_fss_extended_write_process_ - f_return_status fss_extended_write_process(const fss_extended_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_statics_t *contents, f_string_dynamic_t *buffer) { + f_status_t fss_extended_write_process(const fss_extended_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_statics_t *contents, f_string_dynamic_t *buffer) { f_status_t status = F_none; f_string_range_t range = f_string_range_t_initialize; @@ -137,7 +137,7 @@ extern "C" { #endif // _di_fss_extended_write_process_ #ifndef _di_fss_extended_write_process_pipe_ - f_return_status fss_extended_write_process_pipe(const fss_extended_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) { + f_status_t fss_extended_write_process_pipe(const fss_extended_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) { f_status_t status = F_none; f_status_t status_pipe = F_none; diff --git a/level_3/fss_extended_write/c/private-fss_extended_write.h b/level_3/fss_extended_write/c/private-fss_extended_write.h index d12b25c..1df353d 100644 --- a/level_3/fss_extended_write/c/private-fss_extended_write.h +++ b/level_3/fss_extended_write/c/private-fss_extended_write.h @@ -82,7 +82,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_extended_write_process_ - extern f_return_status fss_extended_write_process(const fss_extended_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_statics_t *contents, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_write_process(const fss_extended_write_data_t data, const f_file_t output, const f_fss_quote_t quote, const f_string_static_t *object, const f_string_statics_t *contents, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_write_process_ /** @@ -103,7 +103,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_fss_extended_write_process_pipe_ - extern f_return_status fss_extended_write_process_pipe(const fss_extended_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; + extern f_status_t fss_extended_write_process_pipe(const fss_extended_write_data_t data, const f_file_t output, const f_fss_quote_t quote, f_string_dynamic_t *buffer) f_gcc_attribute_visibility_internal; #endif // _di_fss_extended_write_process_pipe_ #ifdef __cplusplus diff --git a/level_3/fss_status_code/c/fss_status_code.c b/level_3/fss_status_code/c/fss_status_code.c index 985b4aa..7ac0ec1 100644 --- a/level_3/fss_status_code/c/fss_status_code.c +++ b/level_3/fss_status_code/c/fss_status_code.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_status_code_print_help_ - f_return_status fss_status_code_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t fss_status_code_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, fss_status_code_name_long, fss_status_code_version); @@ -34,7 +34,7 @@ extern "C" { #endif // _di_fss_status_code_print_help_ #ifndef _di_fss_status_code_main_ - f_return_status fss_status_code_main(const f_console_arguments_t arguments, fss_status_code_data_t *data) { + f_status_t fss_status_code_main(const f_console_arguments_t arguments, fss_status_code_data_t *data) { f_status_t status = F_none; { @@ -210,7 +210,7 @@ extern "C" { #endif // _di_fss_status_code_main_ #ifndef _di_fss_status_code_delete_data_ - f_return_status fss_status_code_delete_data(fss_status_code_data_t *data) { + f_status_t fss_status_code_delete_data(fss_status_code_data_t *data) { for (f_string_length_t i = 0; i < fss_status_code_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/fss_status_code/c/fss_status_code.h b/level_3/fss_status_code/c/fss_status_code.h index 19a3158..556dec4 100644 --- a/level_3/fss_status_code/c/fss_status_code.h +++ b/level_3/fss_status_code/c/fss_status_code.h @@ -139,7 +139,7 @@ extern "C" { * F_none on success. */ #ifndef _di_fss_status_code_print_help_ - extern f_return_status fss_status_code_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t fss_status_code_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_fss_status_code_print_help_ /** @@ -160,7 +160,7 @@ extern "C" { * @see fss_status_code_delete_data() */ #ifndef _di_fss_status_code_main_ - extern f_return_status fss_status_code_main(const f_console_arguments_t arguments, fss_status_code_data_t *data); + extern f_status_t fss_status_code_main(const f_console_arguments_t arguments, fss_status_code_data_t *data); #endif // _di_fss_status_code_main_ /** @@ -179,7 +179,7 @@ extern "C" { * @see fss_status_code_main() */ #ifndef _di_fss_status_code_delete_data_ - extern f_return_status fss_status_code_delete_data(fss_status_code_data_t *data); + extern f_status_t fss_status_code_delete_data(fss_status_code_data_t *data); #endif // _di_fss_status_code_delete_data_ #ifdef __cplusplus diff --git a/level_3/fss_status_code/c/private-fss_status_code.c b/level_3/fss_status_code/c/private-fss_status_code.c index 2809692..81feda2 100644 --- a/level_3/fss_status_code/c/private-fss_status_code.c +++ b/level_3/fss_status_code/c/private-fss_status_code.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_fss_status_code_process_check_ - f_return_status fss_status_code_process_check(const fss_status_code_data_t data, const f_string_t value) { + f_status_t fss_status_code_process_check(const fss_status_code_data_t data, const f_string_t value) { f_number_unsigned_t number = 0; f_status_t status = fss_status_code_convert_number(data, value, &number); @@ -42,7 +42,7 @@ extern "C" { #endif // _di_fss_status_code_process_check_ #ifndef _di_fss_status_code_process_number_ - f_return_status fss_status_code_process_number(const fss_status_code_data_t data, const f_string_t value) { + f_status_t fss_status_code_process_number(const fss_status_code_data_t data, const f_string_t value) { f_status_t status = F_none; { @@ -99,7 +99,7 @@ extern "C" { #endif // _di_fss_status_code_process_number_ #ifndef _di_fss_status_code_process_normal_ - f_return_status fss_status_code_process_normal(const fss_status_code_data_t data, const f_string_t value) { + f_status_t fss_status_code_process_normal(const fss_status_code_data_t data, const f_string_t value) { f_number_unsigned_t number = 0; f_status_t status = fss_status_code_convert_number(data, value, &number); @@ -128,7 +128,7 @@ extern "C" { #endif // _di_fss_status_code_process_normal_ #ifndef _di_fss_status_code_convert_number_ - f_return_status fss_status_code_convert_number(const fss_status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) { + f_status_t fss_status_code_convert_number(const fss_status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) { const f_string_range_t range = f_macro_string_range_t_initialize(strlen(value)); f_status_t status = fl_conversion_string_to_number_unsigned(value, number, range); diff --git a/level_3/fss_status_code/c/private-fss_status_code.h b/level_3/fss_status_code/c/private-fss_status_code.h index db95eee..4b7e8c2 100644 --- a/level_3/fss_status_code/c/private-fss_status_code.h +++ b/level_3/fss_status_code/c/private-fss_status_code.h @@ -34,7 +34,7 @@ extern "C" { * @see fss_status_code_convert_number() */ #ifndef _di_fss_status_code_process_check_ - extern f_return_status fss_status_code_process_check(const fss_status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; + extern f_status_t fss_status_code_process_check(const fss_status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; #endif // _di_fss_status_code_process_check_ /** @@ -56,7 +56,7 @@ extern "C" { * @see fll_fss_status_from_string() */ #ifndef _di_fss_status_code_process_number_ - extern f_return_status fss_status_code_process_number(const fss_status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; + extern f_status_t fss_status_code_process_number(const fss_status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; #endif // _di_fss_status_code_process_number_ /** @@ -83,7 +83,7 @@ extern "C" { * @see fss_status_code_convert_number() */ #ifndef _di_fss_status_code_process_normal_ - extern f_return_status fss_status_code_process_normal(const fss_status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; + extern f_status_t fss_status_code_process_normal(const fss_status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; #endif // _di_fss_status_code_process_normal_ /** @@ -111,7 +111,7 @@ extern "C" { * @see fl_console_parameter_to_number_unsigned() */ #ifndef _di_fss_status_code_convert_number_ - extern f_return_status fss_status_code_convert_number(const fss_status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) f_gcc_attribute_visibility_internal; + extern f_status_t fss_status_code_convert_number(const fss_status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) f_gcc_attribute_visibility_internal; #endif // _di_fss_status_code_convert_number_ #ifdef __cplusplus diff --git a/level_3/iki_read/c/iki_read.c b/level_3/iki_read/c/iki_read.c index 832c4f5..2fb2d2b 100644 --- a/level_3/iki_read/c/iki_read.c +++ b/level_3/iki_read/c/iki_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_iki_read_print_help_ - f_return_status iki_read_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t iki_read_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, iki_read_name_long, iki_read_version); @@ -89,7 +89,7 @@ extern "C" { #endif // _di_iki_read_print_help_ #ifndef _di_iki_read_main_ - f_return_status iki_read_main(const f_console_arguments_t arguments, iki_read_data_t *data) { + f_status_t iki_read_main(const f_console_arguments_t arguments, iki_read_data_t *data) { f_status_t status = F_none; { @@ -473,7 +473,7 @@ extern "C" { #endif // _di_iki_read_main_ #ifndef _di_iki_read_delete_data_ - f_return_status iki_read_delete_data(iki_read_data_t *data) { + f_status_t iki_read_delete_data(iki_read_data_t *data) { for (f_string_length_t i = 0; i < iki_read_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/iki_read/c/iki_read.h b/level_3/iki_read/c/iki_read.h index f9f24bc..0c34940 100644 --- a/level_3/iki_read/c/iki_read.h +++ b/level_3/iki_read/c/iki_read.h @@ -268,7 +268,7 @@ extern "C" { * F_none on success. */ #ifndef _di_iki_read_print_help_ - extern f_return_status iki_read_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t iki_read_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_iki_read_print_help_ /** @@ -289,7 +289,7 @@ extern "C" { * @see iki_read_delete_data() */ #ifndef _di_iki_read_main_ - extern f_return_status iki_read_main(const f_console_arguments_t arguments, iki_read_data_t *data); + extern f_status_t iki_read_main(const f_console_arguments_t arguments, iki_read_data_t *data); #endif // _di_iki_read_main_ /** @@ -308,7 +308,7 @@ extern "C" { * @see iki_read_main() */ #ifndef _di_iki_read_delete_data_ - extern f_return_status iki_read_delete_data(iki_read_data_t *data); + extern f_status_t iki_read_delete_data(iki_read_data_t *data); #endif // _di_iki_read_delete_data_ #ifdef __cplusplus diff --git a/level_3/iki_read/c/private-iki_read.c b/level_3/iki_read/c/private-iki_read.c index be6b5aa..204c359 100644 --- a/level_3/iki_read/c/private-iki_read.c +++ b/level_3/iki_read/c/private-iki_read.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_iki_read_process_at_ - f_return_status iki_read_process_at(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_string_range_t *range) { + f_status_t iki_read_process_at(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_string_range_t *range) { if (data->parameters[iki_read_parameter_line].result != f_console_result_additional) return F_false; f_string_length_t line = 0; @@ -31,7 +31,7 @@ extern "C" { #endif // _di_iki_read_process_at_ #ifndef _di_iki_read_process_buffer_ - f_return_status iki_read_process_buffer(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data) { + f_status_t iki_read_process_buffer(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data) { f_status_t status = F_none; f_iki_variable_t variable = f_iki_variable_t_initialize; @@ -99,7 +99,7 @@ extern "C" { #endif // _di_iki_read_process_buffer_ #ifndef _di_iki_read_process_buffer_ranges_ - f_return_status iki_read_process_buffer_ranges(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_string_range_t *buffer_range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content, f_string_ranges_t *ranges) { + f_status_t iki_read_process_buffer_ranges(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_string_range_t *buffer_range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content, f_string_ranges_t *ranges) { f_status_t status = F_none; bool unmatched = F_true; @@ -214,7 +214,7 @@ extern "C" { #endif // _di_iki_read_process_buffer_ranges_ #ifndef _di_iki_read_process_buffer_ranges_whole_ - f_return_status iki_read_process_buffer_ranges_whole(const f_console_arguments_t arguments, const f_string_t file_name, const f_string_range_t buffer_range, iki_read_data_t *data, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content, f_string_ranges_t *ranges) { + f_status_t iki_read_process_buffer_ranges_whole(const f_console_arguments_t arguments, const f_string_t file_name, const f_string_range_t buffer_range, iki_read_data_t *data, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content, f_string_ranges_t *ranges) { f_status_t status = F_none; f_string_range_t range = buffer_range; @@ -389,7 +389,7 @@ extern "C" { #endif // _di_iki_read_process_buffer_ranges_whole_ #ifndef _di_iki_read_process_buffer_total_ - f_return_status iki_read_process_buffer_total(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content) { + f_status_t iki_read_process_buffer_total(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content) { f_status_t status = F_none; f_string_range_t range = f_macro_string_range_t_initialize(data->buffer.used); @@ -460,7 +460,7 @@ extern "C" { #endif // _di_iki_read_process_buffer_total_ #ifndef _di_iki_read_substitutions_identify_ - f_return_status iki_read_substitutions_identify(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_iki_vocabulary_t *vocabulary, iki_read_substitutions_t *substitutionss) { + f_status_t iki_read_substitutions_identify(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_iki_vocabulary_t *vocabulary, iki_read_substitutions_t *substitutionss) { if (data->parameters[iki_read_parameter_substitute].result != f_console_result_additional) { return F_none; diff --git a/level_3/iki_read/c/private-iki_read.h b/level_3/iki_read/c/private-iki_read.h index ccdbd72..d195f0a 100644 --- a/level_3/iki_read/c/private-iki_read.h +++ b/level_3/iki_read/c/private-iki_read.h @@ -35,7 +35,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_iki_read_process_at_ - extern f_return_status iki_read_process_at(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_string_range_t *range) f_gcc_attribute_visibility_internal; + extern f_status_t iki_read_process_at(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_string_range_t *range) f_gcc_attribute_visibility_internal; #endif // _di_iki_read_process_at_ /** @@ -55,7 +55,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_iki_read_process_buffer_ - extern f_return_status iki_read_process_buffer(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data) f_gcc_attribute_visibility_internal; + extern f_status_t iki_read_process_buffer(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data) f_gcc_attribute_visibility_internal; #endif // _di_iki_read_process_buffer_ /** @@ -86,7 +86,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_iki_read_process_buffer_ranges_ - extern f_return_status iki_read_process_buffer_ranges(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_string_range_t *buffer_range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content, f_string_ranges_t *ranges) f_gcc_attribute_visibility_internal; + extern f_status_t iki_read_process_buffer_ranges(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_string_range_t *buffer_range, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content, f_string_ranges_t *ranges) f_gcc_attribute_visibility_internal; #endif // _di_iki_read_process_buffer_ranges_ /** @@ -119,7 +119,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_iki_read_process_buffer_ranges_whole_ - extern f_return_status iki_read_process_buffer_ranges_whole(const f_console_arguments_t arguments, const f_string_t file_name, const f_string_range_t buffer_range, iki_read_data_t *data, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content, f_string_ranges_t *ranges) f_gcc_attribute_visibility_internal; + extern f_status_t iki_read_process_buffer_ranges_whole(const f_console_arguments_t arguments, const f_string_t file_name, const f_string_range_t buffer_range, iki_read_data_t *data, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content, f_string_ranges_t *ranges) f_gcc_attribute_visibility_internal; #endif // _di_iki_read_process_buffer_ranges_whole_ /** @@ -144,7 +144,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_iki_read_process_buffer_total_ - extern f_return_status iki_read_process_buffer_total(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content) f_gcc_attribute_visibility_internal; + extern f_status_t iki_read_process_buffer_total(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_iki_variable_t *variable, f_iki_vocabulary_t *vocabulary, f_iki_content_t *content) f_gcc_attribute_visibility_internal; #endif // _di_iki_read_process_buffer_total_ /** @@ -167,7 +167,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_iki_read_substitutions_identify_ - extern f_return_status iki_read_substitutions_identify(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_iki_vocabulary_t *vocabulary, iki_read_substitutions_t *substitutionss) f_gcc_attribute_visibility_internal; + extern f_status_t iki_read_substitutions_identify(const f_console_arguments_t arguments, const f_string_t file_name, iki_read_data_t *data, f_iki_vocabulary_t *vocabulary, iki_read_substitutions_t *substitutionss) f_gcc_attribute_visibility_internal; #endif // _di_iki_read_substitutions_identify_ /** diff --git a/level_3/iki_write/c/iki_write.c b/level_3/iki_write/c/iki_write.c index 26eb8ec..a65c7e7 100644 --- a/level_3/iki_write/c/iki_write.c +++ b/level_3/iki_write/c/iki_write.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_iki_write_print_help_ - f_return_status iki_write_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t iki_write_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, iki_write_name_long, iki_write_version); @@ -52,7 +52,7 @@ extern "C" { #endif // _di_iki_write_print_help_ #ifndef _di_iki_write_main_ - f_return_status iki_write_main(const f_console_arguments_t arguments, iki_write_data_t *data) { + f_status_t iki_write_main(const f_console_arguments_t arguments, iki_write_data_t *data) { f_status_t status = F_none; { @@ -419,7 +419,7 @@ extern "C" { #endif // _di_iki_write_main_ #ifndef _di_iki_write_delete_data_ - f_return_status iki_write_delete_data(iki_write_data_t *data) { + f_status_t iki_write_delete_data(iki_write_data_t *data) { for (f_string_length_t i = 0; i < iki_write_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/iki_write/c/iki_write.h b/level_3/iki_write/c/iki_write.h index aa030ef..4e6efc2 100644 --- a/level_3/iki_write/c/iki_write.h +++ b/level_3/iki_write/c/iki_write.h @@ -155,7 +155,7 @@ extern "C" { * F_none on success. */ #ifndef _di_iki_write_print_help_ - extern f_return_status iki_write_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t iki_write_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_iki_write_print_help_ /** @@ -176,7 +176,7 @@ extern "C" { * @see iki_write_delete_data() */ #ifndef _di_iki_write_main_ - extern f_return_status iki_write_main(const f_console_arguments_t arguments, iki_write_data_t *data); + extern f_status_t iki_write_main(const f_console_arguments_t arguments, iki_write_data_t *data); #endif // _di_iki_write_main_ /** @@ -195,7 +195,7 @@ extern "C" { * @see iki_write_main() */ #ifndef _di_iki_write_delete_data_ - extern f_return_status iki_write_delete_data(iki_write_data_t *data); + extern f_status_t iki_write_delete_data(iki_write_data_t *data); #endif // _di_iki_write_delete_data_ #ifdef __cplusplus diff --git a/level_3/iki_write/c/private-iki_write.c b/level_3/iki_write/c/private-iki_write.c index 5a06325..f603eac 100644 --- a/level_3/iki_write/c/private-iki_write.c +++ b/level_3/iki_write/c/private-iki_write.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_iki_write_process_ - f_return_status iki_write_process(const iki_write_data_t data, const f_file_t output, const f_string_static_t object, const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *escaped) { + f_status_t iki_write_process(const iki_write_data_t data, const f_file_t output, const f_string_static_t object, const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *escaped) { if (!object.used) { if (data.error.verbosity != f_console_verbosity_quiet) { diff --git a/level_3/iki_write/c/private-iki_write.h b/level_3/iki_write/c/private-iki_write.h index 879741b..9e0795a 100644 --- a/level_3/iki_write/c/private-iki_write.h +++ b/level_3/iki_write/c/private-iki_write.h @@ -34,7 +34,7 @@ extern "C" { * F_failure (with error bit) for any othe failure. */ #ifndef _di_iki_write_process_ - extern f_return_status iki_write_process(const iki_write_data_t data, const f_file_t output, const f_string_static_t object, const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *escaped) f_gcc_attribute_visibility_internal; + extern f_status_t iki_write_process(const iki_write_data_t data, const f_file_t output, const f_string_static_t object, const f_string_static_t content, const uint8_t quote, f_string_dynamic_t *escaped) f_gcc_attribute_visibility_internal; #endif // _di_iki_write_process_ #ifdef __cplusplus diff --git a/level_3/init/c/init.c b/level_3/init/c/init.c index 8eb3a9a..3b6ee47 100644 --- a/level_3/init/c/init.c +++ b/level_3/init/c/init.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_init_print_help_ - f_return_status init_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t init_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, init_name_long, init_version); @@ -31,7 +31,7 @@ extern "C" { #endif // _di_init_print_help_ #ifndef _di_init_main_ - f_return_status init_main(const f_console_arguments_t arguments, init_data_t *data) { + f_status_t init_main(const f_console_arguments_t arguments, init_data_t *data) { f_status_t status = F_none; { @@ -104,7 +104,7 @@ extern "C" { #endif // _di_init_main_ #ifndef _di_init_delete_data_ - f_return_status init_delete_data(init_data_t *data) { + f_status_t init_delete_data(init_data_t *data) { for (f_string_length_t i = 0; i < init_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/init/c/init.h b/level_3/init/c/init.h index c891beb..96c4f33 100644 --- a/level_3/init/c/init.h +++ b/level_3/init/c/init.h @@ -281,7 +281,7 @@ extern "C" { * F_none on success. */ #ifndef _di_init_print_help_ - extern f_return_status init_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t init_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_init_print_help_ /** @@ -302,7 +302,7 @@ extern "C" { * @see init_delete_data() */ #ifndef _di_init_main_ - extern f_return_status init_main(const f_console_arguments_t arguments, init_data_t *data); + extern f_status_t init_main(const f_console_arguments_t arguments, init_data_t *data); #endif // _di_init_main_ /** @@ -321,7 +321,7 @@ extern "C" { * @see init_main() */ #ifndef _di_init_delete_data_ - extern f_return_status init_delete_data(init_data_t *data); + extern f_status_t init_delete_data(init_data_t *data); #endif // _di_init_delete_data_ #ifdef __cplusplus diff --git a/level_3/init/c/private-init.c b/level_3/init/c/private-init.c index fddc12e..25aa3c1 100644 --- a/level_3/init/c/private-init.c +++ b/level_3/init/c/private-init.c @@ -37,14 +37,14 @@ Consider the "*.device" files such that they are also use IKI. */ #ifndef _di_init_load_failsafe_ - f_return_status init_load_failsafe(const init_data_t data) { + f_status_t init_load_failsafe(const init_data_t data) { return F_none; } #endif // _di_init_load_failsafe_ #ifndef _di_init_load_kernel_setting_ - f_return_status init_load_kernel_setting(const init_data_t data, init_setting_kernel_t *setting_kernel) { + f_status_t init_load_kernel_setting(const init_data_t data, init_setting_kernel_t *setting_kernel) { f_status_t status = F_none; status = f_directory_exists(init_path_proc_cmdline); @@ -337,7 +337,7 @@ Consider the "*.device" files such that they are also use IKI. #endif // _di_init_load_kernel_setting_ #ifndef _di_init_signal_read_ - f_return_status init_signal_received(const init_data_t data) { + f_status_t init_signal_received(const init_data_t data) { if (!data.signal.id) { return F_false; diff --git a/level_3/init/c/private-init.h b/level_3/init/c/private-init.h index 4641a61..fc099f7 100644 --- a/level_3/init/c/private-init.h +++ b/level_3/init/c/private-init.h @@ -16,14 +16,14 @@ extern "C" { * @todo */ #ifndef _di_init_load_failsafe_ - extern f_return_status init_load_failsafe(const init_data_t data) f_gcc_attribute_visibility_internal; + extern f_status_t init_load_failsafe(const init_data_t data) f_gcc_attribute_visibility_internal; #endif // _di_init_load_failsafe_ /** * @todo */ #ifndef _di_init_load_kernel_setting_ - extern f_return_status init_load_kernel_setting(const init_data_t data, init_setting_kernel_t *setting_kernel) f_gcc_attribute_visibility_internal; + extern f_status_t init_load_kernel_setting(const init_data_t data, init_setting_kernel_t *setting_kernel) f_gcc_attribute_visibility_internal; #endif // _di_init_load_kernel_setting_ /** @@ -39,7 +39,7 @@ extern "C" { * Status codes (with error bit) are returned on any problem. */ #ifndef _di_init_signal_read_ - extern f_return_status init_signal_received(const init_data_t data) f_gcc_attribute_visibility_internal; + extern f_status_t init_signal_received(const init_data_t data) f_gcc_attribute_visibility_internal; #endif // _di_init_signal_read_ #ifdef __cplusplus diff --git a/level_3/status_code/c/private-status_code.c b/level_3/status_code/c/private-status_code.c index a910bd4..1cff4c8 100644 --- a/level_3/status_code/c/private-status_code.c +++ b/level_3/status_code/c/private-status_code.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_status_code_process_check_ - f_return_status status_code_process_check(const status_code_data_t data, const f_string_t value) { + f_status_t status_code_process_check(const status_code_data_t data, const f_string_t value) { f_number_unsigned_t number = 0; f_status_t status = status_code_convert_number(data, value, &number); @@ -44,7 +44,7 @@ extern "C" { #endif // _di_status_code_process_check_ #ifndef _di_status_code_process_number_ - f_return_status status_code_process_number(const status_code_data_t data, const f_string_t value) { + f_status_t status_code_process_number(const status_code_data_t data, const f_string_t value) { f_status_t status = F_none; { @@ -95,7 +95,7 @@ extern "C" { #endif // _di_status_code_process_number_ #ifndef _di_status_code_process_normal_ - f_return_status status_code_process_normal(const status_code_data_t data, const f_string_t value) { + f_status_t status_code_process_normal(const status_code_data_t data, const f_string_t value) { f_number_unsigned_t number = 0; f_status_t status = status_code_convert_number(data, value, &number); @@ -126,7 +126,7 @@ extern "C" { #endif // _di_status_code_process_normal_ #ifndef _di_status_code_convert_number_ - f_return_status status_code_convert_number(const status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) { + f_status_t status_code_convert_number(const status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) { const f_string_range_t range = f_macro_string_range_t_initialize(strlen(value)); f_status_t status = fl_conversion_string_to_number_unsigned(value, number, range); diff --git a/level_3/status_code/c/private-status_code.h b/level_3/status_code/c/private-status_code.h index 5b7d324..98e9bec 100644 --- a/level_3/status_code/c/private-status_code.h +++ b/level_3/status_code/c/private-status_code.h @@ -34,7 +34,7 @@ extern "C" { * @see fss_status_code_convert_number() */ #ifndef _di_status_code_process_check_ - extern f_return_status status_code_process_check(const status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; + extern f_status_t status_code_process_check(const status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; #endif // _di_status_code_process_check_ /** @@ -56,7 +56,7 @@ extern "C" { * @see fll_fss_status_from_string() */ #ifndef _di_status_code_process_number_ - extern f_return_status status_code_process_number(const status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; + extern f_status_t status_code_process_number(const status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; #endif // _di_status_code_process_number_ /** @@ -83,7 +83,7 @@ extern "C" { * @see fss_status_code_convert_number() */ #ifndef _di_status_code_process_normal_ - extern f_return_status status_code_process_normal(const status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; + extern f_status_t status_code_process_normal(const status_code_data_t data, const f_string_t value) f_gcc_attribute_visibility_internal; #endif // _di_status_code_process_normal_ /** @@ -111,7 +111,7 @@ extern "C" { * @see fl_console_parameter_to_number_unsigned() */ #ifndef _di_status_code_convert_number_ - extern f_return_status status_code_convert_number(const status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) f_gcc_attribute_visibility_internal; + extern f_status_t status_code_convert_number(const status_code_data_t data, const f_string_t value, f_number_unsigned_t *number) f_gcc_attribute_visibility_internal; #endif // _di_status_code_convert_number_ #ifdef __cplusplus diff --git a/level_3/status_code/c/status_code.c b/level_3/status_code/c/status_code.c index 73da0d7..ac037d3 100644 --- a/level_3/status_code/c/status_code.c +++ b/level_3/status_code/c/status_code.c @@ -6,7 +6,7 @@ extern "C" { #endif #ifndef _di_status_code_print_help_ - f_return_status status_code_print_help(const f_file_t output, const f_color_context_t context) { + f_status_t status_code_print_help(const f_file_t output, const f_color_context_t context) { fll_program_print_help_header(output, context, status_code_name_long, status_code_version); @@ -34,7 +34,7 @@ extern "C" { #endif // _di_status_code_print_help_ #ifndef _di_status_code_main_ - f_return_status status_code_main(const f_console_arguments_t arguments, status_code_data_t *data) { + f_status_t status_code_main(const f_console_arguments_t arguments, status_code_data_t *data) { f_status_t status = F_none; { @@ -211,7 +211,7 @@ extern "C" { #endif // _di_status_code_main_ #ifndef _di_status_code_delete_data_ - f_return_status status_code_delete_data(status_code_data_t *data) { + f_status_t status_code_delete_data(status_code_data_t *data) { for (f_string_length_t i = 0; i < status_code_total_parameters; i++) { f_macro_string_lengths_t_delete_simple(data->parameters[i].locations); diff --git a/level_3/status_code/c/status_code.h b/level_3/status_code/c/status_code.h index 715333f..eda335b 100644 --- a/level_3/status_code/c/status_code.h +++ b/level_3/status_code/c/status_code.h @@ -138,7 +138,7 @@ extern "C" { * F_none on success. */ #ifndef _di_status_code_print_help_ - extern f_return_status status_code_print_help(const f_file_t output, const f_color_context_t context); + extern f_status_t status_code_print_help(const f_file_t output, const f_color_context_t context); #endif // _di_status_code_print_help_ /** @@ -159,7 +159,7 @@ extern "C" { * @see status_code_delete_data() */ #ifndef _di_status_code_main_ - extern f_return_status status_code_main(const f_console_arguments_t arguments, status_code_data_t *data); + extern f_status_t status_code_main(const f_console_arguments_t arguments, status_code_data_t *data); #endif // _di_status_code_main_ /** @@ -178,7 +178,7 @@ extern "C" { * @see status_code_main() */ #ifndef _di_status_code_delete_data_ - extern f_return_status status_code_delete_data(status_code_data_t *data); + extern f_status_t status_code_delete_data(status_code_data_t *data); #endif // _di_status_code_delete_data_ #ifdef __cplusplus -- 1.8.3.1